From c91121c8cb7a107c2965c2e5dac85548c0df7c0d Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Mon, 10 Jun 2024 21:25:31 +0000
Subject: [PATCH] community/v4l-utils: upgrade to 1.26.1

---
 community/v4l-utils/APKBUILD          | 41 +++++++++++++++------------
 community/v4l-utils/disable-nls.patch | 13 +++++++++
 2 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 community/v4l-utils/disable-nls.patch

diff --git a/community/v4l-utils/APKBUILD b/community/v4l-utils/APKBUILD
index 11556b8f1af..bff84adde2e 100644
--- a/community/v4l-utils/APKBUILD
+++ b/community/v4l-utils/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=v4l-utils
-pkgver=1.24.1
-pkgrel=1
+pkgver=1.26.1
+pkgrel=0
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 url="https://linuxtv.org/"
 arch="all"
@@ -10,10 +10,18 @@ license="LGPL-2.0-or-later"
 makedepends="
 	alsa-lib-dev
 	argp-standalone
+	bash
 	eudev-dev
+	gettext-dev
+	libintl
 	libjpeg-turbo-dev
 	linux-headers
+	meson
 	qt5-qtbase-dev
+	qt5-qttools-dev
+	sdl2_image-dev
+	sdl2-dev
+	xmlrpc-c-dev
 	"
 subpackages="
 	$pkgname-dev
@@ -24,9 +32,8 @@ subpackages="
 	qv4l2
 	ir_keytable
 	"
-source="https://linuxtv.org/downloads/v4l-utils/v4l-utils-$pkgver.tar.bz2
-	types.patch
-	"
+source="https://linuxtv.org/downloads/v4l-utils/v4l-utils-$pkgver.tar.xz
+ disable-nls.patch"
 
 case "$CARCH" in
 arm*|aarch64)
@@ -38,27 +45,25 @@ arm*|aarch64)
 esac
 
 build() {
-	export CFLAGS="$CFLAGS -O2 -flto=auto"
-	export CXXFLAGS="$CXXFLAGS -O2 -flto=auto"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
+	meson setup \
+		--buildtype=plain \
+		--prefix="/usr" \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--enable-libdvbv5 \
-		--disable-static
-	make
+		-Ddefault_library="both" \
+	"build"
+
+	meson compile -C "build"
 }
 
 check() {
-	make check
+	meson test -C "build"
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" ninja -C build/ install
 	install -Dm644 "$builddir"/utils/qv4l2/qv4l2.desktop \
 		"$pkgdir"/usr/share/applications/qv4l2.desktop
 	install -Dm644 "$builddir"/utils/qv4l2/qv4l2.svg \
@@ -105,6 +110,6 @@ ir_keytable() {
 }
 
 sha512sums="
-1e82ba125285e875bf4a216adedab9147009e6af1aadd79a3a1770231d3c96ec29245b33e75f69a9ce1b25011e71746db242c778ac3369148de1e9de2e318663  v4l-utils-1.24.1.tar.bz2
-358611fbae8348f17bf49c08820b4641deb1f7282ce2c1e20b8fdf0a85cd73ca4b46f6668c2a7328b5261e401c12f471170a9a1f3fc2982b6897ff11386c06c6  types.patch
+a3b12b311977afec410db8b430696e923a24e04f003a5891cc77ddeb667d0b98666a06d31a439c95ce57d9e9c9c2593c5e9dd9e7cf2be002adb95db5b8f00ac8  v4l-utils-1.26.1.tar.xz
+028e6b51824e8be438e3c03393791ee4021ad72b2cc99d9aa8e31f53e09ea9bfc510fbfcee1b8e84ff26dc08e648d24e74dbdb7d6568f8d97fe2a2320c283f73  disable-nls.patch
 "
diff --git a/community/v4l-utils/disable-nls.patch b/community/v4l-utils/disable-nls.patch
new file mode 100644
index 00000000000..0fb40ef3cf7
--- /dev/null
+++ b/community/v4l-utils/disable-nls.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 7ca78cb..58d13e6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -43,7 +43,7 @@ common_arguments = [
+     '-Wpointer-arith',
+     '-D_GNU_SOURCE',
+     '-DPROMOTED_MODE_T=int',
+-    '-DENABLE_NLS',
++    '-DDISABLE_NLS',
+     '-include', meson.current_build_dir() / 'config.h',
+ ]
+