subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-tv\/v4l\-utils\/, media\-tv\/v4l\-utils\/files\/"

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

2023-06-14 Thread Sam James

commit: be414dd85e64601394f8a0a2a4b3f4ecf73c9180
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 02:17:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 02:17:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be414dd8

media-tv/v4l-utils: fix musl build

Closes: https://bugs.gentoo.org/908380
Signed-off-by: Sam James  gentoo.org>

 .../files/v4l-utils-1.24.1-musl-include.patch  | 11 +
 .../files/v4l-utils-1.24.1-musl-lfs.patch  | 51 ++
 media-tv/v4l-utils/v4l-utils-1.24.1.ebuild |  5 +++
 3 files changed, 67 insertions(+)

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch 
b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch
new file mode 100644
index ..8738f272aaed
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/908380
+--- a/utils/common/media-info.h
 b/utils/common/media-info.h
+@@ -5,6 +5,7 @@
+ 
+ #ifndef _MEDIA_INFO_H
+ #define _MEDIA_INFO_H
++#include 
+ 
+ enum media_type {
+   MEDIA_TYPE_CANT_STAT,

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch 
b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch
new file mode 100644
index ..196b7430ca5c
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch
@@ -0,0 +1,51 @@
+https://git.linuxtv.org/v4l-utils.git/commit/?id=5d7d99cd11acaaa3bdcb290f92012005dca58b1e
+
+From 5d7d99cd11acaaa3bdcb290f92012005dca58b1e Mon Sep 17 00:00:00 2001
+From: Peter Seiderer 
+Date: Fri, 31 Mar 2023 23:35:02 +0200
+Subject: v4l2-tracer: wrap open64/mmap64 functions only if linux && __GLIBC__
+
+Wrap open64/mmap64 functions only if linux && __GLIBC__, as done
+in lib/libv4l1/v4l1comapt.c and lib/libv4l2/v4l2convert.c since
+commit 'libv4l: Wrap LFS64 functions only if linux && __GLIBC__'
+(403a4e2697a1ff96fe2fa16589039595f21cadf0), should fix musl libc
+compile.
+
+Signed-off-by: Peter Seiderer 
+Signed-off-by: Hans Verkuil 
+--- a/utils/v4l2-tracer/libv4l2tracer.cpp
 b/utils/v4l2-tracer/libv4l2tracer.cpp
+@@ -83,6 +83,7 @@ int open(const char *path, int oflag, ...)
+   return fd;
+ }
+ 
++#if defined(linux) && defined(__GLIBC__)
+ int open64(const char *path, int oflag, ...)
+ {
+   errno = 0;
+@@ -110,6 +111,7 @@ int open64(const char *path, int oflag, ...)
+ 
+   return fd;
+ }
++#endif
+ 
+ int close(int fd)
+ {
+@@ -156,6 +158,7 @@ void *mmap(void *addr, size_t len, int prot, int flags, 
int fildes, off_t off)
+   return buf_address_pointer;
+ }
+ 
++#if defined(linux) && defined(__GLIBC__)
+ void *mmap64(void *addr, size_t len, int prot, int flags, int fildes, off_t 
off)
+ {
+   errno = 0;
+@@ -170,6 +173,7 @@ void *mmap64(void *addr, size_t len, int prot, int flags, 
int fildes, off_t off)
+ 
+   return buf_address_pointer;
+ }
++#endif
+ 
+ int munmap(void *start, size_t length)
+ {
+-- 
+cgit v1.2.1

diff --git a/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild 
b/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild
index b04a84c6a468..3d4eaac93b9a 100644
--- a/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild
@@ -45,6 +45,11 @@ BDEPEND="
 # Not really prebuilt but BPF objects make our QA checks go crazy.
 QA_PREBUILT="*/rc_keymaps/protocols/*.o"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.24.1-musl-include.patch
+   "${FILESDIR}"/${P}-musl-lfs.patch
+)
+
 check_llvm() {
if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

2021-01-05 Thread James Le Cuirot

commit: 57cad7e7c7d49d4a1e08b90bad872b549b609b24
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan  5 21:40:23 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan  5 21:40:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57cad7e7

media-tv/v4l-utils: Drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/v4l-utils/Manifest|  2 -
 .../files/v4l-utils-1.16.6-gcc10-fno-common.patch  | 68 -
 .../files/v4l-utils-1.6.2-sysmacros.patch  | 59 --
 media-tv/v4l-utils/v4l-utils-1.10.1.ebuild | 65 
 media-tv/v4l-utils/v4l-utils-1.16.6.ebuild | 71 --
 5 files changed, 265 deletions(-)

diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 714457634f4..8ad11332de4 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,3 +1 @@
-DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 
7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a
 SHA512 
524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
-DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B 
f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab
 SHA512 
f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 
218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a
 SHA512 
179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch 
b/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
deleted file mode 100644
index 33855c682b6..000
--- a/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
-From: David Seifert 
-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 
-Signed-off-by: Hans Verkuil 

- 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 @@ 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.
-  */
--const char *siso_miso[4];
-+extern const char *siso_miso[4];
- 
- #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 @@ struct fe_status_name {
-   char *name;
- };
- extern struct fe_status_name fe_status_name[8];
--const char *fe_code_rate_name[14];
--const char *fe_modulation_name[15];
--const char *fe_transmission_mode_name[10];
--const unsigned fe_bandwidth_name[8];
--const char *fe_guard_interval_name[12];
--const char *fe_hierarchy_name[6];
--const char *fe_voltage_name[4];
--const char *fe_tone_name[3];
--const char *fe_inversion_name[4];
--const char *fe_pilot_name[4];
--const char *fe_rolloff_name[5];
--const char *dvb_v5_name[72];
--const char *delivery_system_name[20];
-+extern const char *fe_code_rate_name[14];
-+extern const char *fe_modulation_name[15];
-+extern const char *fe_transmission_mode_name[10];
-+extern const unsigned fe_bandwidth_name[8];
-+extern const char *fe_guard_interval_name[12];
-+extern const char *fe_hierarchy_name[6];
-+extern const char *fe_voltage_name[4];
-+extern const char *fe_tone_name[3];
-+extern const char *fe_inversion_name[4];
-+extern const char *fe_pilot_name[4];
-+extern const char *fe_rolloff_name[5];
-+extern const char *dvb_v5_name[72];
-+extern const char *delivery_system_name[20];
- #endif
--- 
-cgit v1.2.1
-

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch 
b/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
deleted file mode 100644
index fe5636ae5ec..000
--- a/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
+++ /dev/null
@@ -1,59 +0,0 @@

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

