6 files changed, 58 insertions, 4 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f4025f369057..340cb831947c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 99efe2712af7..4f45afacbeb4 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -4,8 +4,9 @@ AUX CVE-2018-20545+20547+20549.patch 1273 BLAKE2B f4a71b5e811dfb4cf43009e1dee80f
 AUX CVE-2018-20546+20547.patch 1211 BLAKE2B 46b96b322cd2595e6782f8ced146819394db3a9a2f9dc41e4ce102b584a5d4cbe05dcf8176ce766b781c2d1da7110efca875b498717669a434c94e2bbd40341a SHA512 9fd85f8551daac7cae3ef1025407e020fbb5233979e6894fecf561a3b59530bda0e79f9983d0778d957ffc698af37b7cfb2591bb7e811761ed16bad2b3d06ef9
 AUX Fix-a-problem-in-the-caca_resize-overflow-detection-.patch 4951 BLAKE2B c66475e9267eb7cd3b227faa82a3ebcbf20e83d31d72ffd4eeea80ee3b97c2005f54cebfb981be5cdea0ce4df006a7c37bb7c37a79ff83dea755ac78e7dcc9ea SHA512 fee4777d59b3a19f2ce8e1a6474ea0e092031d131473a5957b31a61f367f15ac8519223b4d54ab6c1cb2eb0cf24340584daf1bb6ff7d81fefa349168a9e4964f
 AUX canvas-fix-an-integer-overflow-in-caca_resize.patch 5265 BLAKE2B e75b3366a8e93971baecdc808ff4cc3d9bb1801836b80d4ee97905eb474af0ab65af762b5ee7a16490fa836c2381cf7cda8dad4df35f2d3ac9bf36c6f7db646f SHA512 626e91a2af949f79438529db454f4fad0ca335dd89d6e783eabcf66b76b972a648afa54951c34b4e1ee33017e14edce9cb94d7579ae484403bfdceb08e6d32de
+AUX configure-lto.patch 1393 BLAKE2B 0a8dc6069744e78c8ecbfdd432e6baab6afb18d23f7d9c87a468e6496f71b7ef18135c94e1d8073b0b80815523d9018643235ec60b7ab3c6b9aaf0c6d2317a1c SHA512 308e6add5548d2e271073fe752c7e34ce232e82721863708451cf6ec8d638c871cafb0edf4cf0ab10ba41dd020f5b2544824d72ab844987b0e5212df991a4e08
 AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c57185715d2ec7846ea5ea3990419d5b8a99062ace0f63ca06e68a45eb4c85210aacc2a6f29255b1088683ac SHA512 de6c43fb73d86dd8e8ee1e22e329ee2201bf09947568382c4637145b297edfae206c269edd05e08000d5670734f8e2c3373c5095682ac850cce588c4cd0cb636
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r11.ebuild 3321 BLAKE2B 29a8aa64338b21d897cce7bd96cdb4d6ba508fbf7c1aa37dc111633c5a1d208438dc7ac5737b7e1a0e3563ba705ada0f3fed24a9055e755ebed8770a233ec1d8 SHA512 a90e52304ae1c6ac689525457728127a23595b3b500345bb28bf29cc656178fed96f9db25552bc2ef5a8b1316961ea669a7ac0ef2ea7dfa05054f53b6087e8df
+EBUILD libcaca-0.99_beta19-r11.ebuild 3356 BLAKE2B 18780d0c72663f9e63fb7dcd9d32070795b1aa345e00658fa429def052deb80c724b801b9a9ed472fa222cac8660b30065a52282ecd433ab9d9102b9171d75f8 SHA512 962c2e7abc1fc7196da04438e93447419c269cca00c098d62247b37d394f0c385a071160a5a12b7c4e27cb021cf302f1ce3a1a6e10db4ed7780e54abdc54431e
 MISC metadata.xml 305 BLAKE2B 09d0fd38e248eee6d78d5cfc6d04cd454ba1b9c9b3474e1f94de41d0dff53e67f425875a9b27f9247ace85580025197e12c379ccec928474954bc3bd2ef0307d SHA512 6b8addbc26d79c54322fe838afaaf08ee7c73a8d1c7ecf529778e63490117e20ad744277506fea52b8ed6ba7652c7d75c7344642ad6521ad17b85c68d0a69713
