From ba8cf01b167a77cc9553214fb4b6fd85baf9fd4a Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Sat, 13 Dec 2003 18:44:03 +0000 Subject: - Enable optional xine_artsplugin support. This enables KDE's multimedia infrastructure to make use of libxine's features and capabilities (i.e. DivX and Quicktime in noatun). Bump portrevision to facilitate updating installations which have the xine-port already installed. - Add an option to disable the mpeglib artsplugin and use the older mpg123/oggvorbis plugins instead. This is non-default and not recommended except for exceptionally broken sound hardware/driver combinationsi which do not work right with mpeglib. - Declare CONFLICTS with timidity/timidity++ if WITH_MIDI/WITH_KMIDI is being used. --- multimedia/kdemultimedia3/Makefile | 45 +++++++++++++++++------- multimedia/kdemultimedia3/files/plist.base | 20 ----------- multimedia/kdemultimedia3/files/plist.mpeglib | 20 +++++++++++ multimedia/kdemultimedia3/files/plist.no-mpeglib | 13 +++++++ multimedia/kdemultimedia3/files/plist.xine | 3 ++ multimedia/kdemultimedia4/Makefile | 45 +++++++++++++++++------- multimedia/kdemultimedia4/files/plist.base | 20 ----------- multimedia/kdemultimedia4/files/plist.mpeglib | 20 +++++++++++ multimedia/kdemultimedia4/files/plist.no-mpeglib | 13 +++++++ multimedia/kdemultimedia4/files/plist.xine | 3 ++ 10 files changed, 138 insertions(+), 64 deletions(-) create mode 100644 multimedia/kdemultimedia3/files/plist.mpeglib create mode 100644 multimedia/kdemultimedia3/files/plist.no-mpeglib create mode 100644 multimedia/kdemultimedia3/files/plist.xine create mode 100644 multimedia/kdemultimedia4/files/plist.mpeglib create mode 100644 multimedia/kdemultimedia4/files/plist.no-mpeglib create mode 100644 multimedia/kdemultimedia4/files/plist.xine (limited to 'multimedia') diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 52d07ba205b3..97817ec3a5c3 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +18,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Multimedia utilities for the KDE integrated X11 desktop RUN_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim -LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ +LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ + cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ mp3lame:${PORTSDIR}/audio/lame \ ogg.4:${PORTSDIR}/audio/libogg \ vorbis.2:${PORTSDIR}/audio/libvorbis @@ -42,6 +44,7 @@ CONFIGURE_ARGS+= --with-vorbis="${LOCALBASE}" \ .if defined(WITH_MIDI) || defined(WITH_KMIDI) PLIST_APPEND+= plist.midi +CONFLICTS= timidity-* timidity++-* .if ${MACHINE_ARCH} == "alpha" USE_REINPLACE= yes post-patch:: @@ -51,22 +54,26 @@ post-patch:: DO_NOT_COMPILE+= kmidi .endif # defined(WITH_MIDI) || defined(WITH_KMIDI) -#.if exists(${X11BASE}/bin/xine-config) -#WITH_XINE= yes -#.endif # exists(${LOCALBASE}/bin/xine-config) - -WITHOUT_XINE=yes +.if exists(${X11BASE}/bin/xine-config) +WITH_XINE= yes +.endif # exists(${LOCALBASE}/bin/xine-config) .if defined(WITHOUT_XINE) DO_NOT_COMPILE+= xine_artsplugin -#CONFIGURE_ARGS+= --disable-xinetest -#.elif defined(WITH_XINE) -#PLIST_APPEND+= plist.xine -#LIB_DEPENDS+= xine.4:${PORTSDIR}/multimedia/libxine -#BUILD_DEPENDS+= xine-config:${PORTSDIR}/multimedia/libxine -#CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE} +CONFIGURE_ARGS+= --disable-xinetest +.elif defined(WITH_XINE) +PLIST_APPEND+= plist.xine +LIB_DEPENDS+= xine.8:${PORTSDIR}/multimedia/libxine +BUILD_DEPENDS+= xine-config:${PORTSDIR}/multimedia/libxine +CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE} .endif # defined(WITHOUT_XINE) +.if defined(WITHOUT_MPEGLIB) +PLIST_APPEND+= plist.no-mpeglib +.else +PLIST_APPEND+= plist.mpeglib +.endif + .if defined(DO_NOT_COMPILE) CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" .endif # defined(DO_NOT_COMPILE) @@ -74,6 +81,20 @@ CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 +pre-configure: +.if defined(WITHOUT_MPEGLIB) + ${REINPLACE_CMD} -e \ + '/FreeBSD/,/;$$/s/kde_mpeglib_compiles=yes/kde_mpeglib_compiles=no/g' \ + ${WRKSRC}/configure + ${REINPLACE_CMD} -e '/union semun/,/;$$/s/.*//g' \ + ${WRKSRC}/oggvorbis_artsplugin/oggPlayObject_impl.h +.endif + +post-configure: + ${REINPLACE_CMD} -e '/^XINE_CFLAGS/s/-D_THREAD_SAFE//g' \ + -e 's/-pthread/${PTHREAD_LIBS}/g' \ + ${WRKSRC}/xine_artsplugin/Makefile + post-install: @${CAT} ${PKGMESSAGE} diff --git a/multimedia/kdemultimedia3/files/plist.base b/multimedia/kdemultimedia3/files/plist.base index 09f8a950f996..f718252ccf4f 100644 --- a/multimedia/kdemultimedia3/files/plist.base +++ b/multimedia/kdemultimedia3/files/plist.base @@ -9,7 +9,6 @@ bin/kmixctrl bin/krec bin/kscd bin/midisend -bin/mpeglibartsplay bin/noatun bin/workman2cddb.pl bin/yaf-cdda @@ -105,12 +104,6 @@ include/mpeglib/util/yaf/yafcore/yaf_control.h include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h -include/mpeglib_artsplug/decoderBaseObject.h -include/mpeglib_artsplug/decoderBaseObject.idl -include/mpeglib_artsplug/decoderBaseObject_impl.h -include/mpeglib_artsplug/splayPlayObject.h -include/mpeglib_artsplug/splayPlayObject.idl -include/mpeglib_artsplug/splayPlayObject_impl.h include/noatun/app.h include/noatun/controls.h include/noatun/conversion.h @@ -203,13 +196,6 @@ lib/krec.so lib/libaktion.la lib/libaktion.so lib/libaktion.so.1 -lib/libarts_mpeglib-0.3.0.so -lib/libarts_mpeglib-0.3.0.so.0 -lib/libarts_mpeglib.la -lib/libarts_mpeglib.so -lib/libarts_splay.la -lib/libarts_splay.so -lib/libarts_splay.so.0 lib/libartsbuilder.la lib/libartsbuilder.so lib/libartsbuilder.so.0 @@ -326,11 +312,8 @@ lib/mcop/Arts/Synth_XFADE.mcopclass lib/mcop/Arts/VBox.mcopclass lib/mcop/Arts/Widget.mcopclass lib/mcop/Arts/audiofilePlayObject.mcopclass -lib/mcop/CDDAPlayObject.mcopclass lib/mcop/ExtraStereo.mcopclass lib/mcop/ExtraStereoGuiFactory.mcopclass -lib/mcop/MP3PlayObject.mcopclass -lib/mcop/NULLPlayObject.mcopclass lib/mcop/Noatun/Equalizer.mcopclass lib/mcop/Noatun/EqualizerSSE.mcopclass lib/mcop/Noatun/FFTScope.mcopclass @@ -343,11 +326,8 @@ lib/mcop/Noatun/StereoEffectStack.mcopclass lib/mcop/Noatun/StereoVolumeControl.mcopclass lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass lib/mcop/Noatun/WinSkinFFT.mcopclass -lib/mcop/OGGPlayObject.mcopclass lib/mcop/RawWriter.mcopclass -lib/mcop/SplayPlayObject.mcopclass lib/mcop/VoiceRemoval.mcopclass -lib/mcop/WAVPlayObject.mcopclass lib/mcop/artsbuilder.mcopclass lib/mcop/artsbuilder.mcoptype lib/mcop/artseffects.mcopclass diff --git a/multimedia/kdemultimedia3/files/plist.mpeglib b/multimedia/kdemultimedia3/files/plist.mpeglib new file mode 100644 index 000000000000..8240d5667987 --- /dev/null +++ b/multimedia/kdemultimedia3/files/plist.mpeglib @@ -0,0 +1,20 @@ +bin/mpeglibartsplay +include/mpeglib_artsplug/decoderBaseObject.h +include/mpeglib_artsplug/decoderBaseObject.idl +include/mpeglib_artsplug/decoderBaseObject_impl.h +include/mpeglib_artsplug/splayPlayObject.h +include/mpeglib_artsplug/splayPlayObject.idl +include/mpeglib_artsplug/splayPlayObject_impl.h +lib/libarts_mpeglib-0.3.0.so +lib/libarts_mpeglib-0.3.0.so.0 +lib/libarts_mpeglib.la +lib/libarts_mpeglib.so +lib/libarts_splay.la +lib/libarts_splay.so +lib/libarts_splay.so.0 +lib/mcop/CDDAPlayObject.mcopclass +lib/mcop/MP3PlayObject.mcopclass +lib/mcop/NULLPlayObject.mcopclass +lib/mcop/OGGPlayObject.mcopclass +lib/mcop/SplayPlayObject.mcopclass +lib/mcop/WAVPlayObject.mcopclass diff --git a/multimedia/kdemultimedia3/files/plist.no-mpeglib b/multimedia/kdemultimedia3/files/plist.no-mpeglib new file mode 100644 index 000000000000..8a04d295593d --- /dev/null +++ b/multimedia/kdemultimedia3/files/plist.no-mpeglib @@ -0,0 +1,13 @@ +lib/libmpg123.la +lib/libmpg123.so +lib/libmpg123arts.la +lib/libmpg123arts.so +lib/liboggarts.la +lib/liboggarts.so +lib/mcop/Arts/mpg123PlayObject.mcopclass +lib/mcop/Arts/oggPlayObject.mcopclass +lib/mcop/mpg123arts.mcopclass +lib/mcop/mpg123arts.mcoptype +lib/mcop/oggarts.mcopclass +lib/mcop/oggarts.mcoptype +lib/mcop/xinePlayObject.mcopclass diff --git a/multimedia/kdemultimedia3/files/plist.xine b/multimedia/kdemultimedia3/files/plist.xine new file mode 100644 index 000000000000..683a36d03fe5 --- /dev/null +++ b/multimedia/kdemultimedia3/files/plist.xine @@ -0,0 +1,3 @@ +lib/libarts_xine.la +lib/libarts_xine.so +lib/mcop/xinePlayObject.mcopclass diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 52d07ba205b3..97817ec3a5c3 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +18,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Multimedia utilities for the KDE integrated X11 desktop RUN_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim -LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ +LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ + cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ mp3lame:${PORTSDIR}/audio/lame \ ogg.4:${PORTSDIR}/audio/libogg \ vorbis.2:${PORTSDIR}/audio/libvorbis @@ -42,6 +44,7 @@ CONFIGURE_ARGS+= --with-vorbis="${LOCALBASE}" \ .if defined(WITH_MIDI) || defined(WITH_KMIDI) PLIST_APPEND+= plist.midi +CONFLICTS= timidity-* timidity++-* .if ${MACHINE_ARCH} == "alpha" USE_REINPLACE= yes post-patch:: @@ -51,22 +54,26 @@ post-patch:: DO_NOT_COMPILE+= kmidi .endif # defined(WITH_MIDI) || defined(WITH_KMIDI) -#.if exists(${X11BASE}/bin/xine-config) -#WITH_XINE= yes -#.endif # exists(${LOCALBASE}/bin/xine-config) - -WITHOUT_XINE=yes +.if exists(${X11BASE}/bin/xine-config) +WITH_XINE= yes +.endif # exists(${LOCALBASE}/bin/xine-config) .if defined(WITHOUT_XINE) DO_NOT_COMPILE+= xine_artsplugin -#CONFIGURE_ARGS+= --disable-xinetest -#.elif defined(WITH_XINE) -#PLIST_APPEND+= plist.xine -#LIB_DEPENDS+= xine.4:${PORTSDIR}/multimedia/libxine -#BUILD_DEPENDS+= xine-config:${PORTSDIR}/multimedia/libxine -#CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE} +CONFIGURE_ARGS+= --disable-xinetest +.elif defined(WITH_XINE) +PLIST_APPEND+= plist.xine +LIB_DEPENDS+= xine.8:${PORTSDIR}/multimedia/libxine +BUILD_DEPENDS+= xine-config:${PORTSDIR}/multimedia/libxine +CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE} .endif # defined(WITHOUT_XINE) +.if defined(WITHOUT_MPEGLIB) +PLIST_APPEND+= plist.no-mpeglib +.else +PLIST_APPEND+= plist.mpeglib +.endif + .if defined(DO_NOT_COMPILE) CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" .endif # defined(DO_NOT_COMPILE) @@ -74,6 +81,20 @@ CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 +pre-configure: +.if defined(WITHOUT_MPEGLIB) + ${REINPLACE_CMD} -e \ + '/FreeBSD/,/;$$/s/kde_mpeglib_compiles=yes/kde_mpeglib_compiles=no/g' \ + ${WRKSRC}/configure + ${REINPLACE_CMD} -e '/union semun/,/;$$/s/.*//g' \ + ${WRKSRC}/oggvorbis_artsplugin/oggPlayObject_impl.h +.endif + +post-configure: + ${REINPLACE_CMD} -e '/^XINE_CFLAGS/s/-D_THREAD_SAFE//g' \ + -e 's/-pthread/${PTHREAD_LIBS}/g' \ + ${WRKSRC}/xine_artsplugin/Makefile + post-install: @${CAT} ${PKGMESSAGE} diff --git a/multimedia/kdemultimedia4/files/plist.base b/multimedia/kdemultimedia4/files/plist.base index 09f8a950f996..f718252ccf4f 100644 --- a/multimedia/kdemultimedia4/files/plist.base +++ b/multimedia/kdemultimedia4/files/plist.base @@ -9,7 +9,6 @@ bin/kmixctrl bin/krec bin/kscd bin/midisend -bin/mpeglibartsplay bin/noatun bin/workman2cddb.pl bin/yaf-cdda @@ -105,12 +104,6 @@ include/mpeglib/util/yaf/yafcore/yaf_control.h include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h -include/mpeglib_artsplug/decoderBaseObject.h -include/mpeglib_artsplug/decoderBaseObject.idl -include/mpeglib_artsplug/decoderBaseObject_impl.h -include/mpeglib_artsplug/splayPlayObject.h -include/mpeglib_artsplug/splayPlayObject.idl -include/mpeglib_artsplug/splayPlayObject_impl.h include/noatun/app.h include/noatun/controls.h include/noatun/conversion.h @@ -203,13 +196,6 @@ lib/krec.so lib/libaktion.la lib/libaktion.so lib/libaktion.so.1 -lib/libarts_mpeglib-0.3.0.so -lib/libarts_mpeglib-0.3.0.so.0 -lib/libarts_mpeglib.la -lib/libarts_mpeglib.so -lib/libarts_splay.la -lib/libarts_splay.so -lib/libarts_splay.so.0 lib/libartsbuilder.la lib/libartsbuilder.so lib/libartsbuilder.so.0 @@ -326,11 +312,8 @@ lib/mcop/Arts/Synth_XFADE.mcopclass lib/mcop/Arts/VBox.mcopclass lib/mcop/Arts/Widget.mcopclass lib/mcop/Arts/audiofilePlayObject.mcopclass -lib/mcop/CDDAPlayObject.mcopclass lib/mcop/ExtraStereo.mcopclass lib/mcop/ExtraStereoGuiFactory.mcopclass -lib/mcop/MP3PlayObject.mcopclass -lib/mcop/NULLPlayObject.mcopclass lib/mcop/Noatun/Equalizer.mcopclass lib/mcop/Noatun/EqualizerSSE.mcopclass lib/mcop/Noatun/FFTScope.mcopclass @@ -343,11 +326,8 @@ lib/mcop/Noatun/StereoEffectStack.mcopclass lib/mcop/Noatun/StereoVolumeControl.mcopclass lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass lib/mcop/Noatun/WinSkinFFT.mcopclass -lib/mcop/OGGPlayObject.mcopclass lib/mcop/RawWriter.mcopclass -lib/mcop/SplayPlayObject.mcopclass lib/mcop/VoiceRemoval.mcopclass -lib/mcop/WAVPlayObject.mcopclass lib/mcop/artsbuilder.mcopclass lib/mcop/artsbuilder.mcoptype lib/mcop/artseffects.mcopclass diff --git a/multimedia/kdemultimedia4/files/plist.mpeglib b/multimedia/kdemultimedia4/files/plist.mpeglib new file mode 100644 index 000000000000..8240d5667987 --- /dev/null +++ b/multimedia/kdemultimedia4/files/plist.mpeglib @@ -0,0 +1,20 @@ +bin/mpeglibartsplay +include/mpeglib_artsplug/decoderBaseObject.h +include/mpeglib_artsplug/decoderBaseObject.idl +include/mpeglib_artsplug/decoderBaseObject_impl.h +include/mpeglib_artsplug/splayPlayObject.h +include/mpeglib_artsplug/splayPlayObject.idl +include/mpeglib_artsplug/splayPlayObject_impl.h +lib/libarts_mpeglib-0.3.0.so +lib/libarts_mpeglib-0.3.0.so.0 +lib/libarts_mpeglib.la +lib/libarts_mpeglib.so +lib/libarts_splay.la +lib/libarts_splay.so +lib/libarts_splay.so.0 +lib/mcop/CDDAPlayObject.mcopclass +lib/mcop/MP3PlayObject.mcopclass +lib/mcop/NULLPlayObject.mcopclass +lib/mcop/OGGPlayObject.mcopclass +lib/mcop/SplayPlayObject.mcopclass +lib/mcop/WAVPlayObject.mcopclass diff --git a/multimedia/kdemultimedia4/files/plist.no-mpeglib b/multimedia/kdemultimedia4/files/plist.no-mpeglib new file mode 100644 index 000000000000..8a04d295593d --- /dev/null +++ b/multimedia/kdemultimedia4/files/plist.no-mpeglib @@ -0,0 +1,13 @@ +lib/libmpg123.la +lib/libmpg123.so +lib/libmpg123arts.la +lib/libmpg123arts.so +lib/liboggarts.la +lib/liboggarts.so +lib/mcop/Arts/mpg123PlayObject.mcopclass +lib/mcop/Arts/oggPlayObject.mcopclass +lib/mcop/mpg123arts.mcopclass +lib/mcop/mpg123arts.mcoptype +lib/mcop/oggarts.mcopclass +lib/mcop/oggarts.mcoptype +lib/mcop/xinePlayObject.mcopclass diff --git a/multimedia/kdemultimedia4/files/plist.xine b/multimedia/kdemultimedia4/files/plist.xine new file mode 100644 index 000000000000..683a36d03fe5 --- /dev/null +++ b/multimedia/kdemultimedia4/files/plist.xine @@ -0,0 +1,3 @@ +lib/libarts_xine.la +lib/libarts_xine.so +lib/mcop/xinePlayObject.mcopclass -- cgit v1.2.3