From 4b75843dc76db72c2aafb6979fd7a73e88060ae1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 5 Mar 2024 11:47:42 +0100
Subject: v2l-utils: update to 1.26.1

---
 package/v4l-utils/Makefile                             | 18 +++++++++++-------
 .../v4l-utils/patches/patch-utils_rds_rds-saa6588_c    | 15 ---------------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 package/v4l-utils/patches/patch-utils_rds_rds-saa6588_c

(limited to 'package')

diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index 936b26546..a18b8574c 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -4,19 +4,17 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		v4l-utils
-PKG_VERSION:=		1.10.1
+PKG_VERSION:=		1.26.1
 PKG_RELEASE:=		1
-PKG_HASH:=		6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0
+PKG_HASH:=		4a71608c0ef7df2931176989e6d32b445c0bdc1030a2376d929c8ca6e550ec4e
 PKG_DESCR:=		video4linux utilities
 PKG_SECTION:=		mm/video
 PKG_BUILDDEP:=		libjpeg-turbo
-PKG_SITES:=		http://linuxtv.org/downloads/v4l-utils/
+PKG_SITES:=		https://www.linuxtv.org/downloads/v4l-utils/
+PKG_NEEDS:=		intl
 PKG_LIBNAME:=		libv4l
 PKG_OPTS:=		dev
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
-PKG_LIBC_DEPENDS:=	glibc
 PKG_SUBPKGS:=		V4L_UTILS LIBV4L
 PKGSC_LIBV4L:=		libs/video
 PKGSD_LIBV4L:=		Video4Linux2 libraries
@@ -26,8 +24,14 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,V4L_UTILS,v4l-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBV4L,libv4l,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBV4L},${PKGSC_LIBV4L},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--disable-qv4l2
 TARGET_CPPFLAGS+=	-DLINUX_I2C_DEV_H
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+MESON_FLAGS+=		-Dgconv=disabled
+
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
 
 v4l-utils-install:
 	$(INSTALL_DIR) $(IDIR_V4L_UTILS)/usr/bin
diff --git a/package/v4l-utils/patches/patch-utils_rds_rds-saa6588_c b/package/v4l-utils/patches/patch-utils_rds_rds-saa6588_c
deleted file mode 100644
index ddd779080..000000000
--- a/package/v4l-utils/patches/patch-utils_rds_rds-saa6588_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- v4l-utils-0.9.3.orig/utils/rds/rds-saa6588.c	2012-05-10 20:10:34.000000000 +0200
-+++ v4l-utils-0.9.3/utils/rds/rds-saa6588.c	2013-07-12 17:53:04.000000000 +0200
-@@ -12,8 +12,12 @@
- #include <errno.h>
- #include <sys/ioctl.h>
- #include <linux/types.h>
-+#ifdef LINUX_I2C_DEV_H
-+#include <linux/i2c-dev.h>
-+#else
- #include <linux/i2c.h>
- #include <linux/i2c-dev.h>
-+#endif
- 
- int debug;
- 
-- 
cgit v1.2.3