gentoo auto-resync : 16:03:2024 - 12:48:37

3 files changed, 78 insertions, 1 deletions

diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 88f1d558df07..3167b5c9dbee 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1,6 +1,7 @@
 AUX kvazaar-2.0.0-fix-avx2-flags.patch 1226 BLAKE2B a42a1caceeadffd41f22e40d16694aaa37bf8776e7e1d98d182822b589785bdaeca89147272c0ab2b4826ced7d18f0b3b5a2c048f51b5bfe81e91b1172191334 SHA512 1fcae99b3fe6f31b9b7fd33c000e64d2a2f1359dfa81e6d6fd29302964e4d5190e54d9f7620661d6b6ecb6fd26afd0592da5a125f0b9eb31c44dc94d8f17829b
 AUX kvazaar-2.2.0-backport-pr377.patch 1085 BLAKE2B e6001ee7b14abf9fbb7f9b16f206807835b838a2db1fb7744ca97dff7938616eda0674c33f971d778a7a107beb602c11b4ba5ee46c70a74c04627c5192f77384 SHA512 93d549b71c3decf76238434ad3c45201371091819c12a4771a677cbd54b9c17b9c379bec803d8875fa7df923de13f0f41888078cf5866de6ab59e975a7b0be5f
 AUX kvazaar-2.3.0-backport-c6f2ba4.patch 1255 BLAKE2B 82be15a1304ce67fa265ad52f586516f9bea8af3b6037c245010de831d22783dc38767c24a6c88db28f96cdb188eae0c42bc15b4b47427e8c5257a5ec073c545 SHA512 2a8c61d6f87429d664f6d02147439ee3361827350677b770ec675505bf532454a17c0b79d3ffe842ba1ca75c1ca855f04d77338d34d9f79728d2caaefd04ba4d
+AUX kvazaar-2.3.0-backport-f6a9d92.patch 2468 BLAKE2B e12a38db7d599b347d5edf6b298cae52ecd8b74762b3e89cf601eb5490ec7f5e59645d9906e51d5a223c98f67263a0a94e7a23721f3c6591e59421b7dfdf61c1 SHA512 b8f20ceff4f075f457f1b3265bcb861b66433a7356c7fd11b29980011227dced5f1bee595f8540c0b6fd579adbd004f36e17ec13a11ba8e3e0f0efcaf81e673d
 AUX kvazaar-2.3.0-backport-pr392.patch 1522 BLAKE2B 5e13fd5fa09b719f8da2d9f17522c5c6fae0848349d86c29881553221cc4ead665446aba6b97df775ffd49e3a632752ae9d1702382f32c76f68e3397cc6fcdd6 SHA512 542b18b30110a7f98b15682685b2ca514c8b7f59a03d06cd0d5b51858ea41f10d367fa0f50ed5316b60700f4738b931e6eff578ac79fa0be69f86b83b4b3355a
 DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211
 DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec
@@ -8,6 +9,6 @@ DIST kvazaar-2.2.0.tar.gz 617414 BLAKE2B 6ddb88ddea315d80e0af87a13127f235c184ae8
 DIST kvazaar-2.3.0.tar.gz 593939 BLAKE2B a8cdc94699c6e64ef5e80336191342cb5aadfa83cc494400dd34a177836c081291e5cc176e29bf68ad8debdf3a83ca7d5c2ffd657ac96b901a0f5258e3894788 SHA512 b416e24a887a6e83b25530c6d47675fb176568c04295c944094041629b585b968133465605b9ee85e0ebebe1041774d5670cb90ee76271cb2f5c8059244297b5
 EBUILD kvazaar-2.1.0.ebuild 1893 BLAKE2B 4fd421fc771cdef9ad7ce50e7cd4778aae6e1b8a2c18ed061e4a6e3acfce4256080ed2c188d9e66ca72d9a4063d34ad0bd237477a73ce31d51dd8d30a1863071 SHA512 9983889198b20539ab3a2e9a40fccb972be786189463df7bc2187b88a11540cdfbfc2d324369b622e5c7fba7d6cd4fd0126bc77b65bd2f4485286b131dbf35a7
 EBUILD kvazaar-2.2.0.ebuild 1702 BLAKE2B 7001e0134547b428769c18a47917ce0e1a2f1ea7ca42da3066c051c0ceacf94a8663b84ac47980b5e24181a96a98389e41bcc26be45f49b23d8ff62a380a1198 SHA512 a8459f11895d08513a8a366c7ff4a5c784865757a41e76971518e2c50bb164fba4b1b879bfbab48c5772e7ae7d3278975c51ace31f17fcfe567d146432be9f20
