From 44b9430f035afad59d7dbe3b3d1cedb006bd0ae5 Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 21 May 2013 12:13:14 +0000 Subject: Update to 4.6.0 Add pulseaudio option This release contains numerous improvements across the board since 4.5.1: QZeitgeist 0.8 is supported Various buildsystem fixes, allowing other packages to find phonon easier Fewer KDE dependencies Many improvements to PulseAudio integration Remove runtime backend switching Copious quantities of vanilla frosting Stability improvements LGPL relicensing Misc fixes to Zeitgeist integration Extra cinamon spice --- multimedia/phonon/Makefile | 11 ++++++----- multimedia/phonon/PLIST | 32 ++++++++++++++++++++------------ multimedia/phonon/distinfo | 8 ++++---- multimedia/phonon/options.mk | 13 +++++++++++++ 4 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 multimedia/phonon/options.mk (limited to 'multimedia') diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index a1930e5325a..dc12ff09588 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2013/04/06 12:08:40 rodent Exp $ +# $NetBSD: Makefile,v 1.32 2013/05/21 12:13:14 markd Exp $ -DISTNAME= phonon-4.5.1 -PKGREVISION= 8 +DISTNAME= phonon-4.6.0 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.5.1/src/} +MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.6.0/src/} EXTRACT_SUFX= .tar.xz MAINTAINER= markd@NetBSD.org @@ -20,7 +19,9 @@ USE_LANGUAGES= c c++ USE_CMAKE= yes CMAKE_ARG_PATH= .. CONFIGURE_DIRS= _build -CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF +CMAKE_ARGS+= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE + +.include "options.mk" PKGCONFIG_OVERRIDE+= phonon.pc.cmake diff --git a/multimedia/phonon/PLIST b/multimedia/phonon/PLIST index 1483153197c..4c8f133f540 100644 --- a/multimedia/phonon/PLIST +++ b/multimedia/phonon/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2012/03/19 10:07:52 markd Exp $ +@comment $NetBSD: PLIST,v 1.7 2013/05/21 12:13:14 markd Exp $ include/KDE/Phonon/AbstractAudioOutput include/KDE/Phonon/AbstractMediaStream include/KDE/Phonon/AbstractVideoOutput @@ -68,6 +68,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,6 +157,10 @@ 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-noconfig.cmake +lib/cmake/phonon/PhononTargets.cmake lib/libphonon.so lib/libphonon.so.4 lib/libphonon.so.${PKGVERSION} @@ -165,14 +171,16 @@ lib/pkgconfig/phonon.pc qt4/mkspecs/modules/qt_phonon.pri qt4/plugins/designer/libphononwidgets.so 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 +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/Qt4ConfigDependentSettings.cmake +share/phonon/buildsystem/Qt4Macros.cmake +share/phonon/buildsystem/cmake_uninstall.cmake.in diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo index 97cbc10e32c..42251d516c1 100644 --- a/multimedia/phonon/distinfo +++ b/multimedia/phonon/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2012/03/19 10:07:52 markd Exp $ +$NetBSD: distinfo,v 1.7 2013/05/21 12:13:14 markd Exp $ -SHA1 (phonon-4.5.1.tar.xz) = 710a9ffffe7e558f4d0ce5ea5c118cb248fb8da8 -RMD160 (phonon-4.5.1.tar.xz) = b5aa9313b62bac7d5233716db52c9275168ee191 -Size (phonon-4.5.1.tar.xz) = 291088 bytes +SHA1 (phonon-4.6.0.tar.xz) = d8dbc188b58c6dd9c6a73d3742a25291e647bb95 +RMD160 (phonon-4.6.0.tar.xz) = 4b6037744c519613f0e39065a92d6742305e1366 +Size (phonon-4.6.0.tar.xz) = 280712 bytes diff --git a/multimedia/phonon/options.mk b/multimedia/phonon/options.mk new file mode 100644 index 00000000000..0c939b6877c --- /dev/null +++ b/multimedia/phonon/options.mk @@ -0,0 +1,13 @@ +# $NetBSD: options.mk,v 1.1 2013/05/21 12:13:14 markd Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.phonon +PKG_SUPPORTED_OPTIONS= pulseaudio +PKG_SUGGESTED_OPTIONS= + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mpulseaudio) +.include "../../audio/pulseaudio/buildlink3.mk" +.else +CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF +.endif -- cgit v1.2.3