summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2021-01-05 21:40:23 +0000
committerJames Le Cuirot <chewi@gentoo.org>2021-01-05 21:40:23 +0000
commit57cad7e7c7d49d4a1e08b90bad872b549b609b24 (patch)
tree0adf07681ede2e941fc4633937f459c7286c2779 /media-tv
parentdev-python/sphinx: Remove old (diff)
downloadgentoo-57cad7e7c7d49d4a1e08b90bad872b549b609b24.tar.gz
gentoo-57cad7e7c7d49d4a1e08b90bad872b549b609b24.tar.bz2
gentoo-57cad7e7c7d49d4a1e08b90bad872b549b609b24.zip
media-tv/v4l-utils: Drop old
Package-Manager: Portage-3.0.12, Repoman-3.0.1 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/v4l-utils/Manifest2
-rw-r--r--media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch68
-rw-r--r--media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch59
-rw-r--r--media-tv/v4l-utils/v4l-utils-1.10.1.ebuild65
-rw-r--r--media-tv/v4l-utils/v4l-utils-1.16.6.ebuild71
5 files changed, 0 insertions, 265 deletions
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 714457634f44..8ad11332de46 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 33855c682b63..000000000000
--- 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 <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 @@ 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 fe5636ae5ecb..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/580910
-
-From 8edd80d3654843d9441fb5e43dfbf2b3e81f84b5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 14 Mar 2016 16:56:40 -0400
-Subject: [PATCH] include sys/sysmacros.h for major() & minor()
-
-Linux C libraries are looking to disentangle sysmacros.h from the
-sys/types.h header to clean up namespace pollution. Since these
-macros are provided in glibc/etc... today, switch to pulling in
-this header directly.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- contrib/test/mc_nextgen_test.c | 1 +
- lib/libv4lconvert/control/libv4lcontrol.c | 1 +
- utils/libmedia_dev/get_media_devices.c | 1 +
- utils/media-ctl/libmediactl.c | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
-index 3c8335c..59f28b1 100644
---- a/lib/libv4lconvert/control/libv4lcontrol.c
-+++ b/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -20,6 +20,7 @@
- */
-
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-diff --git a/utils/libmedia_dev/get_media_devices.c b/utils/libmedia_dev/get_media_devices.c
-index e3a2200..edfeb41 100644
---- a/utils/libmedia_dev/get_media_devices.c
-+++ b/utils/libmedia_dev/get_media_devices.c
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <string.h>
- #include <stdlib.h>
-diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c
-index 4a82d24..16dddbe 100644
---- a/utils/media-ctl/libmediactl.c
-+++ b/utils/media-ctl/libmediactl.c
-@@ -24,6 +24,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
-
- #include <ctype.h>
- #include <errno.h>
---
-2.6.2
-
diff --git a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
deleted file mode 100644
index 911dc9e62692..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic udev
-
-DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~sparc x86"
-IUSE="qt5 udev"
-
-RDEPEND=">=media-libs/libv4l-${PV}[dvb(+)]
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- virtual/opengl
- media-libs/alsa-lib
- )
- udev? ( virtual/libudev )
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-1.6.2-sysmacros.patch #580910
- eapply_user
-}
-
-src_configure() {
- if use qt5; then
- append-cxxflags -std=c++11
- local qt5_paths=( \
- MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
- UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
- RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
- )
- fi
- # Hard disable the flags that apply only to the libs.
- econf \
- --disable-static \
- $(use_enable qt5 qv4l2) \
- $(use_with udev libudev) \
- --with-udevdir="$(get_udevdir)" \
- --without-jpeg \
- "${qt5_paths[@]}"
-}
-
-src_install() {
- emake -C utils DESTDIR="${D}" install
- emake -C contrib DESTDIR="${D}" install
-
- dodoc README
- newdoc utils/libv4l2util/TODO TODO.libv4l2util
- newdoc utils/libmedia_dev/README README.libmedia_dev
- newdoc utils/dvb/README README.dvb
- newdoc utils/xc3028-firmware/README README.xc3028-firmware
- newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
-}
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
deleted file mode 100644
index 9ce273040219..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic udev xdg-utils
-
-DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
-IUSE="+bpf opengl qt5"
-
-RDEPEND=">=media-libs/libv4l-${PV}[dvb(+),jpeg]
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl )
- media-libs/alsa-lib
- )
- virtual/libudev
- >=virtual/jpeg-0-r2:0=
- bpf? ( virtual/libelf:= )
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}"
-BDEPEND="
- bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
- 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
- local qt5_paths=( \
- MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
- UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
- RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
- )
- if use !opengl; then
- sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
- fi
- fi
- # Hard disable the flags that apply only to the libs.
- econf \
- --disable-static \
- $(use_enable qt5 qv4l2) \
- $(use_enable qt5 qvidcap) \
- $(use_enable bpf) \
- --with-udevdir="$(get_udevdir)" \
- --with-jpeg \
- "${qt5_paths[@]}"
-}
-
-src_install() {
- emake -C utils DESTDIR="${D}" install
- emake -C contrib DESTDIR="${D}" install
-
- dodoc README
- newdoc utils/libv4l2util/TODO TODO.libv4l2util
- newdoc utils/libmedia_dev/README README.libmedia_dev
- newdoc utils/dvb/README README.dvb
- newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
-}
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }