diff options
Diffstat (limited to 'audio')
8 files changed, 105 insertions, 29 deletions
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile index 245bdba8d820..e594ba18bb68 100644 --- a/audio/mythplugin-mythmusic/Makefile +++ b/audio/mythplugin-mythmusic/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= mythmusic -PORTVERSION= 0.27.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 +DISTVERSION= 29.1 CATEGORIES= audio PKGNAMEPREFIX= mythplugin- @@ -14,30 +13,34 @@ COMMENT= Music playing plugin for MythTV LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libcdio.so:sysutils/libcdio \ - libFLAC.so:audio/flac \ +LIB_DEPENDS= libFLAC.so:audio/flac \ + libmp3lame.so:audio/lame \ + libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ - libtag.so:audio/taglib \ - libfftw3f.so:math/fftw3-float -BUILD_DEPENDS= mythfrontend:multimedia/mythtv + libmyth-29.so:multimedia/mythtv USE_GITHUB= yes GH_ACCOUNT= MythTV GH_PROJECT= mythtv +USE_LDCONFIG= yes +USE_QT5= buildtools_build core gui qmake_build sql xml -WRKSRC_SUBDIR= mythplugins - -USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/lib/mythtv/plugins +CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-all \ + --enable-mythmusic DESTDIRNAME= INSTALL_ROOT - PLIST_SUB= MYTHSHARE="share/mythtv" +WRKSRC_SUBDIR= mythplugins -QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ +OPTIONS_DEFINE= CDIO FFTW -CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-all \ - --enable-mythmusic --enable-fftw --enable-opengl +CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio \ + libcdio_paranoia.so:sysutils/libcdio-paranoia +CDIO_CONFIGURE_ENABLE= cdio + +FFTW_DESC= FFTW3-based visualizations +FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 +FFTW_CONFIGURE_ENABLE= fftw post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ @@ -46,4 +49,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \ ${WRKSRC}/configure +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mythtv/plugins/libmythmusic.so + .include <bsd.port.mk> diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo index 2fdc00603b49..509afc6897a2 100644 --- a/audio/mythplugin-mythmusic/distinfo +++ b/audio/mythplugin-mythmusic/distinfo @@ -1,2 +1,3 @@ -SHA256 (MythTV-mythtv-v0.27.5_GH0.tar.gz) = 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b -SIZE (MythTV-mythtv-v0.27.5_GH0.tar.gz) = 85652939 +TIMESTAMP = 1520813358 +SHA256 (MythTV-mythtv-v29.1_GH0.tar.gz) = 04a84eb0ded2d2b123624ab2b2e1b8cf824ff4bf8216e452b2516deb929082b2 +SIZE (MythTV-mythtv-v29.1_GH0.tar.gz) = 105616234 diff --git a/audio/mythplugin-mythmusic/files/patch-configure b/audio/mythplugin-mythmusic/files/patch-configure index 15016cef1e02..4f38e634a2db 100644 --- a/audio/mythplugin-mythmusic/files/patch-configure +++ b/audio/mythplugin-mythmusic/files/patch-configure @@ -1,4 +1,4 @@ ---- configure.orig 2015-06-16 16:03:30 UTC +--- configure.orig 2018-02-01 11:15:37 UTC +++ configure @@ -227,6 +227,10 @@ add_cxxflags(){ append ECXXFLAGS "$@" @@ -11,22 +11,27 @@ check_cxx(){ log check_cxx "$@" cat > $TMPCXX -@@ -561,6 +565,10 @@ OPENGLV=$(cat mythconfig.mak | grep -e " - EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=") - EXTRALIBS=${EXTRALIBS#EXTRALIBS=} +@@ -559,6 +563,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") +add_cppflags "-I${prefix}/include" +add_cxxflags "-I${prefix}/include" +add_ldflags "-L${prefix}/lib" + - if is_qmake4 $qmake || is_qmake4 qmake-qt4; then - if is_qmake4 qmake-qt4; then - qmake=qmake-qt4 -@@ -657,6 +665,7 @@ if enabled music ; then + EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=") + EXTRALIBS=${EXTRALIBS#EXTRALIBS=} + +@@ -689,8 +697,10 @@ if enabled music ; then echo "MythMusic requires FLAC." fi -+ enable cdio - 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 ! 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 diff --git a/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.cpp b/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.cpp new file mode 100644 index 000000000000..b8a5cc2689c5 --- /dev/null +++ b/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.cpp @@ -0,0 +1,13 @@ +libcdio-paranoia header location changed after moving to separate project circa 2012 + +--- mythmusic/mythmusic/cddecoder.cpp.orig 2018-02-01 11:15:37 UTC ++++ mythmusic/mythmusic/cddecoder.cpp +@@ -14,7 +14,7 @@ + #include <QString> + + // libcdio +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/logging.h> + + // MythTV diff --git a/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.h b/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.h new file mode 100644 index 000000000000..25f866faeb3d --- /dev/null +++ b/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.h @@ -0,0 +1,15 @@ +libcdio-paranoia header location changed after moving to separate project circa 2012 + +--- mythmusic/mythmusic/cddecoder.h.orig 2018-02-01 11:15:37 UTC ++++ mythmusic/mythmusic/cddecoder.h +@@ -11,8 +11,8 @@ using std::vector; + #endif + + #ifdef HAVE_CDIO +-# include <cdio/cdda.h> +-# include <cdio/paranoia.h> ++# include <cdio/paranoia/cdda.h> ++# include <cdio/paranoia/paranoia.h> + #endif + + class MusicMetadata; diff --git a/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cdrip.cpp b/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cdrip.cpp new file mode 100644 index 000000000000..85b4665d1756 --- /dev/null +++ b/audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cdrip.cpp @@ -0,0 +1,25 @@ +libcdio-paranoia header location changed after moving to separate project circa 2012 +Fix warning: logical not is only applied to the left hand side of comparison + +--- mythmusic/mythmusic/cdrip.cpp.orig 2018-02-01 11:15:37 UTC ++++ mythmusic/mythmusic/cdrip.cpp +@@ -8,8 +8,8 @@ + + #include "config.h" + #ifdef HAVE_CDIO +-# include <cdio/cdda.h> +-# include <cdio/paranoia.h> ++# include <cdio/paranoia/cdda.h> ++# include <cdio/paranoia/paranoia.h> + #endif //def HAVE_CDIO + + // C++ includes +@@ -219,7 +219,7 @@ void CDRipperThread::run(void) + { + RunProlog(); + +- if (!m_tracks->size() > 0) ++ if (!(m_tracks->size() > 0)) + { + RunEpilog(); + return; diff --git a/audio/mythplugin-mythmusic/files/patch-settings.pro b/audio/mythplugin-mythmusic/files/patch-settings.pro new file mode 100644 index 000000000000..d5692fbc6692 --- /dev/null +++ b/audio/mythplugin-mythmusic/files/patch-settings.pro @@ -0,0 +1,12 @@ +Prevent linking to unneccessary libraries + +--- settings.pro.orig 2018-02-25 02:52:28 UTC ++++ settings.pro +@@ -34,6 +34,7 @@ QMAKE_CXXFLAGS += $$ARCHFLAGS + QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS + QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC + QMAKE_CXXFLAGS += $$ECXXFLAGS ++QMAKE_LFLAGS += -Wl,--as-needed + + profile:!win32:!macx:CONFIG += debug + diff --git a/audio/mythplugin-mythmusic/pkg-plist b/audio/mythplugin-mythmusic/pkg-plist index 661d62c7c7c6..bfa850f263fd 100644 --- a/audio/mythplugin-mythmusic/pkg-plist +++ b/audio/mythplugin-mythmusic/pkg-plist @@ -25,7 +25,6 @@ lib/mythtv/plugins/libmythmusic.so %%MYTHSHARE%%/i18n/mythmusic_sv.qm %%MYTHSHARE%%/music_settings.xml %%MYTHSHARE%%/musicmenu.xml -%%MYTHSHARE%%/mythmusic/streams.xml %%MYTHSHARE%%/themes/default-wide/mm-titlelines.png %%MYTHSHARE%%/themes/default-wide/mm_blackhole_border.png %%MYTHSHARE%%/themes/default-wide/mm_volume_background.png |