2020-08-23 Thread James Le Cuirot

commit: 205e228434c0f9ff2e6156942a1ee8f8f56129fa
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Aug 23 16:37:15 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Aug 23 16:42:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205e2284

media-tv/v4l-utils: Bump to 1.20.0, fix some automagics

The automagic libudev dependency has now been dealt with via a patch
and udev USE flag. Among other things, this library is needed for the
DVB utilities so a dvb USE flag has also been added with a
corresponding dependency on libv4l[dvb]. There may be more automagics
but I haven't checked yet.

Bug: https://bugs.gentoo.org/691066
Bug: https://bugs.gentoo.org/721374
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/v4l-utils/Manifest|  1 +
 .../files/v4l-utils-1.20.0-automagic.patch | 52 +
 media-tv/v4l-utils/v4l-utils-1.20.0.ebuild | 89 ++
 3 files changed, 142 insertions(+)

diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 67728dacc7f..0143df89ef7 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -2,3 +2,4 @@ DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 
7ececae8ad5ebd999070b0c3626fdf5b0a
 DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 
71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2
 SHA512 
404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
 DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B 
f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab
 SHA512 
f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
 DIST v4l-utils-1.18.0.tar.bz2 1995506 BLAKE2B 
35cd138c88960e5b02431c408a43905a73ea6a7650a939abc2250e1f219bda1437262a7083d90d8b4d39c5bd2cce5f6fc590b8dc09a8738fb5baf55266256b94
 SHA512 
749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49
+DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 
218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a
 SHA512 
179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.20.0-automagic.patch 
b/media-tv/v4l-utils/files/v4l-utils-1.20.0-automagic.patch
new file mode 100644
index 000..017513bcb90
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.20.0-automagic.patch
@@ -0,0 +1,52 @@
+From e018720a49b96535613ca9173750ce2271608cd5 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+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 
+---
+ 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
+

diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild 
b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
new file mode 100644
index 000..01f52bb0555
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic udev xdg
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

2020-03-20 Thread Andrey Utkin

commit: 7c327d152ca416ef1b6583cba873fbf0c1cab7a6
Author: Andrey Utkin  gentoo  org>
AuthorDate: Fri Mar 20 22:58:24 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Fri Mar 20 23:06:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c327d15

media-tv/v4l-utils: patch for -fno-common bug

Reused the patch already used for media-libs/libv4l.

Applied to ebuilds 1.16.6 (last stable) and 1.18.0 (not stabilized).
No revision bump as this is a trivial build failure treatment.

