gentoo auto-resync : 13:10:2022 - 07:41:53

4 files changed, 45 insertions, 3 deletions

diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 501f272d39e1..11bfdab4dac7 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1,9 +1,10 @@
+AUX kvazaar-2.0.0-fix-avx2-flags.patch 1226 BLAKE2B a42a1caceeadffd41f22e40d16694aaa37bf8776e7e1d98d182822b589785bdaeca89147272c0ab2b4826ced7d18f0b3b5a2c048f51b5bfe81e91b1172191334 SHA512 1fcae99b3fe6f31b9b7fd33c000e64d2a2f1359dfa81e6d6fd29302964e4d5190e54d9f7620661d6b6ecb6fd26afd0592da5a125f0b9eb31c44dc94d8f17829b
 DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 DIST kvazaar-2.0.0.tar.gz 589661 BLAKE2B 253085784bb3481b578206d5a406d0c25c002905f420337939489d01604f7b5f4ee13a17e596ce96e5d577c508f93f72d2befa5851ab95d7ba9db2030de02550 SHA512 9b2564643f4470d59160f7addffbc6b9e22c0d8bd04dbcd77705aa7263dfdc0195a8642255c45b94049b88ba9cbf4ffd49f968d766e31bc404c612b8f18bdbca
 DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec
 EBUILD kvazaar-1.2.0-r1.ebuild 1834 BLAKE2B 80e47155391be5fccd67ccde5f2ab8865a23ef63b03e4d4695314f27cde4e4b613637b646831ff0c0b4166b8dd623ca0a846bf256c899936d31f45bbde7c431a SHA512 f8b0b8842293e298092852c9ffdadaf34263a850c5f7a170f52ef8af8f514a0b87a65a317f4580e97ae358e9cd8c2399f3b2c9e9b4807c418bf8ef029637d9dc
-EBUILD kvazaar-2.0.0.ebuild 1841 BLAKE2B a4c3319f5e05a32bf1e50530b5402812f81984cfcfdff5093be402d3795cdd3d989d014876f9f431eff7ae3c45497a2dd5197c52feecc0609216b0dfcdcdbe79 SHA512 ab82cb5d378bcc45f1ccdf1429a3bf121a3050b9cdd36794440fc292f4ff7e573d8d58951743e5c886b1d3441ebe98411707f490fcc800aeb1ca67255c050d6e
-EBUILD kvazaar-2.1.0.ebuild 1845 BLAKE2B 30e1f03646ebb5cb8254aa0af5ea9d53956b703eb15fccab42f0e93ad61cbd08b78f7e4eb602ea40e757fe83b77a875c22cc4a80c4f69355f75571f7416875d9 SHA512 75cca16f17f89dc1f20718001f2eda4600eef46e4ae8394c196de43ef456afc40cf4eca2d9736f7ef44a569cb38d5ede6fcef66a24f947bd285438b309bcd2d6
+EBUILD kvazaar-2.0.0.ebuild 1895 BLAKE2B 47f1572503e7181105e512a3ea8ebada3b8fcbeb8e74d0a2a1f266d9c0f30e729425ccd1144996f87f43b1d8aa8d2ae6c8cfcca912dac559c8acdfc83c41269b SHA512 898ab22a8af1b95f8a28d0c48ca921b31f40db04a7805fd9ef1f031bb483f4a7a04d1c8fe4707a621ed38d5a82d2747521bef21f24dc421d7f0d1e2b7c99a8ab
+EBUILD kvazaar-2.1.0.ebuild 1906 BLAKE2B a3b3c8c24d801fc532ddd647ad2be67cbd68170a14c24191acafe25c63e307e35b6c4892217eb6a5de5dd13ea38e041fbcecbee6e9f0206ef2b6e9d5d332edef SHA512 8e55f4b84fd6fbf1cad7381f2bb4e063c828da23459dc33a2af71d97c0c7967765e766963f4418f0a87a5151d2eb99f0e75205abd34f38cb9104885c0b7683be
 EBUILD kvazaar-9999.ebuild 1848 BLAKE2B 9ea0e877e0df6e622a45a5521e6d485318fcc9f0ae7290fea05503352b04b7eb14bd796ee8a21cfc8464ea58453328829803addd713684a7159624b30128c2ba SHA512 91f6f2306cf5704e2012c001591f06cb0bacca453d44f0595f75e87936429d39a24e6d24dd1d69ad60b696c341267464f95908d57578ec2898eaf162c5526c9b
 MISC metadata.xml 307 BLAKE2B 712a78cc3cbe9bee1e770452448efd933eb76c6de75e8302e8f61b22aec35a2f43ceb7c3014bf88b81ecf4ff27da4b115ab24605a53fbbba18100896fff12ff8 SHA512 29403efb372cc2ddb9e428be05bb7bf57b0a51a3ab66a0b0bfbdfbcdf6db1b5d357ddafc1b3a77d00109840ea4c610a088e7c8f97a3c0b9cd330a6edd2651ae6
