From eb9e56022368681bfcfe9d0cf9931c42d01b80e6 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 21 May 2022 19:16:20 +0200
Subject: [PATCH] Revert "v4l-utils: compile bpf decoders using bpf-gcc"

This reverts commit 3d758f3210fca7a8a6b736686b707397d4728b27.
---
 packages/sysutils/v4l-utils/package.mk        |  2 +-
 ...l-utils-002-enable-bpf-without-clang.patch | 40 +++++++++++++++++++
 .../patches/v4l-utils-002-use-bpf-gcc.patch   | 37 -----------------
 3 files changed, 41 insertions(+), 38 deletions(-)
 create mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-002-enable-bpf-without-clang.patch
 delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-002-use-bpf-gcc.patch

diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk
index d0e74bcf08..d3b5fcedf2 100644
--- a/packages/sysutils/v4l-utils/package.mk
+++ b/packages/sysutils/v4l-utils/package.mk
@@ -10,7 +10,7 @@ PKG_SHA256="65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31"
 PKG_LICENSE="GPL"
 PKG_SITE="http://linuxtv.org/"
 PKG_URL="http://linuxtv.org/downloads/v4l-utils/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain alsa-lib elfutils gcc-bpf:host libbpf systemd zlib"
+PKG_DEPENDS_TARGET="toolchain alsa-lib elfutils ir-bpf-decoders libbpf systemd zlib"
 PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
 PKG_TOOLCHAIN="autotools"
 
diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-002-enable-bpf-without-clang.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-002-enable-bpf-without-clang.patch
new file mode 100644
index 0000000000..2541015db6
--- /dev/null
+++ b/packages/sysutils/v4l-utils/patches/v4l-utils-002-enable-bpf-without-clang.patch
@@ -0,0 +1,40 @@
+From ff65aa88a1ff3f02cc10e5a6e2af865b0c97f4fc Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Sat, 8 Feb 2020 21:42:06 +0100
+Subject: [PATCH] disable bpf decoder build and drop bpf dependency on clang
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ configure.ac               | 2 +-
+ utils/keytable/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3bb1d2a5..7b633473 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -565,7 +565,7 @@
+ AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_libv4l} != xno])
+ AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_32], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_32} = xyes])
+ PKG_CHECK_MODULES([LIBBPF], [libbpf], [bpf_pc=yes], [bpf_pc=no])
+-AM_CONDITIONAL([WITH_BPF],          [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$CLANG = xclang -a x$bpf_pc = xyes])
++AM_CONDITIONAL([WITH_BPF],          [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$bpf_pc = xyes])
+ 
+ # append -static to libtool compile and link command to enforce static libs
+ AS_IF([test x$enable_libdvbv5 = xno], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])])
+diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am
+index 4724897e..1c209fe2 100644
+--- a/utils/keytable/Makefile.am
++++ b/utils/keytable/Makefile.am
+@@ -23,7 +23,7 @@
+ if WITH_BPF
+ ir_keytable_LDFLAGS += $(LIBELF_LIBS) $(LIBBPF_LIBS)
+ ir_keytable_CFLAGS = $(LIBBPF_CFLAGS)
+-SUBDIRS = bpf_protocols
++# SUBDIRS = bpf_protocols
+ endif
+ 
+ EXTRA_DIST = 70-infrared.rules 50-rc_keymap.conf rc_keymaps rc_keymaps_userspace gen_input_events.pl gen_keytables.pl ir-keytable.1 rc_maps.cfg rc_keymap.5
+-- 
+2.20.1
+
diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-002-use-bpf-gcc.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-002-use-bpf-gcc.patch
deleted file mode 100644
index ad23930067..0000000000
--- a/packages/sysutils/v4l-utils/patches/v4l-utils-002-use-bpf-gcc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2021-10-23 08:11:21.000000000 -0700
-+++ b/configure.ac	2022-05-16 15:39:52.312875449 -0700
-@@ -177,7 +177,7 @@
- AC_SUBST([LIBELF_CFLAGS])
- AC_SUBST([LIBELF_LIBS])
- if test "x$libelf_pkgconfig" = "xyes"; then
--  AC_CHECK_PROG([CLANG], clang, clang)
-+  AC_CHECK_PROG([BPFGCC], bpf-gcc, bpf-gcc)
- else
-   AC_MSG_WARN(libelf library not available)
- fi
-@@ -565,7 +565,7 @@
- AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_libv4l} != xno])
- AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_32], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_32} = xyes])
- PKG_CHECK_MODULES([LIBBPF], [libbpf], [bpf_pc=yes], [bpf_pc=no])
--AM_CONDITIONAL([WITH_BPF],          [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$CLANG = xclang -a x$bpf_pc = xyes])
-+AM_CONDITIONAL([WITH_BPF],          [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$BPFGCC = xbpf-gcc -a x$bpf_pc = xyes])
- 
- # append -static to libtool compile and link command to enforce static libs
- AS_IF([test x$enable_libdvbv5 = xno], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])])
-diff -Naur a/utils/keytable/bpf_protocols/Makefile.am b/utils/keytable/bpf_protocols/Makefile.am
---- a/utils/keytable/bpf_protocols/Makefile.am	2020-05-14 02:23:59.000000000 -0700
-+++ b/utils/keytable/bpf_protocols/Makefile.am	2022-05-16 15:41:14.089649162 -0700
-@@ -4,11 +4,8 @@
- #
- # Use '-idirafter': Don't interfere with include mechanics except where the
- # build would have failed anyways.
--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 $<
-+	$(BPFGCC) -D__linux__ -I$(top_srcdir)/include -O2 -mxbpf -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
-