[gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/files/

[Aaron Bauman]

commit:     186e6656e5ad053e69625719bea832735eba2433
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Dec 29 08:59:48 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 18:33:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=186e6656

media-libs/libv4l: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14163
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../libv4l/files/libv4l-1.14.1-sysmacros.patch     | 26 ----------------------
 1 file changed, 26 deletions(-)

diff --git a/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
deleted file mode 100644
index b8190507fc7..00000000000
--- a/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
-===================================================================
---- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c
-+++ v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -20,9 +20,7 @@
-  */
- 
- #include <sys/types.h>
--#if defined(MAJOR_IN_SYSMACROS)
- #include <sys/sysmacros.h>
--#endif
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
-===================================================================
---- v4l-utils-1.14.1.orig/utils/v4l2-ctl/v4l2-ctl.cpp
-+++ v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
-@@ -21,6 +21,7 @@
-  */
- 
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>

[gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/files/

[David Seifert]

commit:     7d29f89250c815ce65f73d6fa2e14662f621a221
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 12:12:17 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 12:12:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d29f892

media-libs/libv4l: Use merged patch from upstream

Closes: https://bugs.gentoo.org/706756
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/libv4l-1.16.6-gcc10-fno-common.patch     | 28 ++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
index ea43fb82e3f..33855c682b6 100644
--- a/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
+++ b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
@@ -1,6 +1,25 @@
+From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Wed, 26 Feb 2020 11:07:29 +0100
+Subject: Fix GCC 10 / -fno-common
+
+* GCC 10 switches its default symbol emission mode
+  to cause linker errors when an object is defined
+  more than once.
+
+Bug: https://bugs.gentoo.org/706756
+Signed-off-by: David Seifert <soap@gentoo.org>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+---
+ lib/include/libdvbv5/desc_t2_delivery.h |  2 +-
+ lib/libdvbv5/dvb-v5.h                   | 26 +++++++++++++-------------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h
+index 93594b76..8c11fa9a 100644
 --- a/lib/include/libdvbv5/desc_t2_delivery.h
 +++ b/lib/include/libdvbv5/desc_t2_delivery.h
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[];
   * @brief converts from internal representation to string the SISO_MISO
   *	  field of dvb_desc_t2_delivery:SISO_MISO field.
   */
@@ -9,9 +28,11 @@
  
  #ifdef __cplusplus
  }
+diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h
+index 45aaddda..3540bac1 100644
 --- a/lib/libdvbv5/dvb-v5.h
 +++ b/lib/libdvbv5/dvb-v5.h
-@@ -14,17 +14,17 @@
+@@ -14,17 +14,17 @@ struct fe_status_name {
  	char *name;
  };
  extern struct fe_status_name fe_status_name[8];
@@ -42,3 +63,6 @@
 +extern const char *dvb_v5_name[72];
 +extern const char *delivery_system_name[20];
  #endif
+-- 
+cgit v1.2.1
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/files/

[David Seifert]

commit:     36f18a356050d7538634be999778138fc12a565e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr  4 07:48:48 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 07:48:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f18a35

media-libs/libv4l: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/24894
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../libv4l/files/libv4l-1.20.0-automagic.patch     | 52 ----------------------
 1 file changed, 52 deletions(-)

diff --git a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch b/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
deleted file mode 100644
index 017513bcb907..000000000000
--- a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e018720a49b96535613ca9173750ce2271608cd5 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 23 Aug 2020 16:33:21 +0100
-Subject: [PATCH] configure.ac: Add --without-libudev option to avoid automagic
- dep
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- configure.ac | 27 +++++++++++++++++----------
- 1 file changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d9f43ab5..e6134d08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,16 +291,23 @@ else
-    AC_MSG_WARN(ALSA library not available)
- fi
- 
--PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no)
--if test "x$have_libudev" = "xyes"; then
--	AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
--	LIBUDEV_CFLAGS="$libudev_CFLAGS"
--	LIBUDEV_LIBS="$libudev_LIBS"
--	AC_SUBST(LIBUDEV_CFLAGS)
--	AC_SUBST(LIBUDEV_LIBS)
--else
--   AC_MSG_WARN(udev library not available)
--fi
-+AC_ARG_WITH([libudev],
-+            AS_HELP_STRING([--without-libudev], [Do not use udev library]),
-+            [],
-+            [with_libudev=yes])
-+
-+have_libudev=no
-+
-+AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno],
-+      [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, [])
-+       AS_IF([test "x$have_libudev" = xyes],
-+             [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
-+              LIBUDEV_CFLAGS="$libudev_CFLAGS"
-+              LIBUDEV_LIBS="$libudev_LIBS"
-+              AC_SUBST(LIBUDEV_CFLAGS)
-+              AC_SUBST(LIBUDEV_LIBS)],
-+             AC_MSG_WARN(udev library not available)
-+            )])
- 
- AC_SUBST([JPEG_LIBS])
- 
--- 
-2.26.2
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/files/

[James Le Cuirot]

commit:     e2293e58381d1e797cfd79ab951c9c91a8a5f399
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 22:08:50 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 22:08:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2293e58

media-libs/libv4l: Patch to fix musl build for missing argp dependency

Closes: https://bugs.gentoo.org/920277
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-libs/libv4l/files/libv4l-1.26.0-meson.patch | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/media-libs/libv4l/files/libv4l-1.26.0-meson.patch b/media-libs/libv4l/files/libv4l-1.26.0-meson.patch
index 0c993dd0da96..9f8384033865 100644
--- a/media-libs/libv4l/files/libv4l-1.26.0-meson.patch
+++ b/media-libs/libv4l/files/libv4l-1.26.0-meson.patch
@@ -84,3 +84,28 @@ index 2fa046c0..53cf832f 100644
 -- 
 2.42.1
 
+From 8927b2e98efa070999fdf2c3c61825e672044ffd Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 1 Jan 2024 22:05:34 +0000
+Subject: [PATCH] meson: Fix missing v4l2gl dependency on argp
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ contrib/test/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/contrib/test/meson.build b/contrib/test/meson.build
+index 29b51df6..48ee67b1 100644
+--- a/contrib/test/meson.build
++++ b/contrib/test/meson.build
+@@ -107,6 +107,7 @@ if dep_gl.found() and dep_glu.found() and dep_x11.found()
+     )
+ 
+     v4l2gl_deps = [
++        dep_argp,
+         dep_gl,
+         dep_glu,
+         dep_libv4l2,
+-- 
+2.43.0
+