diff --git a/media-libs/kvazaar/files/kvazaar-2.0.0-fix-avx2-flags.patch b/media-libs/kvazaar/files/kvazaar-2.0.0-fix-avx2-flags.patch
new file mode 100644
index 000000000000..f2ae8ae44150
--- /dev/null
+++ b/media-libs/kvazaar/files/kvazaar-2.0.0-fix-avx2-flags.patch
@@ -0,0 +1,33 @@
+From 99423a825027c862bbfd50e112a1846a013b01a7 Mon Sep 17 00:00:00 2001
+From: "Francisco Blas (klondike) Izquierdo Riera" <klondike@klondike.es>
+Date: Tue, 4 Oct 2022 10:03:44 +0200
+Subject: [PATCH] Enable -mpopcnt and -mlzcnt on AVX2
+
+When -mpopcnt or -mlzcnt are explicitly enabled or disabled
+(when using -march=native for example), kvazaar builds fail
+on older CPUs without support for these flags (see
+https://github.com/ultravideo/kvazaar/issues/228 and
+https://bugs.gentoo.org/739776 ).
+
+Ensuring these flags are on as done with the rest of AVX2 flags
+solves the compilation issues, although it may be a better
+approach to provide a configuration option so that only the
+specific version matching the build system supported flags is
+created in such cases.
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 79880a98..c972c5be 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -226,7 +226,7 @@ endif #HAVE_PPC
+ if HAVE_X86
+ 
+ if HAVE_AVX2_GCC
+-libavx2_la_CFLAGS = -mavx2 -mbmi -mabm -mbmi2
++libavx2_la_CFLAGS = -mavx2 -mbmi -mabm -mpopcnt -mlzcnt -mbmi2
+ endif
+ if HAVE_AVX2_CLANG
+ libavx2_la_CFLAGS = -mavx2 -mbmi -mpopcnt -mlzcnt -mbmi2
diff --git a/media-libs/kvazaar/kvazaar-2.0.0.ebuild b/media-libs/kvazaar/kvazaar-2.0.0.ebuild
index 34ceb7d503f6..6ef96802243d 100644
--- a/media-libs/kvazaar/kvazaar-2.0.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 	abi_x86_64? ( ${ASM_DEP} )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-avx2-flags.patch"
+)
+
 src_prepare() {
 	default
 	sed -e "/^dist_doc_DATA/s/COPYING //" -i Makefile.am || die
diff --git a/media-libs/kvazaar/kvazaar-2.1.0.ebuild b/media-libs/kvazaar/kvazaar-2.1.0.ebuild
index a7e7e1cd5a73..1d013a574e78 100644
--- a/media-libs/kvazaar/kvazaar-2.1.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.1.0.ebuild
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 	abi_x86_64? ( ${ASM_DEP} )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-fix-avx2-flags.patch"
+)
+
 src_prepare() {
 	default
 	sed -e "/^dist_doc_DATA/s/COPYING //" -i Makefile.am || die