diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2025-11-30 16:24:53 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2025-11-30 16:24:53 +0000 |
| commit | 9831c0e0306024a3fad1113441cf25b89db474c3 (patch) | |
| tree | f9380afd43b88489d210f9c258b58e5216c7847c | |
| parent | net-im/dino: add 0.5.1 (diff) | |
| download | gentoo-9831c0e0306024a3fad1113441cf25b89db474c3.tar.gz gentoo-9831c0e0306024a3fad1113441cf25b89db474c3.tar.bz2 gentoo-9831c0e0306024a3fad1113441cf25b89db474c3.zip | |
media-libs/libv4l: Patch to fix building bpf code with other locales
This has been submitted upstream.
Closes: https://bugs.gentoo.org/965495
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
| -rw-r--r-- | media-libs/libv4l/files/libv4l-1.32-bpf-locale.patch | 20 | ||||
| -rw-r--r-- | media-libs/libv4l/libv4l-1.30.1.ebuild | 1 | ||||
| -rw-r--r-- | media-libs/libv4l/libv4l-1.32.0.ebuild | 4 |
3 files changed, 25 insertions, 0 deletions
diff --git a/media-libs/libv4l/files/libv4l-1.32-bpf-locale.patch b/media-libs/libv4l/files/libv4l-1.32-bpf-locale.patch new file mode 100644 index 000000000000..46cbd08eb51c --- /dev/null +++ b/media-libs/libv4l/files/libv4l-1.32-bpf-locale.patch @@ -0,0 +1,20 @@ +From 0cc4983c997a5f5d71754ee40007fbf266909ce5 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 30 Nov 2025 16:08:58 +0000 +Subject: [PATCH] bpf: Use C locale when determining Linux headers + +Otherwise the sed pattern may not match. + +Signed-off-by: James Le Cuirot <chewi@gentoo.org> +--- a/utils/keytable/bpf_protocols/cc_sys_includes.sh ++++ b/utils/keytable/bpf_protocols/cc_sys_includes.sh +@@ -6,5 +6,5 @@ + # + # Use '-idirafter': Don't interfere with include mechanics except where the + # build would have failed anyways. +-"$@" -v -E - </dev/null 2>&1 \ ++LC_ALL=C "$@" -v -E - </dev/null 2>&1 \ + | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }' +-- +2.52.0 + diff --git a/media-libs/libv4l/libv4l-1.30.1.ebuild b/media-libs/libv4l/libv4l-1.30.1.ebuild index 95d72be65143..bcc3cb2a48d1 100644 --- a/media-libs/libv4l/libv4l-1.30.1.ebuild +++ b/media-libs/libv4l/libv4l-1.30.1.ebuild @@ -69,6 +69,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-cpp-fallthrough.patch "${FILESDIR}"/${PN}-bpf-toolchain.patch + "${FILESDIR}"/${PN}-1.32-bpf-locale.patch ) # Not really prebuilt but BPF objects make our QA checks go crazy. diff --git a/media-libs/libv4l/libv4l-1.32.0.ebuild b/media-libs/libv4l/libv4l-1.32.0.ebuild index 6389c6a83717..e2d5d62cb9d5 100644 --- a/media-libs/libv4l/libv4l-1.32.0.ebuild +++ b/media-libs/libv4l/libv4l-1.32.0.ebuild @@ -66,6 +66,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.32-bpf-locale.patch +) + # Not really prebuilt but BPF objects make our QA checks go crazy. QA_PREBUILT="*/rc_keymaps/protocols/*.o" |