Attachment #201879 for bug #234551





PORTNAME=	mythmusic
DISTVERSIONPREFIX=	v
DISTVERSION=	30.0
PORTREVISION=	0
CATEGORIES=	audio
PKGNAMEPREFIX=	mythplugin-


		libmp3lame.so:audio/lame \
		libogg.so:audio/libogg \
		libvorbis.so:audio/libvorbis \
		libmyth-30.so:multimedia/mythtv

USES=		gmake qt:5
USE_GITHUB=	yes
GH_ACCOUNT=	MythTV
GH_PROJECT=	mythtv

USE_QT=		buildtools_build core gui qmake_build sql xml

HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
		--disable-all \
		--enable-mythmusic
CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
		QTDIR="${PREFIX}" PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
MAKE_ENV=	QTDIR="${PREFIX}" \
		QMAKESPEC="${QMAKESPEC}"
DESTDIRNAME=	INSTALL_ROOT
PLIST_SUB=	MYTHSHARE="share/mythtv"
WRKSRC_SUBDIR=	mythplugins

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1520813358	1	TIMESTAMP = 1549080114
2	SHA256 (MythTV-mythtv-v29.1_GH0.tar.gz) = 04a84eb0ded2d2b123624ab2b2e1b8cf824ff4bf8216e452b2516deb929082b2	2	SHA256 (MythTV-mythtv-v30.0_GH0.tar.gz) = 7f7ae9b8927659616f181afc12d7ddc26b0a4b0d13982e2586985f4770640b43
3	SIZE (MythTV-mythtv-v29.1_GH0.tar.gz) = 105616234	3	SIZE (MythTV-mythtv-v30.0_GH0.tar.gz) = 101169041




 check_cxx(){
     log check_cxx "$@"
     cat > $TMPCXX
@@ -582,6 +586,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
 OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
 OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
 

 EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
 EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
 
@@ -689,8 +697,10 @@ if enabled music ; then
         echo "MythMusic requires FLAC."
     fi
 
-    if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
-        disable cdio
+    if enabled cdio; then
+       if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
+         disable cdio
+       fi
     fi
 
     if ! check_lib lame/lame.h lame_init -lmp3lame ; then

Return to bug 234551

Lines 3-10 Link Here

(-)Makefile (-5 / +10 lines)
3		3
4	PORTNAME= mythmusic	4	PORTNAME= mythmusic
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 29.1	6	DISTVERSION= 30.0
7	PORTREVISION= 2	7	PORTREVISION= 0
8	CATEGORIES= audio	8	CATEGORIES= audio
9	PKGNAMEPREFIX= mythplugin-	9	PKGNAMEPREFIX= mythplugin-
10		10
Lines 18-26 Link Here
18	libmp3lame.so:audio/lame \	18	libmp3lame.so:audio/lame \
19	libogg.so:audio/libogg \	19	libogg.so:audio/libogg \
20	libvorbis.so:audio/libvorbis \	20	libvorbis.so:audio/libvorbis \
21	libmyth-29.so:multimedia/mythtv	21	libmyth-30.so:multimedia/mythtv
22		22
23	USES= qt:5	23	USES= gmake qt:5
24	USE_GITHUB= yes	24	USE_GITHUB= yes
25	GH_ACCOUNT= MythTV	25	GH_ACCOUNT= MythTV
26	GH_PROJECT= mythtv	26	GH_PROJECT= mythtv
Lines 28-35 Link Here
28	USE_QT= buildtools_build core gui qmake_build sql xml	28	USE_QT= buildtools_build core gui qmake_build sql xml
29		29
30	HAS_CONFIGURE= yes	30	HAS_CONFIGURE= yes
31	CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-all \	31	CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
		32	--disable-all \
32	--enable-mythmusic	33	--enable-mythmusic
		34	CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
		35	QTDIR="${PREFIX}" PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
		36	MAKE_ENV= QTDIR="${PREFIX}" \
		37	QMAKESPEC="${QMAKESPEC}"
33	DESTDIRNAME= INSTALL_ROOT	38	DESTDIRNAME= INSTALL_ROOT
34	PLIST_SUB= MYTHSHARE="share/mythtv"	39	PLIST_SUB= MYTHSHARE="share/mythtv"
35	WRKSRC_SUBDIR= mythplugins	40	WRKSRC_SUBDIR= mythplugins

Lines 11-17 Link Here

(-)files/patch-configure (-14 / +1 lines)
11	check_cxx(){	11	check_cxx(){
12	log check_cxx "$@"	12	log check_cxx "$@"
13	cat > $TMPCXX	13	cat > $TMPCXX
14	@@ -559,6 +563,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}	14	@@ -582,6 +586,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
15	OPENGLV=$(cat mythconfig.mak \| grep -e "^CONFIG_OPENGL_VIDEO=yes")	15	OPENGLV=$(cat mythconfig.mak \| grep -e "^CONFIG_OPENGL_VIDEO=yes")
16	OPENGLES=$(cat mythconfig.mak \| grep -e "^HAVE_GLES2_GL2_H=yes")	16	OPENGLES=$(cat mythconfig.mak \| grep -e "^HAVE_GLES2_GL2_H=yes")
17		17
Lines 22-37 Link Here
22	EXTRALIBS=$(cat mythconfig.mak \| grep -e "^EXTRALIBS=")	22	EXTRALIBS=$(cat mythconfig.mak \| grep -e "^EXTRALIBS=")
23	EXTRALIBS=${EXTRALIBS#EXTRALIBS=}	23	EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
24		24
25	@@ -689,8 +697,10 @@ if enabled music ; then
26	echo "MythMusic requires FLAC."
27	fi
28
29	- if ! check_lib cdio/cdio.h cdio_open -lcdio \|\| ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda \|\| ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
30	- disable cdio
31	+ if enabled cdio; then
32	+ if ! check_lib cdio/cdio.h cdio_open -lcdio \|\| ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda \|\| ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
33	+ disable cdio
34	+ fi
35	fi
36
37	if ! check_lib lame/lame.h lame_init -lmp3lame ; then