Index: Makefile =================================================================== --- Makefile (revision 491303) +++ Makefile (working copy) @@ -3,8 +3,8 @@ PORTNAME= mythmusic DISTVERSIONPREFIX= v -DISTVERSION= 29.1 -PORTREVISION= 2 +DISTVERSION= 30.0 +PORTREVISION= 0 CATEGORIES= audio PKGNAMEPREFIX= mythplugin- @@ -18,9 +18,9 @@ libmp3lame.so:audio/lame \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ - libmyth-29.so:multimedia/mythtv + libmyth-30.so:multimedia/mythtv -USES= qt:5 +USES= gmake qt:5 USE_GITHUB= yes GH_ACCOUNT= MythTV GH_PROJECT= mythtv @@ -28,8 +28,13 @@ USE_QT= buildtools_build core gui qmake_build sql xml HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-all \ +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 Index: distinfo =================================================================== --- distinfo (revision 491303) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520813358 -SHA256 (MythTV-mythtv-v29.1_GH0.tar.gz) = 04a84eb0ded2d2b123624ab2b2e1b8cf824ff4bf8216e452b2516deb929082b2 -SIZE (MythTV-mythtv-v29.1_GH0.tar.gz) = 105616234 +TIMESTAMP = 1549080114 +SHA256 (MythTV-mythtv-v30.0_GH0.tar.gz) = 7f7ae9b8927659616f181afc12d7ddc26b0a4b0d13982e2586985f4770640b43 +SIZE (MythTV-mythtv-v30.0_GH0.tar.gz) = 101169041 Index: files/patch-configure =================================================================== --- files/patch-configure (revision 491303) +++ files/patch-configure (working copy) @@ -11,7 +11,7 @@ check_cxx(){ log check_cxx "$@" cat > $TMPCXX -@@ -559,6 +563,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=} +@@ -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") @@ -22,16 +22,3 @@ 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