Date: Mon, 4 Feb 2013 16:18:25 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311634 - in head/multimedia: phonon phonon-gstreamer Message-ID: <201302041618.r14GIPX2099277@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Mon Feb 4 16:18:24 2013 New Revision: 311634 URL: http://svnweb.freebsd.org/changeset/ports/311634 Log: Merge from area51 repository: - Trip Makefile header - Convert to new options framework / rename option Modified: head/multimedia/phonon-gstreamer/Makefile head/multimedia/phonon/Makefile (contents, props changed) head/multimedia/phonon/pkg-message (contents, props changed) head/multimedia/phonon/pkg-plist (contents, props changed) Modified: head/multimedia/phonon-gstreamer/Makefile ============================================================================== --- head/multimedia/phonon-gstreamer/Makefile Mon Feb 4 15:58:07 2013 (r311633) +++ head/multimedia/phonon-gstreamer/Makefile Mon Feb 4 16:18:24 2013 (r311634) @@ -1,7 +1,4 @@ -# New ports collection Makefile for: phonon -# Date created: 2008-01-30 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ PORTNAME= phonon @@ -40,14 +37,15 @@ PLIST_SUB+= QT_PREFIX=${QT_PREFIX} 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 <bsd.port.options.mk> -.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 @@ -59,7 +57,7 @@ pre-su-install: 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 Modified: head/multimedia/phonon/Makefile ============================================================================== --- head/multimedia/phonon/Makefile Mon Feb 4 15:58:07 2013 (r311633) +++ head/multimedia/phonon/Makefile Mon Feb 4 16:18:24 2013 (r311634) @@ -1,7 +1,4 @@ -# New ports collection Makefile for: phonon -# Date created: 2008-01-30 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ PORTNAME= phonon @@ -15,7 +12,7 @@ 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* @@ -27,29 +24,17 @@ USE_QT4= dbus gui \ 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 <bsd.port.options.mk> -# 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 Modified: head/multimedia/phonon/pkg-message ============================================================================== --- head/multimedia/phonon/pkg-message Mon Feb 4 15:58:07 2013 (r311633) +++ head/multimedia/phonon/pkg-message Mon Feb 4 16:18:24 2013 (r311634) @@ -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 ====================================================================== Modified: head/multimedia/phonon/pkg-plist ============================================================================== --- head/multimedia/phonon/pkg-plist Mon Feb 4 15:58:07 2013 (r311633) +++ head/multimedia/phonon/pkg-plist Mon Feb 4 16:18:24 2013 (r311634) @@ -197,10 +197,7 @@ share/dbus-1/interfaces/org.kde.Phonon.A %%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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302041618.r14GIPX2099277>