From dfd3e911fe7fba12600abe9c550521bc32b60137 Mon Sep 17 00:00:00 2001
From: Tim Tassonis <stuff@decentral.ch>
Date: Thu, 30 Nov 2023 11:59:18 +0100
Subject: [PATCH] Update to v4l-utils-1.26.0.

---
 introduction/welcome/changelog.xml | 10 ++++++++
 multimedia/libdriv/v4l-utils.xml   | 40 ++++++++++++++++++++++++------
 packages.ent                       |  2 +-
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f4f37f3e67..7a88418c6b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -38,6 +38,16 @@
       </itemizedlist>
     </listitem>
     -->
+   <listitem>
+     <para>November 30th, 2023</para>
+     <itemizedlist>
+       <listitem>
+         <para>[timtas] - Update to v4l-utils-1.26.0. Fixes
+         <ulink url="&blfs-ticket-root;18916">#18916</ulink>.</para>
+       </listitem>
+     </itemizedlist>
+   </listitem>
+
    <listitem>
      <para>November 29th, 2023</para>
      <itemizedlist>
diff --git a/multimedia/libdriv/v4l-utils.xml b/multimedia/libdriv/v4l-utils.xml
index 31ddf34cba..2e5a4f0ec3 100644
--- a/multimedia/libdriv/v4l-utils.xml
+++ b/multimedia/libdriv/v4l-utils.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY v4l-download-http "https://www.linuxtv.org/downloads/v4l-utils/v4l-utils-&v4l-utils-version;.tar.bz2">
   <!ENTITY v4l-download-ftp  " ">
-  <!ENTITY v4l-md5sum        "8ba9c73c4319b6afab5fa4358edc43de">
-  <!ENTITY v4l-size          "2.2 MB">
-  <!ENTITY v4l-buildsize     "126 MB">
+  <!ENTITY v4l-md5sum        "0ccb2a18e1d3a3b2986591753a2b3a7f">
+  <!ENTITY v4l-size          "1.2 MB">
+  <!ENTITY v4l-buildsize     "32 MB">
   <!ENTITY v4l-time          "1.1 SBU (using parallelism=4)">
 ]>
 
@@ -108,10 +108,13 @@
       the following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+meson setup --prefix=/usr -Ddoxygen-doc=disabled \
+            -Dgconv=disabled --buildtype=release ..
+
+ninja</userinput></screen>
+
 
     <para>
       This package does not come with a test suite.
@@ -121,10 +124,31 @@ make</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make -j1 install</userinput></screen>
+<screen role="root"><userinput>ninja  install</userinput></screen>
+
+    <para>
+      If you also wish to install the contrib programs, add:
+    </para>
+
+<screen role="root"><userinput>for prog in sdlcam  v4l2gl  v4l2grab
+do
+	cp -v contrib/test/$prog $DESTDIR/usr/bin/.
+done</userinput></screen>
+
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-Dgconv=disabled</parameter>: This switch disables
+      the erroneous installation of gconv-modules that would break glibc.
+    </para>
+
+  </sect2>
+
+
   <sect2 role="content">
     <title>Contents</title>
 
diff --git a/packages.ent b/packages.ent
index 02d68e9692..c5f0aab621 100644
--- a/packages.ent
+++ b/packages.ent
@@ -1079,7 +1079,7 @@
 <!ENTITY speex-version                "1.2.1">
 <!ENTITY speexdsp-version             "1.2.1">
 <!ENTITY taglib-version               "1.13.1">
-<!ENTITY v4l-utils-version            "1.24.1">
+<!ENTITY v4l-utils-version            "1.26.0">
 <!ENTITY wireplumber-version          "0.4.16">
 <!ENTITY x264-version                 "20230215">
 <!ENTITY x265-version                 "20230215">