From 21ff8c732c8c287599b020f64ccd7f25bc22df1c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 2 Jun 2024 19:40:18 -0700 Subject: [PATCH] libv4l: fix compilation without utils Upstream backport. Signed-off-by: Rosen Penev --- libs/libv4l/Makefile | 2 +- libs/libv4l/patches/100-meson-utils.patch | 24 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 libs/libv4l/patches/100-meson-utils.patch diff --git a/libs/libv4l/Makefile b/libs/libv4l/Makefile index 7ee82f6b89..15bb094610 100644 --- a/libs/libv4l/Makefile +++ b/libs/libv4l/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l-utils PKG_VERSION:=1.26.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.linuxtv.org/downloads/v4l-utils diff --git a/libs/libv4l/patches/100-meson-utils.patch b/libs/libv4l/patches/100-meson-utils.patch new file mode 100644 index 0000000000..191d47493a --- /dev/null +++ b/libs/libv4l/patches/100-meson-utils.patch @@ -0,0 +1,24 @@ +From fee976dcfe3be03cc72c099f9ed3bac938a34b58 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Tue, 12 Dec 2023 15:24:05 +0000 +Subject: meson: Fix building with -Dv4l-utils=false + +ir_bpf_enabled was referenced without being defined. +Tested-by: Peter Seiderer + +Signed-off-by: Hans Verkuil +--- + meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/meson.build ++++ b/meson.build +@@ -360,6 +360,8 @@ subdir('lib') + if get_option('v4l-utils') + subdir('utils') + subdir('contrib') ++else ++ ir_bpf_enabled = false + endif + + subdir('doc') -- 2.30.2