diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile index dc9536938146..b6e568d344c9 100644 --- a/multimedia/phonon-designerplugin/Makefile +++ b/multimedia/phonon-designerplugin/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.8.3 +PORTVERSION= 4.9.0 CATEGORIES= multimedia kde -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX= -designerplugin DIST_SUBDIR= KDE diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile index 7ea43f11124b..d5833b1b561b 100644 --- a/multimedia/phonon-gstreamer/Makefile +++ b/multimedia/phonon-gstreamer/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.8.2 -PORTREVISION= 1 +PORTVERSION= 4.9.0 CATEGORIES= multimedia kde -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION} PKGNAMESUFFIX= -gstreamer DISTNAME= ${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= KDE @@ -15,6 +14,8 @@ COMMENT= GStreamer backend for Phonon LICENSE= LGPL21 +WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} + USES= cmake kde:4 pkgconfig tar:xz USE_GL= gl USE_GNOME= glib20 libxml2 diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo index d0a1351adf83..79a7b3fd7eeb 100644 --- a/multimedia/phonon-gstreamer/distinfo +++ b/multimedia/phonon-gstreamer/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/phonon-backend-gstreamer-4.8.2.tar.xz) = 20e0f71f2beb4f859db8385079a13aef5473863ee6f27aad7b065aa7bfe931e0 -SIZE (KDE/phonon-backend-gstreamer-4.8.2.tar.xz) = 76044 +TIMESTAMP = 1472999348 +SHA256 (KDE/phonon-backend-gstreamer-4.9.0.tar.xz) = cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1 +SIZE (KDE/phonon-backend-gstreamer-4.9.0.tar.xz) = 75960 diff --git a/multimedia/phonon-gstreamer/files/patch-CMakeLists.txt b/multimedia/phonon-gstreamer/files/patch-CMakeLists.txt deleted file mode 100644 index f82e7f0bea11..000000000000 --- a/multimedia/phonon-gstreamer/files/patch-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2015-09-28 21:27:35.073619000 +0200 -+++ CMakeLists.txt 2015-09-28 21:44:28.823199000 +0200 -@@ -50,6 +50,7 @@ - macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html" TRUE) - - -+add_definitions(${GSTREAMER_DEFINITIONS}) - - add_subdirectory(gstreamer) - diff --git a/multimedia/phonon-gstreamer/pkg-plist b/multimedia/phonon-gstreamer/pkg-plist index 38ca3188d241..bf3ee3915298 100644 --- a/multimedia/phonon-gstreamer/pkg-plist +++ b/multimedia/phonon-gstreamer/pkg-plist @@ -1,4 +1,5 @@ lib/kde4/plugins/phonon_backend/phonon_gstreamer.so +%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so share/icons/hicolor/128x128/apps/phonon-gstreamer.png share/icons/hicolor/16x16/apps/phonon-gstreamer.png share/icons/hicolor/22x22/apps/phonon-gstreamer.png @@ -6,4 +7,3 @@ share/icons/hicolor/48x48/apps/phonon-gstreamer.png share/icons/hicolor/64x64/apps/phonon-gstreamer.png share/icons/hicolor/scalable/apps/phonon-gstreamer.svgz share/kde4/services/phononbackends/gstreamer.desktop -%%QT_PREFIX%%/%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile index 7ef036377fe6..21a97b59622e 100644 --- a/multimedia/phonon-vlc/Makefile +++ b/multimedia/phonon-vlc/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTVERSION= 0.9.0 CATEGORIES= multimedia kde -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION} PKGNAMESUFFIX= -vlc DISTNAME= ${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= KDE @@ -14,6 +13,8 @@ COMMENT= VLC backend for Phonon LIB_DEPENDS= libvlc.so:multimedia/vlc-qt4 +WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} + USES= cmake kde:4 pkgconfig tar:xz USE_KDE= automoc4 USE_QT4= corelib gui phonon \ diff --git a/multimedia/phonon-vlc/distinfo b/multimedia/phonon-vlc/distinfo index e2011a3fefff..bc6f33e5ec07 100644 --- a/multimedia/phonon-vlc/distinfo +++ b/multimedia/phonon-vlc/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/phonon-backend-vlc-0.8.2.tar.xz) = dab7f8edf53ee90998e5e3fcf2f6bd0a13750511b0ecde6939be0664d46bdaa3 -SIZE (KDE/phonon-backend-vlc-0.8.2.tar.xz) = 59832 +TIMESTAMP = 1472999353 +SHA256 (KDE/phonon-backend-vlc-0.9.0.tar.xz) = c0ced7ca571acc22211eecf5158241714fa9ccdb82d4fe0a970ad702860ccdbe +SIZE (KDE/phonon-backend-vlc-0.9.0.tar.xz) = 60044 diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index f7288cd6ed88..92a9b8ac9a8b 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.8.3 +PORTVERSION= 4.9.0 CATEGORIES= multimedia kde -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo index d0bceaf3c4d0..ae4ed27f5fa8 100644 --- a/multimedia/phonon/distinfo +++ b/multimedia/phonon/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/phonon-4.8.3.tar.xz) = a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16 -SIZE (KDE/phonon-4.8.3.tar.xz) = 322012 +TIMESTAMP = 1472999341 +SHA256 (KDE/phonon-4.9.0.tar.xz) = bb74b40f18ade1d9ab89ffcd7aeb7555be797ca395f1224c488b394da6deb0e0 +SIZE (KDE/phonon-4.9.0.tar.xz) = 321860 diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist index 4b9ea72f5a2c..ea28945103eb 100644 --- a/multimedia/phonon/pkg-plist +++ b/multimedia/phonon/pkg-plist @@ -159,6 +159,10 @@ include/phonon/volumefaderinterface.h include/phonon/volumeslider.h lib/cmake/phonon/PhononConfig.cmake lib/cmake/phonon/PhononConfigVersion.cmake +lib/cmake/phonon/PhononExperimentalConfig.cmake +lib/cmake/phonon/PhononExperimentalConfigVersion.cmake +lib/cmake/phonon/PhononExperimentalTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/phonon/PhononExperimentalTargets.cmake lib/cmake/phonon/PhononTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/phonon/PhononTargets.cmake lib/libphonon.so @@ -170,7 +174,6 @@ lib/libphononexperimental.so.%%SHLIB_VER%% 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/MacroEnsureVersion.cmake @@ -178,6 +181,8 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml %%DATADIR%%/buildsystem/MacroOptionalFindPackage.cmake %%DATADIR%%/buildsystem/MacroPushRequiredVars.cmake %%DATADIR%%/buildsystem/PhononMacros.cmake +%%DATADIR%%/buildsystem/PhononQt4.cmake +%%DATADIR%%/buildsystem/PhononQt5.cmake %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in %%QT_PREFIX%%/%%QT_INCDIR%%/Phonon %%QT_PREFIX%%/%%QT_INCDIR%%/phonon diff --git a/multimedia/qt5-phonon4-designerplugin/Makefile b/multimedia/qt5-phonon4-designerplugin/Makefile index cea26ace4ce7..f3173b02dc42 100644 --- a/multimedia/qt5-phonon4-designerplugin/Makefile +++ b/multimedia/qt5-phonon4-designerplugin/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.8.3 +PORTVERSION= 4.9.0 CATEGORIES= multimedia kde -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= qt5- PKGNAMESUFFIX= 4 PKGNAMESUFFIX= -designerplugin @@ -14,6 +14,8 @@ COMMENT= Qt 5 Designer plugin for Phonon 4 LICENSE= LGPL21 +BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/extra-cmake-modules + USES= cmake tar:xz USE_QT5= buildtools_build qmake_build designer phonon4 CMAKE_ARGS= -DPHONON_QT_PLUGIN_INSTALL_DIR=${PREFIX}/${QT_PLUGINDIR_REL}/designer \ @@ -23,6 +25,6 @@ BUILD_WRKSRC= ${WRKSRC}/designer INSTALL_WRKSRC= ${BUILD_WRKSRC} DISTINFO_FILE= ${.CURDIR:H}/qt5-phonon4/distinfo -PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/libphononwidgets.so +PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/phononwidgets.so .include diff --git a/multimedia/qt5-phonon4-gstreamer/Makefile b/multimedia/qt5-phonon4-gstreamer/Makefile index cbaefa215243..1d91b59489ee 100644 --- a/multimedia/qt5-phonon4-gstreamer/Makefile +++ b/multimedia/qt5-phonon4-gstreamer/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.8.2 +PORTVERSION= 4.9.0 CATEGORIES= multimedia -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend-gstreamer/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend-gstreamer/${PORTVERSION} PKGNAMEPREFIX= qt5- PKGNAMESUFFIX= 4-gstreamer DISTNAME= ${PORTNAME}-backend-gstreamer-${PORTVERSION} @@ -15,11 +15,16 @@ COMMENT= GStreamer backend for Phonon 4 Qt 5 LICENSE= LGPL21 +BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/extra-cmake-modules + +WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} + USES= cmake pkgconfig tar:xz USE_GL= gl USE_GNOME= glib20 libxml2 USE_GSTREAMER1= yes -USE_QT5= buildtools_build qmake_build core gui opengl widgets phonon4 +USE_QT5= buildtools_build qmake_build core gui opengl phonon widgets \ + x11extras CMAKE_ARGS= -DPHONON_BUILD_PHONON4QT5=ON OPTIONS_DEFINE= GST_PLUGINS diff --git a/multimedia/qt5-phonon4-gstreamer/distinfo b/multimedia/qt5-phonon4-gstreamer/distinfo index d0a1351adf83..ff2af7bae749 100644 --- a/multimedia/qt5-phonon4-gstreamer/distinfo +++ b/multimedia/qt5-phonon4-gstreamer/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/phonon-backend-gstreamer-4.8.2.tar.xz) = 20e0f71f2beb4f859db8385079a13aef5473863ee6f27aad7b065aa7bfe931e0 -SIZE (KDE/phonon-backend-gstreamer-4.8.2.tar.xz) = 76044 +TIMESTAMP = 1472999371 +SHA256 (KDE/phonon-backend-gstreamer-4.9.0.tar.xz) = cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1 +SIZE (KDE/phonon-backend-gstreamer-4.9.0.tar.xz) = 75960 diff --git a/multimedia/qt5-phonon4-gstreamer/files/patch-CMakeLists.txt b/multimedia/qt5-phonon4-gstreamer/files/patch-CMakeLists.txt deleted file mode 100644 index a1c5fb44484a..000000000000 --- a/multimedia/qt5-phonon4-gstreamer/files/patch-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2015-09-28 22:29:01.280860000 +0200 -+++ CMakeLists.txt 2015-09-28 22:29:20.710032000 +0200 -@@ -50,6 +50,7 @@ - macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html" TRUE) - - -+add_definitions(${GSTREAMER_DEFINITIONS}) - - add_subdirectory(gstreamer) - diff --git a/multimedia/qt5-phonon4-vlc/Makefile b/multimedia/qt5-phonon4-vlc/Makefile index d4c668d6259d..e26e444f75a9 100644 --- a/multimedia/qt5-phonon4-vlc/Makefile +++ b/multimedia/qt5-phonon4-vlc/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 0.8.2 +PORTVERSION= 0.9.0 CATEGORIES= multimedia -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION} PKGNAMEPREFIX= qt5- PKGNAMESUFFIX= -vlc DISTNAME= ${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION} @@ -12,8 +12,11 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= VLC backend for Phonon 4 Qt 5 +BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/extra-cmake-modules LIB_DEPENDS= libvlc.so:multimedia/vlc +WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} + USES= cmake pkgconfig tar:xz USE_QT5= core gui widgets phonon4 \ buildtools_build qmake_build diff --git a/multimedia/qt5-phonon4-vlc/distinfo b/multimedia/qt5-phonon4-vlc/distinfo index e2011a3fefff..986d9320a8f0 100644 --- a/multimedia/qt5-phonon4-vlc/distinfo +++ b/multimedia/qt5-phonon4-vlc/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/phonon-backend-vlc-0.8.2.tar.xz) = dab7f8edf53ee90998e5e3fcf2f6bd0a13750511b0ecde6939be0664d46bdaa3 -SIZE (KDE/phonon-backend-vlc-0.8.2.tar.xz) = 59832 +TIMESTAMP = 1472999373 +SHA256 (KDE/phonon-backend-vlc-0.9.0.tar.xz) = c0ced7ca571acc22211eecf5158241714fa9ccdb82d4fe0a970ad702860ccdbe +SIZE (KDE/phonon-backend-vlc-0.9.0.tar.xz) = 60044 diff --git a/multimedia/qt5-phonon4/Makefile b/multimedia/qt5-phonon4/Makefile index 805bb468f2cf..cbf0f844b1d0 100644 --- a/multimedia/qt5-phonon4/Makefile +++ b/multimedia/qt5-phonon4/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.8.3 +PORTVERSION= 4.9.0 CATEGORIES= multimedia -MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= qt5- PKGNAMESUFFIX= 4 DIST_SUBDIR= KDE @@ -13,6 +13,8 @@ COMMENT= Phonon 4 transitional library for Qt 5 LICENSE= LGPL21 +BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/extra-cmake-modules + USES= cmake pathfix tar:xz USE_QT5= core dbus declarative gui opengl widgets \ buildtools_build qmake_build diff --git a/multimedia/qt5-phonon4/distinfo b/multimedia/qt5-phonon4/distinfo index d0bceaf3c4d0..96a2170dcd95 100644 --- a/multimedia/qt5-phonon4/distinfo +++ b/multimedia/qt5-phonon4/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/phonon-4.8.3.tar.xz) = a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16 -SIZE (KDE/phonon-4.8.3.tar.xz) = 322012 +TIMESTAMP = 1472999358 +SHA256 (KDE/phonon-4.9.0.tar.xz) = bb74b40f18ade1d9ab89ffcd7aeb7555be797ca395f1224c488b394da6deb0e0 +SIZE (KDE/phonon-4.9.0.tar.xz) = 321860 diff --git a/multimedia/qt5-phonon4/pkg-plist b/multimedia/qt5-phonon4/pkg-plist index 592b48aebdc6..647a0859b634 100644 --- a/multimedia/qt5-phonon4/pkg-plist +++ b/multimedia/qt5-phonon4/pkg-plist @@ -158,6 +158,10 @@ include/phonon4qt5/phonon/volumefaderinterface.h include/phonon4qt5/phonon/volumeslider.h lib/cmake/phonon4qt5/Phonon4Qt5Config.cmake lib/cmake/phonon4qt5/Phonon4Qt5ConfigVersion.cmake +lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfig.cmake +lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfigVersion.cmake +lib/cmake/phonon4qt5/PhononExperimentalTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/phonon4qt5/PhononExperimentalTargets.cmake lib/cmake/phonon4qt5/PhononTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/phonon4qt5/PhononTargets.cmake lib/libphonon4qt5.so @@ -170,7 +174,6 @@ lib/libphonon4qt5experimental.so.%%SHLIB_VER%% libdata/pkgconfig/phonon4qt5.pc share/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml share/phonon4qt5/buildsystem/COPYING-CMAKE-SCRIPTS -share/phonon4qt5/buildsystem/FindAutomoc4.cmake share/phonon4qt5/buildsystem/FindPackageHandleStandardArgs.cmake share/phonon4qt5/buildsystem/FindPhononInternal.cmake share/phonon4qt5/buildsystem/MacroEnsureVersion.cmake @@ -178,4 +181,6 @@ share/phonon4qt5/buildsystem/MacroLogFeature.cmake share/phonon4qt5/buildsystem/MacroOptionalFindPackage.cmake share/phonon4qt5/buildsystem/MacroPushRequiredVars.cmake share/phonon4qt5/buildsystem/PhononMacros.cmake +share/phonon4qt5/buildsystem/PhononQt4.cmake +share/phonon4qt5/buildsystem/PhononQt5.cmake share/phonon4qt5/buildsystem/cmake_uninstall.cmake.in