From 3e89b0f33210a21d880e9adb6947c361e96110f0 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Dec 2023 22:26:50 +0100 Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0. --- common/shlibs | 2 ++ srcpkgs/phonon-devel | 1 + srcpkgs/phonon-locale | 1 + srcpkgs/phonon-qt5 | 1 + srcpkgs/phonon-qt5-devel | 2 +- srcpkgs/phonon-qt5/template | 27 -------------- srcpkgs/phonon/template | 51 +++++++++++++++++++++++++++ srcpkgs/{phonon-qt5 => phonon}/update | 0 8 files changed, 57 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/phonon-devel create mode 120000 srcpkgs/phonon-locale create mode 120000 srcpkgs/phonon-qt5 delete mode 100644 srcpkgs/phonon-qt5/template create mode 100644 srcpkgs/phonon/template rename srcpkgs/{phonon-qt5 => phonon}/update (100%) diff --git a/common/shlibs b/common/shlibs index 1a1324543c48a..bb968a1085a57 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2237,6 +2237,8 @@ libqca-qt5.so.2 qca-qt5-2.1.3_1 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1 libphonon4qt5.so.4 phonon-qt5-4.8.3_1 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1 +libphonon4qt6.so.4 phonon-4.12.0_1 +libphonon4qt6experimental.so.4 phonon-4.12.0_1 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1 libtelepathy-qt5-service.so.1 telepathy-qt5-0.9.8_1 libtelepathy-qt5-farstream.so.0 telepathy-qt5-farstream-0.9.5_1 diff --git a/srcpkgs/phonon-devel b/srcpkgs/phonon-devel new file mode 120000 index 0000000000000..ce8c63abf0503 --- /dev/null +++ b/srcpkgs/phonon-devel @@ -0,0 +1 @@ +phonon \ No newline at end of file diff --git a/srcpkgs/phonon-locale b/srcpkgs/phonon-locale new file mode 120000 index 0000000000000..b45aefd2252ca --- /dev/null +++ b/srcpkgs/phonon-locale @@ -0,0 +1 @@ +phonon-qt5 \ No newline at end of file diff --git a/srcpkgs/phonon-qt5 b/srcpkgs/phonon-qt5 new file mode 120000 index 0000000000000..ce8c63abf0503 --- /dev/null +++ b/srcpkgs/phonon-qt5 @@ -0,0 +1 @@ +phonon \ No newline at end of file diff --git a/srcpkgs/phonon-qt5-devel b/srcpkgs/phonon-qt5-devel index b45aefd2252ca..ce8c63abf0503 120000 --- a/srcpkgs/phonon-qt5-devel +++ b/srcpkgs/phonon-qt5-devel @@ -1 +1 @@ -phonon-qt5 \ No newline at end of file +phonon \ No newline at end of file diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template deleted file mode 100644 index 150ef594bb8b8..0000000000000 --- a/srcpkgs/phonon-qt5/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'phonon-qt5' -pkgname=phonon-qt5 -version=4.11.1 -revision=2 -build_style=cmake -configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON" -hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel" -makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel" -short_desc="Multimedia framework for KDE" -maintainer="John " -license="LGPL-2.1-or-later" -homepage="https://phonon.kde.org/" -distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz" -checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d - -phonon-qt5-devel_package() { - depends="qt5-devel ${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/qt5/mkspecs - vmove usr/lib/cmake - vmove usr/lib/pkgconfig - vmove usr/share/phonon4qt5 - vmove usr/lib/qt5/plugins/designer/phononwidgets.so - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template new file mode 100644 index 0000000000000..ff0883ce588b3 --- /dev/null +++ b/srcpkgs/phonon/template @@ -0,0 +1,51 @@ +# Template file for 'phonon' +pkgname=phonon +version=4.12.0 +revision=1 +build_style=cmake +configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON" +hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel + qt6-base qt6-tools qt6-tools" +makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel + qt6-qt5compat-devel" +depends="phonon-locale" +short_desc="Multimedia framework for KDE" +maintainer="John " +license="LGPL-2.1-or-later" +homepage="https://phonon.kde.org/" +distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz" +checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a + +phonon-locale_package() { + pkg_install() { + vmove usr/share/locale + } +} + +phonon-devel_package() { + depends="qt6-base-devel phonon>=${version}_${revision}" + pkg_install() { + vmove usr/lib/cmake/phonon4qt6 + vmove usr/include/phonon4qt6 + vmove usr/lib/pkgconfig/phonon4qt6.pc + vmove "usr/lib/libphonon4qt6*.so" + } +} + +phonon-qt5-devel_package() { + depends="qt5-devel ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include/phonon4qt5 + vmove usr/lib/qt5/mkspecs + vmove usr/lib/cmake/phonon4qt5 + vmove usr/lib/pkgconfig/phonon4qt5.pc + vmove "usr/lib/libphonon4qt5*.so" + } +} + +phonon-qt5_package() { + depends="phonon-locale>=${version}_${revision}" + pkg_install() { + vmove "usr/lib/libphonon4qt5*.so.*" + } +} diff --git a/srcpkgs/phonon-qt5/update b/srcpkgs/phonon/update similarity index 100% rename from srcpkgs/phonon-qt5/update rename to srcpkgs/phonon/update From fbe09e4231ff53a46dd86d0493f5364cab851eb8 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Dec 2023 22:47:56 +0100 Subject: [PATCH 2/2] phonon-qt5-backend-vlc: update to 0.12.0. --- srcpkgs/phonon-backend-vlc/template | 26 +++++++++++++++++++ .../update | 0 srcpkgs/phonon-qt5-backend-vlc | 1 + srcpkgs/phonon-qt5-backend-vlc/template | 23 ---------------- 4 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 srcpkgs/phonon-backend-vlc/template rename srcpkgs/{phonon-qt5-backend-vlc => phonon-backend-vlc}/update (100%) create mode 120000 srcpkgs/phonon-qt5-backend-vlc delete mode 100644 srcpkgs/phonon-qt5-backend-vlc/template diff --git a/srcpkgs/phonon-backend-vlc/template b/srcpkgs/phonon-backend-vlc/template new file mode 100644 index 0000000000000..463cb6b119fb9 --- /dev/null +++ b/srcpkgs/phonon-backend-vlc/template @@ -0,0 +1,26 @@ +# Template file for 'phonon-backend-vlc' +pkgname=phonon-backend-vlc +version=0.12.0 +revision=1 +build_style=cmake +configure_args="-DPHONON_BUILD_PHONON4QT5=ON" +hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-devel + qt5-qmake qt6-base qt6-tools" +makedepends="qt5-devel qt5-tools-devel phonon-qt5-devel vlc-devel + phonon-devel" +short_desc="Phonon VLC backend for Qt6" +maintainer="Duncaen " +license="LGPL-2.1-only" +homepage="https://phonon.kde.org/" +distfiles="${KDE_SITE}/phonon/${pkgname}/${version}/${pkgname}-${version}.tar.xz" +checksum=338479dc451e4b94b3ca5b578def741dcf82f5c626a2807d36235be2dce7c9a5 +lib32disabled=yes + +phonon-qt5-backend-vlc_package() { + provides="phonon-qt5-backend-0_1" + replaces="phonon-qt5-backend>=0" + short_desc="Phonon VLC backend for Qt5" + pkg_install() { + vmove usr/lib/qt5/plugins + } +} diff --git a/srcpkgs/phonon-qt5-backend-vlc/update b/srcpkgs/phonon-backend-vlc/update similarity index 100% rename from srcpkgs/phonon-qt5-backend-vlc/update rename to srcpkgs/phonon-backend-vlc/update diff --git a/srcpkgs/phonon-qt5-backend-vlc b/srcpkgs/phonon-qt5-backend-vlc new file mode 120000 index 0000000000000..987138b2013ad --- /dev/null +++ b/srcpkgs/phonon-qt5-backend-vlc @@ -0,0 +1 @@ +phonon-backend-vlc \ No newline at end of file diff --git a/srcpkgs/phonon-qt5-backend-vlc/template b/srcpkgs/phonon-qt5-backend-vlc/template deleted file mode 100644 index 8eb0f72fcd545..0000000000000 --- a/srcpkgs/phonon-qt5-backend-vlc/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'phonon-qt5-backend-vlc' -pkgname=phonon-qt5-backend-vlc -version=0.11.1 -revision=1 -build_style=cmake -configure_args="-DPHONON_BUILD_PHONON4QT5=ON" -hostmakedepends="pkg-config extra-cmake-modules" -makedepends="qt5-devel qt5-tools-devel phonon-qt5-devel vlc-devel" -short_desc="Phonon VLC backend for Qt5" -maintainer="Duncaen " -license="LGPL-2.1-only" -homepage="https://phonon.kde.org/" -distfiles="${KDE_SITE}/phonon/${pkgname/-qt5/}/${version}/${pkgname/-qt5/}-${version}.tar.xz" -checksum=ccd91e967f943b9e2d7a1115cd1e2851b69f693d568d2174bf709a944a14e5ee - -provides="phonon-qt5-backend-0_1" -replaces="phonon-qt5-backend>=0" - -lib32disabled=yes - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-devel phonon-qt5-devel" -fi