[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/files/, media-tv/v4l-utils/

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/files/, media-tv/v4l-utils/

[Mike Frysinger]

commit:     cc2e3e54bcd5b636f77a3ca147cc60b962405df4
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 17:04:20 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 17:04:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc2e3e54

media-tv/v4l-utils: fix build w/newer glibc #580910

 .../files/v4l-utils-1.6.2-sysmacros.patch          | 59 ++++++++++++++++++++++
 media-tv/v4l-utils/v4l-utils-1.6.2.ebuild          |  4 ++
 2 files changed, 63 insertions(+)

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch b/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
new file mode 100644
index 0000000..fe5636a
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/580910
+
+From 8edd80d3654843d9441fb5e43dfbf2b3e81f84b5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 14 Mar 2016 16:56:40 -0400
+Subject: [PATCH] include sys/sysmacros.h for major() & minor()
+
+Linux C libraries are looking to disentangle sysmacros.h from the
+sys/types.h header to clean up namespace pollution.  Since these
+macros are provided in glibc/etc... today, switch to pulling in
+this header directly.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ contrib/test/mc_nextgen_test.c            | 1 +
+ lib/libv4lconvert/control/libv4lcontrol.c | 1 +
+ utils/libmedia_dev/get_media_devices.c    | 1 +
+ utils/media-ctl/libmediactl.c             | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
+index 3c8335c..59f28b1 100644
+--- a/lib/libv4lconvert/control/libv4lcontrol.c
++++ b/lib/libv4lconvert/control/libv4lcontrol.c
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+diff --git a/utils/libmedia_dev/get_media_devices.c b/utils/libmedia_dev/get_media_devices.c
+index e3a2200..edfeb41 100644
+--- a/utils/libmedia_dev/get_media_devices.c
++++ b/utils/libmedia_dev/get_media_devices.c
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c
+index 4a82d24..16dddbe 100644
+--- a/utils/media-ctl/libmediactl.c
++++ b/utils/media-ctl/libmediactl.c
+@@ -24,6 +24,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include <ctype.h>
+ #include <errno.h>
+-- 
+2.6.2
+

diff --git a/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild b/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild
index f6683db..896aca2 100644
--- a/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.6.2-sysmacros.patch #580910
+}
+
 src_configure() {
 	# Hard disable the flags that apply only to the libs.
 	econf \

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/files/, media-tv/v4l-utils/

[Sam James]

commit:     c5026603fbe974271937b3c0e5915926e36f316c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 05:29:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 05:29:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5026603

media-tv/v4l-utils: fix build w/ clang+ssp

Closes: https://bugs.gentoo.org/889561
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../v4l-utils-1.22.1-no-stack-protector-bpf.patch  | 25 ++++++++++++++++++++++
 media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild      |  6 +++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch b/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch
new file mode 100644
index 000000000000..0ee28643ea1c
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch
@@ -0,0 +1,25 @@
+SSP doesn't make sense for BPF.
+
+https://bugs.gentoo.org/889561
+--- a/utils/keytable/Makefile.am
++++ b/utils/keytable/Makefile.am
+@@ -22,7 +22,7 @@ ir_keytable_LDFLAGS = $(ARGP_LIBS)
+ 
+ if WITH_BPF
+ ir_keytable_LDFLAGS += $(LIBELF_LIBS) $(LIBBPF_LIBS)
+-ir_keytable_CFLAGS = $(LIBBPF_CFLAGS)
++ir_keytable_CFLAGS = $(LIBBPF_CFLAGS) -fno-stack-protector
+ SUBDIRS = bpf_protocols
+ endif
+ 
+--- a/utils/keytable/bpf_protocols/Makefile.am
++++ b/utils/keytable/bpf_protocols/Makefile.am
+@@ -8,7 +8,7 @@ CLANG_SYS_INCLUDES := $(shell $(CLANG) -v -E - </dev/null 2>&1 \
+         | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')
+ 
+ %.o: %.c bpf_helpers.h
+-	$(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -c $<
++	$(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -fno-stack-protector -c $<
+ 
+ PROTOCOLS = grundig.o pulse_distance.o pulse_length.o rc_mm.o manchester.o xbox-dvd.o imon_rsc.o raw.o samsung36.o
+ 

diff --git a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild b/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
index 57f4e1a21e15..1294a25de248 100644
--- a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,10 @@ BDEPEND="
 # Not really prebuilt but BPF objects make our QA checks go crazy.
 QA_PREBUILT="*/rc_keymaps/protocols/*.o"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.22.1-no-stack-protector-bpf.patch
+)
+
 check_llvm() {
 	if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
 		local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}