gentoo auto-resync : 09:02:2024 - 23:33:52

3 files changed, 61 insertions, 1 deletions

diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index b27d1ab0e6c0..2d5d17eca266 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,8 +1,9 @@
 AUX libv4l-1.26.0-meson.patch 3156 BLAKE2B c0b91160b4a065458e2889a196671f4fe083fa44c0061c00ecb1f272274af5edc00780bbe74003a03264a3d50ca5af010f4c75ce574547a1d39a09ebf1f72ec1 SHA512 f20f72ac9edc1ac188b838975dac7f5a64fb37910c6e714003121355a587bc6610e70a355fceb15839051ca9ca5042695e83ee424b1238e8159e0ffdb971e878
+AUX libv4l-1.26.1-libcxx.patch 1681 BLAKE2B 7a9caceeb658b11161ceffd62337b7415688cc52498a6ee710c392f812dc3489b9fc670116e11a077f1d3a6e31be51dadd7d2f3e94e4cd9fa52b5109a4fb379b SHA512 c9750908a19454ea31b8a8167350c375040acbcde75c798062d712d9d5cb17d87175beb4c10abcab20fa6f13a21cf2bfd1b809c34ee42ee7166d4dfb02a18ae0
 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
 DIST v4l-utils-1.24.1.tar.bz2 2238340 BLAKE2B 1702918699d47b17467e012c2b1875c58851175c1007351a3b40d0b0fa40437eb695efa9e21afe3351f66780899d45798eef7f23c90a4831bface70a245b8a54 SHA512 1e82ba125285e875bf4a216adedab9147009e6af1aadd79a3a1770231d3c96ec29245b33e75f69a9ce1b25011e71746db242c778ac3369148de1e9de2e318663
 DIST v4l-utils-1.26.1.tar.xz 1192312 BLAKE2B 84a6b5737447fa332b64af8fdc2ecb308865528bc16487e55a4ccc00a76288239432b299ab2225829530db9158b0449f64e2e1c3fb782c7495da55ea8e7a171a SHA512 a3b12b311977afec410db8b430696e923a24e04f003a5891cc77ddeb667d0b98666a06d31a439c95ce57d9e9c9c2593c5e9dd9e7cf2be002adb95db5b8f00ac8
 EBUILD libv4l-1.22.1.ebuild 1474 BLAKE2B 02e405372e756e104f9f12fbcf91fdad9065a7da032cdec3b5ef1e1978ec816625d605f89b79a428a5cc21cdfc9422148cb133160aee9d97775d45565ed5516c SHA512 a4b2facc7b261e0b7231374ffe7e049460b1f9da123d02e9b82e5371e6d6dea77e052ea007554b0090a2c5bfe452ca9a02f43d86d3add0bc942fde22563e577d
 EBUILD libv4l-1.24.1.ebuild 1481 BLAKE2B 1ea5253e7f594b4ed2f51a3bbe002992ba979c4beb662497e5912faebfb30ce23363b851f114873b44a7d4030e20c4a350f2d92afafc1c20f503f31e4c575923 SHA512 b55663f8836ecef9c5b45a0e436c9bef3842e058af4f066c1586c6bc38a315ffe57e489741ca273816e5e99420a97ead030224f1e6058f1059d61a3d7a5b38ab
-EBUILD libv4l-1.26.1.ebuild 3256 BLAKE2B eb3e6ac40f319b02f6164bc2b949f49296697cd16c4413b6e88a7fee7b84f3bf81665c5612120f0cbccd837451a96203dc37967166e6ee0480b3e1c940ddff5d SHA512 f581e77b12deee270e48567501aee65116928c0da322781543cdeef0f84e0671bcb2311252785ec5b19c00a75bab9fde5e5906ff58ebff458800e83d5a7a64cf
+EBUILD libv4l-1.26.1.ebuild 3297 BLAKE2B e48dfeb1023184db54cd491309bd2a4978d9998dfe741b941eb5edcab350b74c6a0eb55d2ca6425df817206f30a5e42bd177911b9fd644c7a11cf7d0906736c8 SHA512 4100011c4b7b9bd775a62d4eff555772a6f451667a0a01bc7e28c20d6a33bf8f93acc7e8d5ecf46ae0d2a33b3c4aca7e609e75ee41930c5ea32ad2a2c358b4b2
 MISC metadata.xml 1333 BLAKE2B 980117d95da191d35287e97e99c1add4231438d0e5f763cd576bd9bf79ce894297bd32252b8e73a1356d14be66dde09ef0ae3307a0e856554cb024569eee63ee SHA512 da28f9574865217098fb8602d7860131e58b7c16501bef840814a3ef7870a5565795151c8b574ecc895c9614400b5ac5b444430fd147dabea0f747174d6ae7a0
diff --git a/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch b/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch
new file mode 100644
index 000000000000..5b5eea83bc9a
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch
@@ -0,0 +1,58 @@
+From c7ef1a55bb6accb708a4e09d71028b904b07e49e Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 7 Feb 2024 22:48:59 +0000
+Subject: [PATCH] v4l2-compliance: Fix building against libc++
+
+v4l2-test-time32-64.cpp included compiler.h, which checks
+_LIBCPP_VERSION. This only works against libc++ when a C++ header has
+already been included, which wasn't the case here.
+
+The <version> header is the C++20 method of defining _LIBCPP_VERSION,
+but for older versions, <ciso646> works as an alternative, so include
+that in compiler.h.
+
+compiler.h is for C as well as C++ though, so use __cplusplus to check
+for a C++ compiler before including <ciso646>.
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ include/compiler.h | 27 ++++++++++++---------------
+ 1 file changed, 12 insertions(+), 15 deletions(-)
+
+diff --git a/include/compiler.h b/include/compiler.h
+index 5ad54f41..169247a8 100644
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -1,17 +1,14 @@
+-#ifdef _LIBCPP_VERSION
+-#define fallthrough _LIBCPP_FALLTHROUGH()
++#if !defined(__cplusplus) || __cplusplus < 201103L
++	#define fallthrough ((void)0)
+ #else
+-
+-#if __cplusplus >= 201103L
+-
+-#ifdef __clang__
+-#define fallthrough [[clang::fallthrough]]
+-#else
+-#define fallthrough [[gnu::fallthrough]]
+-#endif // __clang__
+-
+-#else
+-#define fallthrough ((void)0)
+-
++	#include <ciso646>
++	#ifdef _LIBCPP_VERSION
++		#define fallthrough _LIBCPP_FALLTHROUGH()
++	#else
++		#ifdef __clang__
++			#define fallthrough [[clang::fallthrough]]
++		#else
++			#define fallthrough [[gnu::fallthrough]]
++		#endif // __clang__
++	#endif // _LIBCPP_VERSION
+ #endif // __cplusplus
+-#endif // _LIBCPP_VERSION
+-- 
+2.43.0
+
diff --git a/media-libs/libv4l/libv4l-1.26.1.ebuild b/media-libs/libv4l/libv4l-1.26.1.ebuild
index d29bf0e53ee9..3480dac0970b 100644
--- a/media-libs/libv4l/libv4l-1.26.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.26.1.ebuild
@@ -67,6 +67,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.26.0-meson.patch
+	"${FILESDIR}"/${PN}-1.26.1-libcxx.patch
 )
 
 check_llvm() {