Index: head/multimedia/phonon/Makefile =================================================================== --- head/multimedia/phonon/Makefile (revision 311633) +++ head/multimedia/phonon/Makefile (revision 311634) @@ -1,80 +1,65 @@ -# New ports collection Makefile for: phonon -# Date created: 2008-01-30 -# Whom: Martin Wilke -# +# Created by: Martin Wilke # $FreeBSD$ PORTNAME= phonon PORTVERSION= 4.6.0 PORTREVISION= 1 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/src/ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= KDE multimedia framework -LIB_DEPENDS= qzeitgeist.1:${PORTSDIR}/sysutils/qzeitgeist +LIB_DEPENDS= qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist CONFLICTS= qt4-phonon-4* PHONON_BRANCH= stable USE_KDE4= kdehier kdeprefix automoc4 USE_QT4= dbus gui \ qmake_build moc_build rcc_build uic_build USE_XZ= yes USE_CMAKE= yes CMAKE_ARGS= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \ - -DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE + -DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \ + -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes -OPTIONS= PULSEAUDIO "Support playback via PulseAudio" off -# DESIGNER "Install Qt Designer plugin" off \ +OPTIONS_DEFINE= PULSEAUDIO .include -# qt4-designer depends on phonon. Disable this option to avoid a -# circular dependency. -.undef WITH_DESIGNER -.ifdef(WITH_DESIGNER) -USE_QT4+= designer -CMAKE_ARGS+= -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=ON -PLIST_SUB+= DESIGNER="" -.else -CMAKE_ARGS+= -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF -PLIST_SUB+= DESIGNER="@comment " -.endif - -.ifdef(WITH_PULSEAUDIO) -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio USE_GNOME+= glib20 CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=ON .else CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF .endif PLIST_SUB+= QT_PREFIX=${QT_PREFIX} .ifdef(WITH_QT_PHONON) IGNORE= conflicts with Qt 4 phonon. Please, deinstall qt4-phonon and unset WITH_QT_PHONON to continue .endif pre-configure: ${REINPLACE_CMD} -e '/phonon.pc/s|pkgconfig|../libdata/pkgconfig|' \ -e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\ ${PATCH_WRKSRC}/CMakeLists.txt post-install: ${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/phonon ${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/Phonon ${LN} -sf ${PREFIX}/include/KDE/Phonon ${PREFIX}/include/phonon/Phonon .for lib in phonon phononexperimental ${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${QT_LIBDIR}/lib${lib}.so ${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${QT_LIBDIR}/lib${lib}.so.4 .endfor @${CAT} ${PKGMESSAGE} .include Property changes on: head/multimedia/phonon/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/phonon/pkg-message =================================================================== --- head/multimedia/phonon/pkg-message (revision 311633) +++ head/multimedia/phonon/pkg-message (revision 311634) @@ -1,7 +1,7 @@ ====================================================================== Please, consider installing backends for Phonon: -multimedia/phonon-gstreamer GStreamer backend -multimedia/phonon-vlc VLC backend +- multimedia/phonon-gstreamer GStreamer backend +- multimedia/phonon-vlc VLC backend ====================================================================== Property changes on: head/multimedia/phonon/pkg-message ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/phonon/pkg-plist =================================================================== --- head/multimedia/phonon/pkg-plist (revision 311633) +++ head/multimedia/phonon/pkg-plist (revision 311634) @@ -1,206 +1,203 @@ include/KDE/Phonon/AbstractAudioOutput include/KDE/Phonon/AbstractMediaStream include/KDE/Phonon/AbstractVideoOutput include/KDE/Phonon/AddonInterface include/KDE/Phonon/AudioDevice include/KDE/Phonon/AudioDeviceEnumerator include/KDE/Phonon/AudioOutput include/KDE/Phonon/AudioOutputDevice include/KDE/Phonon/AudioOutputDeviceModel include/KDE/Phonon/AudioOutputInterface include/KDE/Phonon/BackendCapabilities include/KDE/Phonon/BackendInterface include/KDE/Phonon/Effect include/KDE/Phonon/EffectDescription include/KDE/Phonon/EffectDescriptionModel include/KDE/Phonon/EffectInterface include/KDE/Phonon/EffectParameter include/KDE/Phonon/EffectWidget include/KDE/Phonon/Experimental/AbstractVideoDataOutput include/KDE/Phonon/Experimental/AudioDataOutput include/KDE/Phonon/Experimental/SnapshotInterface include/KDE/Phonon/Experimental/VideoDataOutput include/KDE/Phonon/Experimental/VideoDataOutputInterface include/KDE/Phonon/Experimental/VideoFrame include/KDE/Phonon/Experimental/VideoFrame2 include/KDE/Phonon/Experimental/Visualization include/KDE/Phonon/Global include/KDE/Phonon/MediaController include/KDE/Phonon/MediaNode include/KDE/Phonon/MediaObject include/KDE/Phonon/MediaObjectInterface include/KDE/Phonon/MediaSource include/KDE/Phonon/ObjectDescription include/KDE/Phonon/ObjectDescriptionModel include/KDE/Phonon/Path include/KDE/Phonon/PlatformPlugin include/KDE/Phonon/SeekSlider include/KDE/Phonon/StreamInterface include/KDE/Phonon/VideoPlayer include/KDE/Phonon/VideoWidget include/KDE/Phonon/VideoWidgetInterface include/KDE/Phonon/VolumeFaderEffect include/KDE/Phonon/VolumeFaderInterface include/KDE/Phonon/VolumeSlider include/phonon/AbstractAudioOutput include/phonon/AbstractMediaStream include/phonon/AbstractVideoOutput include/phonon/AddonInterface include/phonon/AudioCaptureDevice include/phonon/AudioCaptureDeviceModel include/phonon/AudioChannelDescription include/phonon/AudioChannelDescriptionModel include/phonon/AudioDataOutput include/phonon/AudioOutput include/phonon/AudioOutputDevice include/phonon/AudioOutputDeviceModel include/phonon/AudioOutputInterface include/phonon/AudioOutputInterface40 include/phonon/AudioOutputInterface42 include/phonon/AvCapture include/phonon/BackendCapabilities include/phonon/BackendInterface include/phonon/Effect include/phonon/EffectDescription include/phonon/EffectDescriptionModel include/phonon/EffectInterface include/phonon/EffectParameter include/phonon/EffectWidget include/phonon/Global include/phonon/GlobalDescriptionContainer include/phonon/MediaController include/phonon/MediaNode include/phonon/MediaObject include/phonon/MediaObjectInterface include/phonon/MediaSource include/phonon/Mrl include/phonon/ObjectDescription include/phonon/ObjectDescriptionData include/phonon/ObjectDescriptionModel include/phonon/ObjectDescriptionModelData include/phonon/Path include/phonon/Phonon include/phonon/PlatformPlugin include/phonon/SeekSlider include/phonon/StreamInterface include/phonon/SubtitleDescription include/phonon/SubtitleDescriptionModel include/phonon/VideoCaptureDevice include/phonon/VideoCaptureDeviceModel include/phonon/VideoPlayer include/phonon/VideoWidget include/phonon/VideoWidgetInterface include/phonon/VideoWidgetInterface44 include/phonon/VideoWidgetInterfaceLatest include/phonon/VolumeFaderEffect include/phonon/VolumeFaderInterface include/phonon/VolumeSlider include/phonon/abstractaudiooutput.h include/phonon/abstractmediastream.h include/phonon/abstractvideooutput.h include/phonon/addoninterface.h include/phonon/audiodataoutput.h include/phonon/audiodataoutputinterface.h include/phonon/audiooutput.h include/phonon/audiooutputinterface.h include/phonon/backendcapabilities.h include/phonon/backendinterface.h include/phonon/effect.h include/phonon/effectinterface.h include/phonon/effectparameter.h include/phonon/effectwidget.h include/phonon/experimental/abstractaudiodataoutput.h include/phonon/experimental/abstractvideodataoutput.h include/phonon/experimental/audiodataoutput.h include/phonon/experimental/audiodataoutputinterface.h include/phonon/experimental/audioformat.h include/phonon/experimental/avcapture.h include/phonon/experimental/avcaptureinterface.h include/phonon/experimental/backendcapabilities.h include/phonon/experimental/backendinterface.h include/phonon/experimental/export.h include/phonon/experimental/globalconfig.h include/phonon/experimental/mediasource.h include/phonon/experimental/objectdescription.h include/phonon/experimental/packet.h include/phonon/experimental/packetpool.h include/phonon/experimental/phononnamespace.h include/phonon/experimental/snapshotinterface.h include/phonon/experimental/videodataoutput.h include/phonon/experimental/videodataoutput2.h include/phonon/experimental/videodataoutputinterface.h include/phonon/experimental/videoframe.h include/phonon/experimental/videoframe2.h include/phonon/experimental/videowidget.h include/phonon/experimental/visualization.h include/phonon/globalconfig.h include/phonon/globaldescriptioncontainer.h include/phonon/mediacontroller.h include/phonon/medianode.h include/phonon/mediaobject.h include/phonon/mediaobjectinterface.h include/phonon/mediasource.h include/phonon/mrl.h include/phonon/objectdescription.h include/phonon/objectdescriptionmodel.h include/phonon/path.h include/phonon/phonon_export.h include/phonon/phonondefs.h include/phonon/phononnamespace.h include/phonon/platformplugin.h include/phonon/pulsesupport.h include/phonon/seekslider.h include/phonon/streaminterface.h include/phonon/videoplayer.h include/phonon/videowidget.h include/phonon/videowidgetinterface.h include/phonon/volumefadereffect.h include/phonon/volumefaderinterface.h include/phonon/volumeslider.h lib/cmake/phonon/PhononConfig.cmake lib/cmake/phonon/PhononConfigVersion.cmake lib/cmake/phonon/PhononTargets-release.cmake lib/cmake/phonon/PhononTargets.cmake lib/libphonon.so lib/libphonon.so.4 lib/libphonon.so.4.6.0 lib/libphononexperimental.so lib/libphononexperimental.so.4 lib/libphononexperimental.so.4.6.0 libdata/pkgconfig/phonon.pc share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml %%DATADIR%%/buildsystem/COPYING-CMAKE-SCRIPTS %%DATADIR%%/buildsystem/FindAutomoc4.cmake %%DATADIR%%/buildsystem/FindPackageHandleStandardArgs.cmake %%DATADIR%%/buildsystem/FindPhononInternal.cmake %%DATADIR%%/buildsystem/FindQt4.cmake %%DATADIR%%/buildsystem/MacroEnsureVersion.cmake %%DATADIR%%/buildsystem/MacroLogFeature.cmake %%DATADIR%%/buildsystem/MacroOptionalFindPackage.cmake %%DATADIR%%/buildsystem/MacroPushRequiredVars.cmake %%DATADIR%%/buildsystem/PhononMacros.cmake %%DATADIR%%/buildsystem/Qt4ConfigDependentSettings.cmake %%DATADIR%%/buildsystem/Qt4Macros.cmake %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in @dirrm %%DATADIR%%/buildsystem @dirrm %%DATADIR%% @dirrm lib/cmake/phonon @dirrmtry lib/cmake @dirrm include/phonon/experimental @dirrm include/phonon @dirrm include/KDE/Phonon/Experimental @dirrm include/KDE/Phonon @cwd %%QT_PREFIX%% %%QT_INCDIR_REL%%/Phonon %%QT_INCDIR_REL%%/phonon %%QT_LIBDIR_REL%%/libphonon.so %%QT_LIBDIR_REL%%/libphonon.so.4 %%QT_LIBDIR_REL%%/libphononexperimental.so %%QT_LIBDIR_REL%%/libphononexperimental.so.4 -%%DESIGNER%%%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so share/qt4/mkspecs/modules/qt_phonon.pri @dirrmtry share/qt4/mkspecs/modules -%%DESIGNER%%@dirrmtry %%QT_PLUGINDIR_REL%%/designer -%%DESIGNER%%@dirrmtry %%QT_PLUGINDIR_REL%% @dirrmtry %%QT_LIBDIR_REL%% @dirrmtry %%QT_INCDIR_REL%% Property changes on: head/multimedia/phonon/pkg-plist ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/phonon-gstreamer/Makefile =================================================================== --- head/multimedia/phonon-gstreamer/Makefile (revision 311633) +++ head/multimedia/phonon-gstreamer/Makefile (revision 311634) @@ -1,66 +1,64 @@ -# New ports collection Makefile for: phonon -# Date created: 2008-01-30 -# Whom: Martin Wilke -# +# Created by: Martin Wilke # $FreeBSD$ PORTNAME= phonon PORTVERSION= 4.6.2 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src PKGNAMESUFFIX= -gstreamer DISTNAME= ${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= GStreamer backend for Phonon # Required in order to avoid conflicts with multimedia/phonon's OPTIONS. LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} CONFLICTS= qt4-phonon-gst-4* PHONON_BRANCH= stable USE_GL= gl USE_GNOME= glib20 libxml2 USE_GSTREAMER= yes USE_KDE4= kdehier kdeprefix automoc4 USE_QT4= gui phonon xml \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 USE_XZ= yes USE_CMAKE= yes MAKE_JOBS_SAFE= yes PLIST_SUB+= QT_PREFIX=${QT_PREFIX} .if defined(WITH_QT_PHONON) IGNORE= conflicts with Qt 4 Phonon. Please, deinstall qt4-phonon-gst and unset WITH_QT_PHONON to continue .endif -OPTIONS_DEFINE= PLUGINS -PLUGINS_DESC= Install GStreamer plugins +OPTIONS_DEFINE= GST_PLUGINS +GST_PLUGINS_DESC= Install GStreamer plugins + OPTIONS_DEFAULT= .include -.if ${PORT_OPTIONS:MPLUGINS} +.if ${PORT_OPTIONS:MGST_PLUGINS} RUN_DEPENDS+= gstreamer-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer-plugins-all .else SUB_FILES= pkg-message .endif pre-su-install: ${MKDIR} ${QT_PLUGINDIR}/phonon_backend post-install: ${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so \ ${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so -.if empty(PORT_OPTIONS:MPLUGINS) +.if ! ${PORT_OPTIONS:MGST_PLUGINS} @${CAT} ${PKGMESSAGE} .endif .include