diff options
Diffstat (limited to 'multimedia/phonon')
| -rw-r--r-- | multimedia/phonon/Makefile | 24 | ||||
| -rw-r--r-- | multimedia/phonon/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/phonon/files/patch-CMakeLists.txt | 30 | ||||
| -rw-r--r-- | multimedia/phonon/files/patch-phonon__globalconfig.cpp | 11 | ||||
| -rw-r--r-- | multimedia/phonon/pkg-descr | 4 | ||||
| -rw-r--r-- | multimedia/phonon/pkg-plist | 47 |
6 files changed, 44 insertions, 76 deletions
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index a71e8a1ce8a9..3ad49c557f44 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -5,16 +5,16 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.5.1 +PORTVERSION= 4.6.0 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= Multimedia framework for KDE 4 +COMMENT= KDE multimedia framework -LIB_DEPENDS= qzeitgeist.0:${PORTSDIR}/sysutils/qzeitgeist +LIB_DEPENDS= qzeitgeist.1:${PORTSDIR}/sysutils/qzeitgeist CONFLICTS= qt4-phonon-4* @@ -26,6 +26,8 @@ QT_COMPONENTS= 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 MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes @@ -34,10 +36,8 @@ OPTIONS= PULSEAUDIO "Support playback via PulseAudio" off .include <bsd.port.options.mk> -# FIXME: Enable this option with Qt 4.8 (qt4-webkit does not depend on -# phonon anymore). -# qt4-designer depends on qt4-webkit, hence on phonon. Disable this -# option to avoid a circular dependency. +# qt4-designer depends on phonon. Disable this option to avoid a +# circular dependency. .undef WITH_DESIGNER .ifdef(WITH_DESIGNER) QT_COMPONENTS+= designer @@ -66,20 +66,14 @@ pre-configure: ${REINPLACE_CMD} -e '/phonon.pc/s|pkgconfig|../libdata/pkgconfig|' \ -e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\ ${PATCH_WRKSRC}/CMakeLists.txt - ${REINPLACE_CMD} -e '/add_subdirectory(tests)/ d' \ - ${PATCH_WRKSRC}/${PORTNAME}/experimental/CMakeLists.txt -# FIXME: We need to pass -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=1 -# to install the designer plugin and the Qt .pri file into the -# system-wide Qt directory in the next release. -# Reference: http://commits.kde.org/phonon/664035456f0c9dc85b65c893f431b82118c281c0 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.4.5.1 ${QT_LIBDIR}/lib${lib}.so - ${LN} -sf ${PREFIX}/lib/lib${lib}.so.4.5.1 ${QT_LIBDIR}/lib${lib}.so.4 + ${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} diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo index f215b2067a69..24e954a200a8 100644 --- a/multimedia/phonon/distinfo +++ b/multimedia/phonon/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/phonon-4.5.1.tar.xz) = 0180f01cb6cae907285adf76e4aece9be33af6a352dc057709e40b7838e2f4c8 -SIZE (KDE/phonon-4.5.1.tar.xz) = 291088 +SHA256 (KDE/phonon-4.6.0.tar.xz) = 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4 +SIZE (KDE/phonon-4.6.0.tar.xz) = 280712 diff --git a/multimedia/phonon/files/patch-CMakeLists.txt b/multimedia/phonon/files/patch-CMakeLists.txt deleted file mode 100644 index 9d6f2b74f048..000000000000 --- a/multimedia/phonon/files/patch-CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -commit 353bf15657c9a93138bce7431c5180b25efaede7 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Nov 14 19:14:02 2011 -0200 - - Fix if() clause the same way 13ec1718 does. - - QT_QTDESIGNER_FOUND should not be expanded, as if it is not found the if - clause will effectively become `if(AND PHONON_BUILD_DESIGNER_PLUGIN)`. - - This was fixed in master by commit 13ec1718, which for some reason has - never made its way to the 4.5 branch. - - CCMAIL: kde-multimedia@kde.org - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7fbb816..71cb14a 100644 ---- ./CMakeLists.txt -+++ ./CMakeLists.txt -@@ -55,9 +55,9 @@ endif(QT_QTDBUS_FOUND) - set(BUILDSYSTEM_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/phonon-buildsystem/) - - add_subdirectory(cmake) --if(${QT_QTDESIGNER_FOUND} AND PHONON_BUILD_DESIGNER_PLUGIN) -+if(QT_QTDESIGNER_FOUND AND PHONON_BUILD_DESIGNER_PLUGIN) - add_subdirectory(designer) --endif(${QT_QTDESIGNER_FOUND} AND PHONON_BUILD_DESIGNER_PLUGIN) -+endif(QT_QTDESIGNER_FOUND AND PHONON_BUILD_DESIGNER_PLUGIN) - add_subdirectory(phonon) - add_subdirectory(includes) - if(PHONON_BUILD_DEMOS) diff --git a/multimedia/phonon/files/patch-phonon__globalconfig.cpp b/multimedia/phonon/files/patch-phonon__globalconfig.cpp deleted file mode 100644 index 627aec68274a..000000000000 --- a/multimedia/phonon/files/patch-phonon__globalconfig.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./phonon/globalconfig.cpp.orig 2011-09-09 13:27:00.943109464 +0200 -+++ ./phonon/globalconfig.cpp 2011-09-09 15:22:15.732984584 +0200 -@@ -35,6 +35,8 @@ - #include <QtCore/QList> - #include <QtCore/QVariant> - -+#define QT_NO_PHONON_PLATFORMPLUGIN -+ - QT_BEGIN_NAMESPACE - - namespace Phonon diff --git a/multimedia/phonon/pkg-descr b/multimedia/phonon/pkg-descr index bfb440853438..b48921fd39bd 100644 --- a/multimedia/phonon/pkg-descr +++ b/multimedia/phonon/pkg-descr @@ -1,4 +1,4 @@ Phonon is the framework responsible for an ubiquitous multimedia -experience in KDE 4. +experience in KDE Software Compilation 4. -WWW: http://phonon.kde.org +WWW: http://phonon.kde.org diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist index 1d78e273b985..b7d76db0ebf6 100644 --- a/multimedia/phonon/pkg-plist +++ b/multimedia/phonon/pkg-plist @@ -67,6 +67,7 @@ include/phonon/EffectInterface include/phonon/EffectParameter include/phonon/EffectWidget include/phonon/Global +include/phonon/GlobalDescriptionContainer include/phonon/MediaController include/phonon/MediaNode include/phonon/MediaObject @@ -133,6 +134,7 @@ 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 @@ -155,37 +157,50 @@ 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.5.1 +lib/libphonon.so.4.6.0 lib/libphononexperimental.so lib/libphononexperimental.so.4 -lib/libphononexperimental.so.4.5.1 -%%DESIGNER%%lib/kde4/libphononwidgets.so +lib/libphononexperimental.so.4.6.0 libdata/pkgconfig/phonon.pc share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml -share/phonon-buildsystem/COPYING-CMAKE-SCRIPTS -share/phonon-buildsystem/FindAutomoc4.cmake -share/phonon-buildsystem/FindPackageHandleStandardArgs.cmake -share/phonon-buildsystem/FindPhononInternal.cmake -share/phonon-buildsystem/FindQt4.cmake -share/phonon-buildsystem/MacroEnsureVersion.cmake -share/phonon-buildsystem/MacroLogFeature.cmake -share/phonon-buildsystem/MacroOptionalFindPackage.cmake -share/phonon-buildsystem/MacroPushRequiredVars.cmake -share/phonon-buildsystem/PhononMacros.cmake -share/phonon-buildsystem/cmake_uninstall.cmake.in -@dirrm share/phonon-buildsystem +%%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_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%% |