Bug: https://bugs.gentoo.org/706834
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 .../files/v4l-utils-1.16.6-gcc10-fno-common.patch  | 68 ++
 media-tv/v4l-utils/v4l-utils-1.16.6.ebuild |  4 +-
 media-tv/v4l-utils/v4l-utils-1.18.0.ebuild |  2 +
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch 
b/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
new file mode 100644
index 000..33855c682b6
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
@@ -0,0 +1,68 @@
+From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
+From: David Seifert 
+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 
+Signed-off-by: Hans Verkuil 
+---
+ 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 @@ 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.
+  */
+-const char *siso_miso[4];
++extern const char *siso_miso[4];
+ 
+ #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 @@ struct fe_status_name {
+   char *name;
+ };
+ extern struct fe_status_name fe_status_name[8];
+-const char *fe_code_rate_name[14];
+-const char *fe_modulation_name[15];
+-const char *fe_transmission_mode_name[10];
+-const unsigned fe_bandwidth_name[8];
+-const char *fe_guard_interval_name[12];
+-const char *fe_hierarchy_name[6];
+-const char *fe_voltage_name[4];
+-const char *fe_tone_name[3];
+-const char *fe_inversion_name[4];
+-const char *fe_pilot_name[4];
+-const char *fe_rolloff_name[5];
+-const char *dvb_v5_name[72];
+-const char *delivery_system_name[20];
++extern const char *fe_code_rate_name[14];
++extern const char *fe_modulation_name[15];
++extern const char *fe_transmission_mode_name[10];
++extern const unsigned fe_bandwidth_name[8];
++extern const char *fe_guard_interval_name[12];
++extern const char *fe_hierarchy_name[6];
++extern const char *fe_voltage_name[4];
++extern const char *fe_tone_name[3];
++extern const char *fe_inversion_name[4];
++extern const char *fe_pilot_name[4];
++extern const char *fe_rolloff_name[5];
++extern const char *dvb_v5_name[72];
++extern const char *delivery_system_name[20];
+ #endif
+-- 
+cgit v1.2.1
+

diff --git a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild 
b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
index 72e4deafa29..5b1881372f2 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,8 @@ BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
 src_configure() {
if use qt5; then
append-cxxflags -std=c++11

diff --git a/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild 
b/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild
index ec17de13f97..777a22b6a55 100644
--- a/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild
@@ -31,6 +31,8 @@ BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
 src_configure() {
if use qt5; then
append-cxxflags -std=c++11

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

2018-01-13 Thread Alexis Ballier

commit: 92a290bd2384b4c786b0722e2f853b82dd0b15be
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 13 11:48:37 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 13 12:16:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a290bd

media-tv/v4l-utils: bump to 1.14.1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-tv/v4l-utils/Manifest|  1 +
 .../files/v4l-utils-1.14.1-sysmacros.patch | 26 ++
 media-tv/v4l-utils/v4l-utils-1.14.1.ebuild | 60 ++
 3 files changed, 87 insertions(+)

diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 02fdfdc06be..47c99bd29bd 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,4 +1,5 @@
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 
7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a
 SHA512 
524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.12.3.tar.bz2 1588049 BLAKE2B 
1f76e6cd76781119beb01a1d570599cd2710a4c00ea18c380e576cb8281bab07e09cb6c1469201d0fba53b8bb5f4c4fa812dcda06203d83566216272e9abe3b0
 SHA512 
6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a
 DIST v4l-utils-1.12.5.tar.bz2 1588944 BLAKE2B 
b87c24c6fdaf3e80407dd28b047c27420ff70007e12200e69395021def3abb74eec3565337a6484cf44b5a5cc7678d9bc718876424fa58d6d16d0e0c37ab59cf
 SHA512 
ed2e7545a728360b9684db68330885b498a3a5611f49b80e54da72109d9ba2aa75e85f89f085ff0a6f077b17c880101fa5b78c9dff8a0df2eac1866bd80a04ea
+DIST v4l-utils-1.14.1.tar.bz2 1672480 BLAKE2B 
bc5c50fa0b339c79439b54e54f0c0e3847068931e34831a05e214e785fe4063764ef0d76838ca3216a46db072003dc5d86dd2c563fbb73d237a6b5059df93f5a
 SHA512 
78b863f2cba409138efd6744895e6b1e730ec7cd5dfd0bd6088dd1336572a5f6d0b422fb4ec6577c6038192d0a3b28ae91d7402d5733904913749eff263c2eb1
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 
8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a
 SHA512 
e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch 
b/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch
new file mode 100644
index 000..b8190507fc7
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch
@@ -0,0 +1,26 @@
+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 
+-#if defined(MAJOR_IN_SYSMACROS)
+ #include 
+-#endif
+ #include 
+ #include 
+ #include 
+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 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/media-tv/v4l-utils/v4l-utils-1.14.1.ebuild 
b/media-tv/v4l-utils/v4l-utils-1.14.1.ebuild
new file mode 100644
index 000..eebf081d09a
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.14.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic udev xdg-utils
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="http://git.linuxtv.org/v4l-utils.git;
+SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2;
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="qt5"
+
+RDEPEND=">=media-libs/libv4l-${PV}
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtopengl:5
+   virtual/opengl
+   media-libs/alsa-lib
+   )
+   virtual/libudev
+   !media-tv/v4l2-ctl
+   !

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, media-tv/v4l-utils/files/

5 matches

Site Navigation

Mail list logo

Footer information