summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin69942 -> 69940 bytes
-rw-r--r--media-libs/leptonica/Manifest5
-rw-r--r--media-libs/leptonica/files/leptonica-1.85.0-concurrent-tests.patch167
-rw-r--r--media-libs/leptonica/leptonica-1.84.1-r2.ebuild7
-rw-r--r--media-libs/leptonica/leptonica-1.85.0.ebuild6
-rw-r--r--media-libs/phonon-vlc/Manifest2
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild74
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-0.12.0-r2.ebuild45
-rw-r--r--media-libs/phonon/Manifest2
-rw-r--r--media-libs/phonon/phonon-4.12.0-r4.ebuild100
-rw-r--r--media-libs/phonon/phonon-4.12.0-r5.ebuild67
11 files changed, 293 insertions, 182 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c6a19c03c4f9..7b0851394cea 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 908913f84179..a274ec6dc06b 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,5 +1,6 @@
+AUX leptonica-1.85.0-concurrent-tests.patch 7005 BLAKE2B c6c59b59ab5e93047f0ab22cf7dee0b9d8de16d6c7ff1ca68d6346358e87617e113a50f68492bfda49f35aac14cde2e1d0325a390321534e2ed631dbe97d5c01 SHA512 93a23c22f6206037ebe2a29c13084d63c72bdc1720eb76798b8ec03b4a268b7024ccdc408e18677ce3837b37708a5af5fb45d3f911ec5976de4b157dda447577
DIST leptonica-1.84.1.tar.gz 14102299 BLAKE2B 1da9b5bd2b72fa82320126dd8e6e647fbc50be0dcd71a0f8e392d9617911fe4f224d51158ab230476afbf7fd0e15cae1b59d8469cbf68a43893ada09a8d93673 SHA512 949be33a09e1dfc04527f5401d3d682999bd6904dca0b4950b457d12564e3290ec5b62ab4b14ef14d6f499a0fbfa0ebc37c2e8ab2966913883127b9489f47e97
DIST leptonica-1.85.0.tar.gz 14757419 BLAKE2B db26f30121f8fa7807068d3e55c1cc3ed2f8a7a6f8bb8cc46a240257d11842000b63a4b08542c87a90bc446ccb53a1fe36823661416ec120da8e9b199ddb8def SHA512 ad097f8238bb88f044511bedb6debfb8a1492a4636348b21ce103034d3878ae1097e7ca8de9c39ef01f34589526d7e8aee68fb1b83aae5ffc0026c04360b882c
-EBUILD leptonica-1.84.1-r2.ebuild 2083 BLAKE2B 7651659ce061e3a447d0eb55df739599afda9f9355cd207f68d81f7e3c7834ab94384aa8535d8555c7ba5bd7a1c65aa6c472a311e784e8c9856344701b6ccf14 SHA512 77cba772d1ff305baa086d68909530644f49883ac36451733316c02d911c844f5fbba23ab5e3119f9f39f2ae5d4c4109a29788a20beb5d82bd849b52fd49ceaa
-EBUILD leptonica-1.85.0.ebuild 2089 BLAKE2B 73f72e54751b764805a9a989380a9a95b12335dac9a6ed95900592de021309603685b53ca41d1d552fb009bf32db93ecbaa0b04e5e459fcd9807e748d9807c28 SHA512 77c35f7ff8733ab08a76ceea9664e5f5e4db4059e1357822647fd8dfeb8c3063fc0f1d0f9ea27add800312bb0e94a3689d1409b5b8ba27664a3025c05ea9a630
+EBUILD leptonica-1.84.1-r2.ebuild 2162 BLAKE2B f591546a09bd2e7e4079f85040b3de8cf56fe01df0c2757ac422c81d01bd87e63aabf12f26a0520a94b81eb47e27ce2ee3424ef21cefd3ff4cf895760c622e6d SHA512 707bcd808dfd1d3d894b4b226ad401995891d16b32ecb12539220f7589084793111f56eb2d8c79b259dd179d0683e18618ee49fb380460ecf8f9609e63f682de
+EBUILD leptonica-1.85.0.ebuild 2145 BLAKE2B fa81407abe792584f63d3bda5546bdc0f98cac447688346f924d350fa9fedd51c3df4cf5fc15c2beccb87fb3c089c79543045bfa02b7617e91a1d11a1c9b9ba6 SHA512 638048a85785d172d7517ed2865594b36aa63bb551c3668ddf3b2f9ea994c10d7208f9a147ff9d9baae71d3761aec1c2b69c9eb84b7f72482f3d806ca2036b98
MISC metadata.xml 669 BLAKE2B 27b4a63ae3b2603632b28a501a22ea6142f35969386be65d4b4ded7311a046d21d7a4faddcb1558a3872e80d708eeb22bb2d03a90d009383c3e34016ef1778d8 SHA512 3a547cefac4630ed8fc4b041a1925be4f3aced7aff960b7e98109da12d9c8e4e2ec3a85fae9f991516cb67fea4e9edeab1c46280741795991e01b0ace7aa9d16
diff --git a/media-libs/leptonica/files/leptonica-1.85.0-concurrent-tests.patch b/media-libs/leptonica/files/leptonica-1.85.0-concurrent-tests.patch
new file mode 100644
index 000000000000..e508b790361b
--- /dev/null
+++ b/media-libs/leptonica/files/leptonica-1.85.0-concurrent-tests.patch
@@ -0,0 +1,167 @@
+From 0e0e453248f07a1ecec77f06a84521141919a048 Mon Sep 17 00:00:00 2001
+From: danblooomberg <dan.bloomberg@gmail.com>
+Date: Sun, 16 Mar 2025 12:30:21 -0700
+Subject: [PATCH] Fix Issue #768: Replace calls to ioFormatTest() in pngio_reg
+
+* James Le Cuirot found a problem when ioformats_reg and pngio_reg
+ run in parallel because they both call ioFormatTest() and can
+ overwrite each other's output.
+* Add a file-writing function in pngio_reg to do this properly, so
+ only ioformats_reg calls ioFormatTest().
+---
+ prog/pngio_reg.c | 114 +++++++++++++++++++++++++++++++----------------
+ 1 file changed, 75 insertions(+), 39 deletions(-)
+
+diff --git a/prog/pngio_reg.c b/prog/pngio_reg.c
+index ccc359666..583274b89 100644
+--- a/prog/pngio_reg.c
++++ b/prog/pngio_reg.c
+@@ -68,6 +68,7 @@
+ #define FILE_TRANS_CMAP_4BPP "trans-4bpp-cmap.png"
+ #define FILE_TRANS_CMAP_8BPP "trans-8bpp-cmap.png"
+
++static l_int32 test_file_png(const char *fname, const char *dirout);
+ static l_int32 test_mem_png(const char *fname);
+ static l_int32 get_header_data(const char *filename);
+ static l_int32 test_1bpp_trans(L_REGPARAMS *rp);
+@@ -85,6 +86,7 @@ LEPT_DLL extern const char *ImageFileFormatExtensions[];
+ int main(int argc,
+ char **argv)
+ {
++const char dirout[] = "/tmp/lept/pngio/";
+ l_int32 success, failure;
+ L_REGPARAMS *rp;
+
+@@ -95,51 +97,52 @@ L_REGPARAMS *rp;
+
+ if (regTestSetup(argc, argv, &rp))
+ return 1;
+-
+- /* --------- Part 1: Test lossless r/w to file ---------*/
+-
+ failure = FALSE;
++
++ /* ------------ Part 1: Test lossless r/w to file ------------ */
+ success = TRUE;
++ lept_rmdir("lept/pngio"); /* remove previous output files */
++ lept_mkdir("lept/pngio");
+ lept_stderr("Test bmp 1 bpp file:\n");
+- if (ioFormatTest(FILE_1BPP)) success = FALSE;
+- lept_stderr("\nTest 2 bpp file:\n");
+- if (ioFormatTest(FILE_2BPP)) success = FALSE;
+- lept_stderr("\nTest 2 bpp file with cmap:\n");
+- if (ioFormatTest(FILE_2BPP_C)) success = FALSE;
+- lept_stderr("\nTest 4 bpp file:\n");
+- if (ioFormatTest(FILE_4BPP)) success = FALSE;
+- lept_stderr("\nTest 4 bpp file with cmap:\n");
+- if (ioFormatTest(FILE_4BPP_C)) success = FALSE;
+- lept_stderr("\nTest 8 bpp grayscale file with cmap:\n");
+- if (ioFormatTest(FILE_8BPP)) success = FALSE;
+- lept_stderr("\nTest 8 bpp color file with cmap:\n");
+- if (ioFormatTest(FILE_8BPP_C)) success = FALSE;
+- lept_stderr("\nTest 16 bpp file:\n");
+- if (ioFormatTest(FILE_16BPP)) success = FALSE;
+- lept_stderr("\nTest 32 bpp RGB file:\n");
+- if (ioFormatTest(FILE_32BPP)) success = FALSE;
+- lept_stderr("\nTest 32 bpp RGBA file:\n");
+- if (ioFormatTest(FILE_32BPP_ALPHA)) success = FALSE;
+- lept_stderr("\nTest spp = 1, cmap with alpha file:\n");
+- if (ioFormatTest(FILE_CMAP_ALPHA)) success = FALSE;
+- lept_stderr("\nTest spp = 1, cmap with alpha (small alpha array):\n");
+- if (ioFormatTest(FILE_CMAP_ALPHA2)) success = FALSE;
+- lept_stderr("\nTest spp = 1, fully transparent with alpha file:\n");
+- if (ioFormatTest(FILE_TRANS_ALPHA)) success = FALSE;
+- lept_stderr("\nTest spp = 2, gray with alpha file:\n");
+- if (ioFormatTest(FILE_GRAY_ALPHA)) success = FALSE;
+- lept_stderr("\nTest spp = 2, cmap with alpha file:\n");
+- if (ioFormatTest(FILE_TRANS_CMAP_2BPP)) success = FALSE;
+- lept_stderr("\nTest spp = 4, cmap with alpha file:\n");
+- if (ioFormatTest(FILE_TRANS_CMAP_4BPP)) success = FALSE;
+- lept_stderr("\nTest spp = 8, cmap with alpha file:\n");
+- if (ioFormatTest(FILE_TRANS_CMAP_8BPP)) success = FALSE;
++ if (test_file_png(FILE_1BPP, dirout)) success = FALSE;
++ lept_stderr("Test 2 bpp file:\n");
++ if (test_file_png(FILE_2BPP, dirout)) success = FALSE;
++ lept_stderr("Test 2 bpp file with cmap:\n");
++ if (test_file_png(FILE_2BPP_C, dirout)) success = FALSE;
++ lept_stderr("Test 4 bpp file:\n");
++ if (test_file_png(FILE_4BPP, dirout)) success = FALSE;
++ lept_stderr("Test 4 bpp file with cmap:\n");
++ if (test_file_png(FILE_4BPP_C, dirout)) success = FALSE;
++ lept_stderr("Test 8 bpp grayscale file with cmap:\n");
++ if (test_file_png(FILE_8BPP, dirout)) success = FALSE;
++ lept_stderr("Test 8 bpp color file with cmap:\n");
++ if (test_file_png(FILE_8BPP_C, dirout)) success = FALSE;
++ lept_stderr("Test 16 bpp file:\n");
++ if (test_file_png(FILE_16BPP, dirout)) success = FALSE;
++ lept_stderr("Test 32 bpp RGB file:\n");
++ if (test_file_png(FILE_32BPP, dirout)) success = FALSE;
++ lept_stderr("Test 32 bpp RGBA file:\n");
++ if (test_file_png(FILE_32BPP_ALPHA, dirout)) success = FALSE;
++ lept_stderr("Test spp = 1, cmap with alpha file:\n");
++ if (test_file_png(FILE_CMAP_ALPHA, dirout)) success = FALSE;
++ lept_stderr("Test spp = 1, cmap with alpha (small alpha array):\n");
++ if (test_file_png(FILE_CMAP_ALPHA2, dirout)) success = FALSE;
++ lept_stderr("Test spp = 1, fully transparent with alpha file:\n");
++ if (test_file_png(FILE_TRANS_ALPHA, dirout)) success = FALSE;
++ lept_stderr("Test spp = 2, gray with alpha file:\n");
++ if (test_file_png(FILE_GRAY_ALPHA, dirout)) success = FALSE;
++ lept_stderr("Test spp = 2, cmap with alpha file:\n");
++ if (test_file_png(FILE_TRANS_CMAP_2BPP, dirout)) success = FALSE;
++ lept_stderr("Test spp = 4, cmap with alpha file:\n");
++ if (test_file_png(FILE_TRANS_CMAP_4BPP, dirout)) success = FALSE;
++ lept_stderr("Test spp = 8, cmap with alpha file:\n");
++ if (test_file_png(FILE_TRANS_CMAP_8BPP, dirout)) success = FALSE;
+ if (success) {
+ lept_stderr(
+- "\n ********** Success on lossless r/w to file *********\n\n");
++ "\n ****** Success on lossless r/w to file *****\n");
+ } else {
+ lept_stderr(
+- "\n ******* Failure on at least one r/w to file ******\n\n");
++ "\n ******* Failure on at least one r/w to file ******\n");
+ }
+ if (!success) failure = TRUE;
+
+@@ -230,7 +233,40 @@ L_REGPARAMS *rp;
+ }
+
+
+- /* Returns 1 on error */
++ /* File r/w test. Returns 1 on error */
++static l_int32
++test_file_png(const char *fname,
++ const char *dirout)
++{
++char fileout[128];
++l_int32 same;
++PIX *pixs;
++PIX *pixd = NULL;
++
++ if ((pixs = pixRead(fname)) == NULL) {
++ lept_stderr("Failure to read %s\n", fname);
++ return 1;
++ }
++ stringCopy(fileout, dirout, 20);
++ stringCat(fileout, 128, fname);
++ if (pixWrite(fileout, pixs, IFF_PNG)) {
++ lept_stderr("Write fail for png\n");
++ return 1;
++ }
++ if ((pixd = pixRead(fileout)) == NULL) {
++ lept_stderr("Read fail for png\n");
++ return 1;
++ }
++
++ pixEqual(pixs, pixd, &same);
++ if (!same)
++ lept_stderr("Write/read fail for file %s\n", fname);
++ pixDestroy(&pixs);
++ pixDestroy(&pixd);
++ return (!same);
++}
++
++ /* Memory r/w test. Returns 1 on error */
+ static l_int32
+ test_mem_png(const char *fname)
+ {
diff --git a/media-libs/leptonica/leptonica-1.84.1-r2.ebuild b/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
index b6fbeb7fa63f..9bae14752ce9 100644
--- a/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
+++ b/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
@@ -65,10 +65,11 @@ multilib_src_configure() {
}
multilib_src_test() {
+ # ${TMPDIR} is not respected. It used to be but it lead to issues and there
+ # have been long debates with upstream about it. :( Delete /tmp/lept before
+ # and after to avoid issues.
+ rm -rf /tmp/lept/ || die
default
-
- # ${TMPDIR} is not respected. It used to be but it lead to issues
- # and there have been long debates with upstream about it. :(
rm -rf /tmp/lept/ || die
}
diff --git a/media-libs/leptonica/leptonica-1.85.0.ebuild b/media-libs/leptonica/leptonica-1.85.0.ebuild
index 3de09739be9f..b944c0049ec7 100644
--- a/media-libs/leptonica/leptonica-1.85.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.85.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
DOCS=( README version-notes )
+PATCHES=(
+ "${FILESDIR}"/${P}-concurrent-tests.patch
+)
+
src_prepare() {
default
elibtoolize
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 89cc6a528ff3..129ba3db20ab 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,3 +1,3 @@
DIST phonon-backend-vlc-0.12.0.tar.xz 71664 BLAKE2B 9ace1020d8e9a9e97243706ff81703d3f22bf892f402e44451147a24547d09bcf12f5745377c01d65b4d1fb03cd975b323b2cab62f8136880d1d9c004cca7d7b SHA512 78f5ead829d5025c7cb9e01b33819514d795651d1d932c03bd8cc2ad5d427e5aaaeeb6016820d5a7bb9907f6df1142a0fbc097830d7c63b01f77d2167a0c9264
-EBUILD phonon-vlc-0.12.0-r1.ebuild 1724 BLAKE2B 2c29e1f658d8219d9035fcb9ffa3da6a1e96fa49013d17b477d0f28ccd45a37875981a9a1738ace04f6b4ff65d12d31cf560087db94efeca5f2e850a0e7d6e53 SHA512 095c9c2c924b8abb6337427c75d2c9e0b8719b169a9ee61c4ed0fa9c4a3994c5ff4e19763f3a52640b1ad089d231a06548166e66c1b2d70bd7cdb8e22e156c23
+EBUILD phonon-vlc-0.12.0-r2.ebuild 1118 BLAKE2B 1507071cc2b8892476c671e4e72708407cddc8cf3c22211fe01821650937290ad070ed1f5f25a04a6c39bc95531f9f5925b3a505e4569a98cc74fadc4f0194f3 SHA512 3db360d9f5cb2b8c708c418fbccdede6abc474fd4789c04768bb8981a46ae60c8fc32a1e813e444e09c1a37b1a938c5558bc2cab1fd23bdec17395d70d121981
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild
deleted file mode 100644
index a3d4ad90dd12..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic kde.org multibuild
-
-DESCRIPTION="VLC backend for the Phonon multimedia library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
- S="${WORKDIR}"/phonon-backend-vlc-${PV}
- KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug +qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
- >=media-libs/phonon-4.12.0[qt5=,qt6=]
- media-video/vlc:=[dbus,ogg,vorbis(+)]
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-RDEPEND="${DEPEND}"
-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] )
-"
-
-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
- )
-
- if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
- mycmakeargs+=( -DPHONON_BUILD_QT5=OFF )
- else
- mycmakeargs+=( -DPHONON_BUILD_QT6=OFF )
- fi
-
- cmake_src_configure
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- multibuild_foreach_variant cmake_src_compile
-}
-
-src_install() {
- multibuild_foreach_variant cmake_src_install
-}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r2.ebuild
new file mode 100644
index 000000000000..f71c001b5a1c
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic kde.org
+
+DESCRIPTION="VLC backend for the Phonon multimedia library"
+HOMEPAGE="https://community.kde.org/Phonon"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
+ S="${WORKDIR}"/phonon-backend-vlc-${PV}
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="
+ dev-qt/qtbase:6[gui,widgets]
+ >=media-libs/phonon-4.12.0-r5
+ media-video/vlc:=[dbus,ogg,vorbis(+)]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-libs/libpcre2:*
+ dev-qt/qttools:6[linguist]
+ >=kde-frameworks/extra-cmake-modules-5.115.0:*
+ virtual/pkgconfig
+"
+
+src_configure() {
+ use debug || append-cppflags -DQT_NO_DEBUG
+
+ local mycmakeargs=(
+ -DQT_MAJOR_VERSION=6
+ -DPHONON_BUILD_QT5=OFF
+ -DPHONON_BUILD_QT6=ON
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+ -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+ )
+ cmake_src_configure
+}
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 51535fc42de0..e330da2c7270 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,4 +1,4 @@
AUX phonon-4.12.0-cmake.patch 2642 BLAKE2B 0e1b71a2c8916ebd230ad38822eb1cb62b4ac4fc4239459e822c9b91d69e20ec5ebb96ebbbd1cc3a9af5eb71577797d1f12dc9121843f1b44ff9667a66198467 SHA512 8fb555e3f0da0a33a922dd82792ee59f7da842e2369112aa155d4f68bf20b34ed84cb3210100552458f0dd76c61c08e479b3af42b5b4900ffde7d8fdcd1b6c69
DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a
-EBUILD phonon-4.12.0-r4.ebuild 2358 BLAKE2B 1a9437e45fd66773dc44be83f71b1279fc329fe5679df7031f311e800b83916a4de99d6ada9a6dc68fa7f74cad11180208772fc2581dc31da21b5b5cca008f38 SHA512 9c5dfabe7e0e7c9dbbe590d3078753ca3b3960aae42638a82d201a053e65336601cc261b5039427745b45229b96af43b3ca11ecd31507b218c92a1220c5c91c1
+EBUILD phonon-4.12.0-r5.ebuild 1691 BLAKE2B f7d30486c5fd8b9e62478e76e486a36f32ee2f1ea53861e35d0f67e4a6d44d37970ecf26f9a9984465c81f156475b7ae9f42cc50b74ef44b14df8242b58ba462 SHA512 94b482d567b759c52f77775a0a6bf8c80b552e3953655482f143e07f6472e1ce61b6e2e45bcc622586a035dad4515632feecc821458e9302eb892dfb9abe65fe
MISC metadata.xml 410 BLAKE2B 020afc6014d4aedfde1a848e60d18650cb574a5d039275652f00ac0ad00dfc4dee4e67080375f43d5c404c4e6c203e7064fe2014a96156293eecd919b0a21999 SHA512 a5c3d2c3c4ce95b38893ae67a8f974c646064e33d97c56c65d65dec857067479af58e6aef87d9a06ddc50bd150e687dba46eb1eb65f0c6423f700f85204df098
diff --git a/media-libs/phonon/phonon-4.12.0-r4.ebuild b/media-libs/phonon/phonon-4.12.0-r4.ebuild
deleted file mode 100644
index 8252c541ac00..000000000000
--- a/media-libs/phonon/phonon-4.12.0-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2025 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-r5.ebuild b/media-libs/phonon/phonon-4.12.0-r5.ebuild
new file mode 100644
index 000000000000..9e9065f43fc6
--- /dev/null
+++ b/media-libs/phonon/phonon-4.12.0-r5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic kde.org
+
+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"
+
+DEPEND="
+ dev-qt/qt5compat:6
+ dev-qt/qtbase:6[gui,widgets]
+ designer? ( dev-qt/qttools:6[designer] )
+ pulseaudio? (
+ dev-libs/glib:2
+ media-libs/libpulse[glib]
+ )
+"
+RDEPEND="${DEPEND}
+ !media-libs/phonon-gstreamer
+ || (
+ kde-frameworks/breeze-icons:*
+ kde-frameworks/oxygen-icons:*
+ )
+"
+BDEPEND="
+ dev-libs/libpcre2:*
+ dev-qt/qttools:6[linguist]
+ >=kde-frameworks/extra-cmake-modules-5.115.0:*
+ virtual/pkgconfig
+"
+PDEPEND="!minimal? ( >=media-libs/phonon-vlc-0.12.0-r2 )"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938315
+
+src_configure() {
+ use debug || append-cppflags -DQT_NO_DEBUG
+
+ local mycmakeargs=(
+ -DQT_MAJOR_VERSION=6
+ -DPHONON_BUILD_QT5=OFF
+ -DPHONON_BUILD_QT6=ON
+ -DPHONON_BUILD_SETTINGS=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)
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ make_desktop_entry "${PN}settings" \
+ "Phonon Audio and Video" preferences-desktop-sound
+}