[arch-commits] Commit in v4l-utils/trunk (2 files)

[Jelle van der Waa]

    Date: Monday, June 7, 2021 @ 17:40:31
  Author: jelle
Revision: 417303

Fix FS#71138

Added:
  v4l-utils/trunk/0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch
Modified:
  v4l-utils/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch |   36 ++++++++++
 PKGBUILD                                                        |   13 ++-
 2 files changed, 46 insertions(+), 3 deletions(-)

Added: 0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch
===================================================================
--- 0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch	                        (rev 0)
+++ 0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch	2021-06-07 17:40:31 UTC (rev 417303)
@@ -0,0 +1,36 @@
+From 02f295d4c4c1b401cdb589df5bef2645c7f83813 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <hverkuil-cisco at xs4all.nl>
+Date: Mon, 15 Mar 2021 08:13:14 +0100
+Subject: [PATCH] v4l2-tpg.patch: rename min/max defines to tpg_min/max
+
+With gcc 11 the min/max defines clash with what gcc provides,
+so rename these defines. They are only used in the min3/max3
+defines, so the change it kept to a minimum.
+
+Signed-off-by: Hans Verkuil <hverkuil-cisco at xs4all.nl>
+Reported-by: Gregor Jasny <gjasny at googlemail.com>
+---
+ utils/common/v4l2-tpg.h     | 10 ++++------
+ utils/common/v4l2-tpg.patch | 12 +++++-------
+ 2 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/utils/common/v4l2-tpg.h b/utils/common/v4l2-tpg.h
+index caf7b1a1..ecdb6eba 100644
+--- a/utils/common/v4l2-tpg.h
++++ b/utils/common/v4l2-tpg.h
+@@ -28,12 +28,10 @@ typedef __s8 s8;
+ #define pr_info printf
+ #define noinline
+ 
+-#ifndef min
+-#define min(a,b)	((a) < (b) ? (a) : (b))
+-#define max(a,b)	((a) > (b) ? (a) : (b))
+-#endif /* !min */
+-#define min3(x, y, z) min((typeof(x))min(x, y), z)
+-#define max3(x, y, z) max((typeof(x))max(x, y), z)
++#define tpg_min(a,b)	((a) < (b) ? (a) : (b))
++#define tpg_max(a,b)	((a) > (b) ? (a) : (b))
++#define min3(x, y, z) tpg_min((typeof(x))tpg_min(x, y), z)
++#define max3(x, y, z) tpg_max((typeof(x))tpg_max(x, y), z)
+ #define array_size(a, b) ((a) * (b))
+ #define array3_size(a, b, c) ((a) * (b) * (c))

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-07 17:27:42 UTC (rev 417302)
+++ PKGBUILD	2021-06-07 17:40:31 UTC (rev 417303)
@@ -1,7 +1,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=v4l-utils
 pkgver=1.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('x86_64')
 url="https://linuxtv.org/"
@@ -13,11 +13,18 @@
 makedepends=('qt5-base' 'alsa-lib')
 optdepends=('qt5-base: for qv4l2' 'alsa-lib: for qv4l2')
 depends=('hicolor-icon-theme' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
-source=(https://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2{,.asc})
+source=(https://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2{,.asc}
+        0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch)
 sha256sums=('956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7'
-            'SKIP')
+            'SKIP'
+            'b824c14b63208259069dfa52102993602a727a14ca4016eeea4ea726409e5d20')
 validpgpkeys=('05D0169C26E41593418129DF199A64FADFB500FF') # Gregor Jasny <gjasny at googlemail.com>
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"