From 5c42677148c717eb9f4673237db807f74740b4e9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 25 Aug 2024 14:56:25 +0100 Subject: gentoo auto-resync : 25:08:2024 - 14:56:25 --- media-libs/phonon/Manifest | 4 +- media-libs/phonon/files/phonon-4.12.0-cmake.patch | 11 +-- media-libs/phonon/phonon-4.12.0-r3.ebuild | 100 ---------------------- media-libs/phonon/phonon-4.12.0-r4.ebuild | 100 ++++++++++++++++++++++ 4 files changed, 104 insertions(+), 111 deletions(-) delete mode 100644 media-libs/phonon/phonon-4.12.0-r3.ebuild create mode 100644 media-libs/phonon/phonon-4.12.0-r4.ebuild (limited to 'media-libs/phonon') diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index ebe60ab255ca..d40aa689a532 100644 --- a/media-libs/phonon/Manifest +++ b/media-libs/phonon/Manifest @@ -1,7 +1,7 @@ AUX phonon-4.11.1-clang-16.patch 1356 BLAKE2B 2adbe00797db0efab8a065c455b8122bea99ffdca9317939c85e54c65cf9292f1de7531bff89fbed227cdab035547680291c6d20d02a374bfe7e28ef9ec9706d SHA512 5ef9e3bcefd607036e47cd6578be5bb98a384bb4cd4820aab90cd7adf1eb0ae54ad001550909a93513e1d622ef4101f95fce733e3fa7a95d5df8454290ef92aa -AUX phonon-4.12.0-cmake.patch 2806 BLAKE2B 3c71db1e4fd0b74c651ceb52830792f1cb5e9db207b3881cc03614ac2c0e8e8f737e545e17060d2055e19ffb1dd458efac05795d80dc566c96a91d21244d4766 SHA512 0f4d10d14a8a1a3d7259b5719c19820142fcf9e4363187bf08be53d5b15f581a5876962bcea84ea8f1de2d298c1a872d2814f2cce7f82841ae457c7d3171121e +AUX phonon-4.12.0-cmake.patch 2642 BLAKE2B 0e1b71a2c8916ebd230ad38822eb1cb62b4ac4fc4239459e822c9b91d69e20ec5ebb96ebbbd1cc3a9af5eb71577797d1f12dc9121843f1b44ff9667a66198467 SHA512 8fb555e3f0da0a33a922dd82792ee59f7da842e2369112aa155d4f68bf20b34ed84cb3210100552458f0dd76c61c08e479b3af42b5b4900ffde7d8fdcd1b6c69 DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74 DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a EBUILD phonon-4.11.1-r2.ebuild 1307 BLAKE2B 69c75e346c77710c52591a8debe93bb09c34217584a520622dbfcfb2b4442b3039f1705ee5550f4b35edef1fc65a33286517deb24373264adceef2d365679ebd SHA512 daae7f938573ea831c299c0ef584ae4526570e64e3cb0790cfc7dae34b364fb4bb72ac0f312d0733fb17de6bcc3f74e3dbd9a08247c5d43e2776bae5deb8ec3b -EBUILD phonon-4.12.0-r3.ebuild 2357 BLAKE2B 89276f8d310c9b482f9f94a26508718efa0799a9fb74b0f727cf945aedca3454077b9d022ef31bc89c497704fb465608cb70e2c6c5dd0841857f0119b261cd6d SHA512 62a1ded9aca0d08eedb9a33f9b6b7ea958eba310abab2f732af262e81f27c80cc37770ff32b20dce03f7823bb3a10bc211cb6623f52229a8dccc165b2185b024 +EBUILD phonon-4.12.0-r4.ebuild 2357 BLAKE2B 89276f8d310c9b482f9f94a26508718efa0799a9fb74b0f727cf945aedca3454077b9d022ef31bc89c497704fb465608cb70e2c6c5dd0841857f0119b261cd6d SHA512 62a1ded9aca0d08eedb9a33f9b6b7ea958eba310abab2f732af262e81f27c80cc37770ff32b20dce03f7823bb3a10bc211cb6623f52229a8dccc165b2185b024 MISC metadata.xml 463 BLAKE2B 856a539bfa489dac4d6550f9fb4104b419dc6dd12a5d6ec67ac7d9f743fa31d96c3323937558704b7941a914c1ca342b5a6030e9f16b7d84f2339f93d2a1fb9f SHA512 c6aa1e0f8f11e813c228619f9c857bfa3e15d3278a1b5af3910f8f789a7d93f889a9adb9121f19b4b52abbfa0b4a67d89a037679ae0eab00b0db04ed5e16526e diff --git a/media-libs/phonon/files/phonon-4.12.0-cmake.patch b/media-libs/phonon/files/phonon-4.12.0-cmake.patch index f212567777f1..26805cb18267 100644 --- a/media-libs/phonon/files/phonon-4.12.0-cmake.patch +++ b/media-libs/phonon/files/phonon-4.12.0-cmake.patch @@ -9,20 +9,13 @@ potentially fail even if PHONON_BUILD_DESIGNER_PLUGIN was not requested. Signed-off-by: Andreas Sturmlechner --- - CMakeLists.txt | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) + CMakeLists.txt | 32 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c00760fc..babeb392 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.5 FATAL_ERROR) --project(Phonon VERSION "4.12.0") -+project(Phonon VERSION "4.11.1") - - include(FeatureSummary) - @@ -116,23 +116,27 @@ foreach(version ${VERSIONS}) # https://bugreports.qt.io/browse/QTBUG-114706 add_library(Qt::Widgets ALIAS Qt${QT_MAJOR_VERSION}::Widgets) diff --git a/media-libs/phonon/phonon-4.12.0-r3.ebuild b/media-libs/phonon/phonon-4.12.0-r3.ebuild deleted file mode 100644 index 545735c83895..000000000000 --- a/media-libs/phonon/phonon-4.12.0-r3.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop flag-o-matic kde.org multibuild - -DESCRIPTION="KDE multimedia abstraction library" -HOMEPAGE="https://community.kde.org/Phonon" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" -fi - -LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )" -SLOT="0" -IUSE="debug designer minimal pulseaudio +qt5 qt6" -REQUIRED_USE="|| ( qt5 qt6 )" - -DEPEND=" - pulseaudio? ( - dev-libs/glib:2 - media-libs/libpulse[glib] - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - designer? ( dev-qt/designer:5 ) - ) - qt6? ( - dev-qt/qt5compat:6 - dev-qt/qtbase:6[gui,widgets] - designer? ( dev-qt/qttools:6[designer] ) - ) -" -RDEPEND="${DEPEND} - !media-libs/phonon-gstreamer - || ( - kde-frameworks/breeze-icons:* - kde-frameworks/oxygen-icons:* - ) -" -BDEPEND=" - dev-libs/libpcre2:* - >=kde-frameworks/extra-cmake-modules-5.115.0:* - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) -" -PDEPEND="!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )" - -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938315 - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) -} - -src_configure() { - use debug || append-cppflags -DQT_NO_DEBUG - - myconfigure() { - local mycmakeargs=( - -DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/} - -DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass - -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass - -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer) - -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio) - -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio) - ) - - if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then - mycmakeargs+=( - -DPHONON_BUILD_QT5=OFF - -DPHONON_BUILD_SETTINGS=ON - ) - else - mycmakeargs+=( - -DPHONON_BUILD_QT6=OFF - -DPHONON_BUILD_SETTINGS=$(usex !qt6) - ) - fi - - cmake_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake_src_compile -} - -src_install() { - multibuild_foreach_variant cmake_src_install - make_desktop_entry "${PN}settings" \ - "Phonon Audio and Video" preferences-desktop-sound -} diff --git a/media-libs/phonon/phonon-4.12.0-r4.ebuild b/media-libs/phonon/phonon-4.12.0-r4.ebuild new file mode 100644 index 000000000000..545735c83895 --- /dev/null +++ b/media-libs/phonon/phonon-4.12.0-r4.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop flag-o-matic kde.org multibuild + +DESCRIPTION="KDE multimedia abstraction library" +HOMEPAGE="https://community.kde.org/Phonon" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +fi + +LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )" +SLOT="0" +IUSE="debug designer minimal pulseaudio +qt5 qt6" +REQUIRED_USE="|| ( qt5 qt6 )" + +DEPEND=" + pulseaudio? ( + dev-libs/glib:2 + media-libs/libpulse[glib] + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + designer? ( dev-qt/designer:5 ) + ) + qt6? ( + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,widgets] + designer? ( dev-qt/qttools:6[designer] ) + ) +" +RDEPEND="${DEPEND} + !media-libs/phonon-gstreamer + || ( + kde-frameworks/breeze-icons:* + kde-frameworks/oxygen-icons:* + ) +" +BDEPEND=" + dev-libs/libpcre2:* + >=kde-frameworks/extra-cmake-modules-5.115.0:* + virtual/pkgconfig + qt5? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) +" +PDEPEND="!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )" + +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938315 + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_configure() { + use debug || append-cppflags -DQT_NO_DEBUG + + myconfigure() { + local mycmakeargs=( + -DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/} + -DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass + -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass + -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer) + -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio) + -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio) + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + mycmakeargs+=( + -DPHONON_BUILD_QT5=OFF + -DPHONON_BUILD_SETTINGS=ON + ) + else + mycmakeargs+=( + -DPHONON_BUILD_QT6=OFF + -DPHONON_BUILD_SETTINGS=$(usex !qt6) + ) + fi + + cmake_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install + make_desktop_entry "${PN}settings" \ + "Phonon Audio and Video" preferences-desktop-sound +} -- cgit v1.2.3