diff --git a/media-libs/libcaca/files/configure-lto.patch b/media-libs/libcaca/files/configure-lto.patch
new file mode 100644
index 000000000000..c60989b3c8f4
--- /dev/null
+++ b/media-libs/libcaca/files/configure-lto.patch
@@ -0,0 +1,44 @@
+https://github.com/cacalabs/libcaca/pull/76
+
+[Modified to just save/restore flags.]
+
+From 07cb730bf3dc49170f0c387d9edcf5537a4e26b6 Mon Sep 17 00:00:00 2001
+From: kxxt <rsworktech@outlook.com>
+Date: Wed, 21 Jun 2023 00:06:04 +0800
+Subject: [PATCH] Disable LTO when checking for fsin/fcos/fldln2/...
+
+LTO might interfere with the instruction detection and produce false positives.
+(The conftest.c compiles with `-flto=auto` but fails without it)
+
+The build for riscv64 arch linux fails because of this:
+https://archriscv.felixc.at/.status/log.htm?url=logs/libcaca/libcaca-0.99.beta20-2.log
+
+This PR fixes it.
+---
+ configure.ac | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 27b8d5b4..ee38ead3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,6 +145,9 @@ AC_COMPILE_IFELSE(
+   AC_DEFINE(HAVE_SLEEP, 1, [Define to 1 if you have the ‘Sleep’ function.])],
+  [AC_MSG_RESULT(no)])
+ 
++OLD_CFLAGS="${CFLAGS}" # Disable LTO when checking for the instructions
++CFLAGS="${CFLAGS} -fno-lto"
++
+ AC_MSG_CHECKING(for fsin/fcos)
+ AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(
+@@ -163,6 +166,8 @@ AC_COMPILE_IFELSE(
+   AC_DEFINE(HAVE_FLDLN2, 1, [Define to 1 if you have the ‘fldln2’ and other floating point instructions.])],
+  [AC_MSG_RESULT(no)])
+ 
++CFLAGS="${OLD_CFLAGS}"
++
+ AC_CHECK_HEADERS(zlib.h)
+ AC_CHECK_LIB(z, gzopen, [ZLIB_LIBS="${ZLIB_LIBS} -lz"])
+ 
+
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index 32b14aa901c4..917b1e972fc7 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}/100_doxygen.diff"
 	# Fix doxygen docs install, bug 543870
 	"${FILESDIR}/fix-css-path.patch"
+	"${FILESDIR}/configure-lto.patch"
 )
 
 src_prepare() {
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index 642116092d97..dc64913df4c8 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,4 +1,4 @@
 AUX libiec61883-1.2.0-examples.patch 1140 BLAKE2B ab448e0a4941fd87ac8d0cd2cb6f21e3fc784b956ff2d8a1b81cad50a91ac0e60469eb5341d7ff3d7bfb7093fe424a51b63246292b52a62dcd773370fd6a7445 SHA512 b022bd213e82ae0f6ac206512a6764784720ef4e5caf349e39e729ec2a7c6b84c70af9ef02753b76e431707fc36fe1cc076b87367ca3c89250bcc1a0660d4eb7
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
-EBUILD libiec61883-1.2.0-r2.ebuild 865 BLAKE2B 056f5fe96a64d76b244b32dd2aafa78a56f94ff9b173038a598e0313370095aff071f9b619b18967ab377a5e0bb5b00ee71e747389b28fca63c58c79e36caa5d SHA512 9631e8d4ad534c1a60f131b0bb0c8ef80a628410a752d84b76d5f0f00582be11fa5f6147e3084facfc22fb12d6a8b61767a6fc59ee2bb35bcb0abe99c1af54ea
+EBUILD libiec61883-1.2.0-r2.ebuild 994 BLAKE2B da85cbd29e6832c311e184815a1e2f0d04f5799f9fcf39639015524c8a2f6143ba71fd103540cbaea059f2f2446b861398e2233eba3c81ae068a82b17e9d8d10 SHA512 b3ad84ea7f39af09239e5a5d6a6ba1219318b1d7bbf5e089ca944183a27f16d16be11bac15f3bd24d29b83d634e045599a9307d131415b49a1f9500d67927d9e
 MISC metadata.xml 532 BLAKE2B d0509581e95e35d8232fbb5b6dc324a499ae63183884caad481d44c24ba5f9a0005a0b9eb410d15b3ec5c82f810bbdf2e002f518819bbebba8f507c57be52a94 SHA512 7bfcd933618b95edbe34d45e870578cc5cbaa18de9c86214597f01fe54cce51b5a05f3f6b38435a9a750a3b0210d825a3604b1c40966dea2b241c52c62a9cd1e
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
index 5ca93b155253..4e9d17172773 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="Library for capturing video (dv or mpeg2) over the IEEE 1394 bus"
 HOMEPAGE="https://ieee1394.wiki.kernel.org/index.php/Libraries#libiec61883"
@@ -23,6 +23,14 @@ src_prepare() {
 	use examples && eapply "${FILESDIR}/${P}-examples.patch"
 }
 
+src_configure() {
+	# bug #859916
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf --disable-static
 }