-EBUILD kvazaar-2.3.0.ebuild 1767 BLAKE2B 0298bb7a73e3680bb59e0ff8484ac891f4c5e2408a6ec12bd81605b80a8b7059ebd6636341f409f136aedf83a3dc8eed126fcabbaada4e81ffe6c313b8048dae SHA512 14e502400b892f5e01a88d218d5fa826bc219044ed6c86ac0585c56f597e92f18c2687fed5e3647325ecc69be74147db8cd35b9a2c680dfe501a386e863b8729
+EBUILD kvazaar-2.3.0-r1.ebuild 1817 BLAKE2B 28ad786ea75f14e36bc5cac2b7759b15a5d5b22b87933040f3bf6cf0ba0c04c9f90caca75458695f7ba3be4f66ee100c66f0d0fbbadd491c42f5026c32c10f31 SHA512 453628f1a4082f2a38a39d5c589977b50003e038cdcb834bf03c1e877ff3ba6b92316a9ec1e0cc1ffacc76c4237db7669a8b5f74efed6ab3f0610c55986232af
 EBUILD kvazaar-9999.ebuild 1642 BLAKE2B 219b87cc06fb9ce4c931823b9108615cc380fae57e19def8a96880dcd1f67290f52ad22e35d9eddd5f579d78f1b684522f6fc4a536f643718f7898d9090c7781 SHA512 f1ac363e2779c19380a750479b30da7af2b7fb792a5efb955d0673ebfa8cb5cc5ca0900b18faed228ce05171a38b809f1918d64b6e743d2486558f3db1f78698
 MISC metadata.xml 307 BLAKE2B 712a78cc3cbe9bee1e770452448efd933eb76c6de75e8302e8f61b22aec35a2f43ceb7c3014bf88b81ecf4ff27da4b115ab24605a53fbbba18100896fff12ff8 SHA512 29403efb372cc2ddb9e428be05bb7bf57b0a51a3ab66a0b0bfbdfbcdf6db1b5d357ddafc1b3a77d00109840ea4c610a088e7c8f97a3c0b9cd330a6edd2651ae6
diff --git a/media-libs/kvazaar/files/kvazaar-2.3.0-backport-f6a9d92.patch b/media-libs/kvazaar/files/kvazaar-2.3.0-backport-f6a9d92.patch
new file mode 100644
index 000000000000..115815daf860
--- /dev/null
+++ b/media-libs/kvazaar/files/kvazaar-2.3.0-backport-f6a9d92.patch
@@ -0,0 +1,75 @@
+From f6a9d92a30083b5e228ca1126418e12c515bfa69 Mon Sep 17 00:00:00 2001
+From: Joose Sainio <joose.sainio@tuni.fi>
+Date: Thu, 18 Jan 2024 08:34:23 +0200
+Subject: [PATCH] Use separate .pc.in file for cmake and automake
+
+---
+ CMakeLists.txt         |  4 ++--
+ src/kvazaar.pc.in      | 11 +++++------
+ src/kvazaarCMake.pc.in | 12 ++++++++++++
+ 3 files changed, 19 insertions(+), 8 deletions(-)
+ create mode 100644 src/kvazaarCMake.pc.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a39399b8..278939d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12)
+ project(kvazaar
+ LANGUAGES C CXX
+ HOMEPAGE_URL https://github.com/ultravideo/kvazaar
+-DESCRIPTION "An open-source VVC encoder licensed under 3-clause BSD"
++DESCRIPTION "An open-source HEVC encoder licensed under 3-clause BSD"
+ VERSION 2.3.0 )
+ 
+ option(BUILD_SHARED_LIBS "Build using shared kvazaar library" ON)
+@@ -98,7 +98,7 @@ set(KVZ_COMPILER_STRING "${KVZ_COMPILER_VERSION}")
+ add_definitions(-DCMAKE_BUILD)
+ 
+ # Apply dynamic info to the config files
+-configure_file("${PROJECT_SOURCE_DIR}/src/kvazaar.pc.in" "${PROJECT_SOURCE_DIR}/src/kvazaar.pc" @ONLY)
++configure_file("${PROJECT_SOURCE_DIR}/src/kvazaarCMake.pc.in" "${PROJECT_SOURCE_DIR}/src/kvazaar.pc" @ONLY)
+ configure_file("${PROJECT_SOURCE_DIR}/src/version.h.in" "${PROJECT_SOURCE_DIR}/src/version.h" @ONLY)
+ 
+ # Add all sources in src/ base
+diff --git a/src/kvazaar.pc.in b/src/kvazaar.pc.in
+index 73c49416..a254a27f 100644
+--- a/src/kvazaar.pc.in
++++ b/src/kvazaar.pc.in
+@@ -1,12 +1,11 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
++prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
++libdir=@libdir@
+ incdir=${prefix}/include
+ 
+ Name: libkvazaar
+-Description: @CMAKE_PROJECT_DESCRIPTION@
+-URL: @CMAKE_PROJECT_HOMEPAGE_URL@
+-Version: @PROJECT_VERSION@
++Description: Open-source HEVC encoder
++Version: @VERSION@
+ Libs: -L${libdir} -lkvazaar
+ Libs.private: @LIBS@
+-Cflags: -I${incdir}
++Cflags: -I${incdir}
+\ No newline at end of file
+diff --git a/src/kvazaarCMake.pc.in b/src/kvazaarCMake.pc.in
+new file mode 100644
+index 00000000..73c49416
+--- /dev/null
++++ b/src/kvazaarCMake.pc.in
+@@ -0,0 +1,12 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++incdir=${prefix}/include
++
++Name: libkvazaar
++Description: @CMAKE_PROJECT_DESCRIPTION@
++URL: @CMAKE_PROJECT_HOMEPAGE_URL@
++Version: @PROJECT_VERSION@
++Libs: -L${libdir} -lkvazaar
++Libs.private: @LIBS@
++Cflags: -I${incdir}
diff --git a/media-libs/kvazaar/kvazaar-2.3.0.ebuild b/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild
index b9370b360d19..bfc868061071 100644
--- a/media-libs/kvazaar/kvazaar-2.3.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3.0-backport-pr392.patch"
 	"${FILESDIR}/${PN}-2.3.0-backport-c6f2ba4.patch"
+	"${FILESDIR}/${PN}-2.3.0-backport-f6a9d92.patch"
 )
 
 src_prepare() {