* [gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2016-03-15 2:33 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2016-03-15 2:33 UTC (permalink / raw
To: gentoo-commits
commit: fa4684ca43726c66e8107ed45fa62ff070e8abd5
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 21:10:18 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 02:31:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4684ca
media-libs/libv4l: fix build w/newer glibc
.../libv4l/files/libv4l-1.6.2-sysmacros.patch | 57 ++++++++++++++++++++++
media-libs/libv4l/libv4l-1.6.2.ebuild | 4 ++
2 files changed, 61 insertions(+)
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
new file mode 100644
index 0000000..db49740
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
@@ -0,0 +1,57 @@
+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-libs/libv4l/libv4l-1.6.2.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild
index fa076f2..5ac8693 100644
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ b/media-libs/libv4l/libv4l-1.6.2.ebuild
@@ -36,6 +36,10 @@ pkg_setup() {
linux-info_pkg_setup
}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-sysmacros.patch
+}
+
multilib_src_configure() {
# Hard disable the flags that apply only to the utils.
ECONF_SOURCE=${S} \
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2016-03-15 2:33 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2016-03-15 2:33 UTC (permalink / raw
To: gentoo-commits
commit: 8104b460c369665fb3e6b0cb417245386d46b290
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 21:14:39 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 02:31:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8104b460
media-libs/libv4l: drop old <1.6.2 versions
media-libs/libv4l/Manifest | 5 --
.../libv4l/files/libv4l-0.8.8-drop-Wp-flags.patch | 22 --------
media-libs/libv4l/libv4l-0.8.9.ebuild | 44 ---------------
media-libs/libv4l/libv4l-0.9.5-r1.ebuild | 60 ---------------------
media-libs/libv4l/libv4l-0.9.5.ebuild | 53 ------------------
media-libs/libv4l/libv4l-1.0.0.ebuild | 60 ---------------------
media-libs/libv4l/libv4l-1.2.1.ebuild | 60 ---------------------
media-libs/libv4l/libv4l-1.6.0-r1.ebuild | 61 ---------------------
media-libs/libv4l/libv4l-1.6.0.ebuild | 62 ----------------------
9 files changed, 427 deletions(-)
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 34e8f96..c21dab4 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,6 +1 @@
-DIST v4l-utils-0.8.9.tar.bz2 460681 SHA256 3e5511c252b3c320d0b03418f7ee19b42d00ed0871c6b525779007416e46d08e SHA512 3778dbd4d0bb44c6f4762a8551625c1f5bfcf7a10de33c71c2442483d496bc177aef979b747b327f4eca3229fc22eec484de7308588acf9fc48ae6d1d5edee40 WHIRLPOOL 346d2c23c5e8b8ac3128100cf660b1f4880ec5fffd3fa107accf7f536adeacc945cb9aadd61f2f99a6fd32bd7a44912680d2cf867f0a84f28c949707634c676f
-DIST v4l-utils-0.9.5.tar.bz2 975311 SHA256 6c9f1be981d5763069e0969ebe426c39da5a7d738865367e390e3b486f1b502c SHA512 219a789907279ce4532d53989f1efe5cac7bbf0971a215c4e6e42228510c88f52ed2d7a4ce80d2f6673af9c0e5acd99160b6b3e6475f7a7a80534ce867a52a63 WHIRLPOOL 716e7a8ff82b899ea18772a36d5520c5242effbff819bf30e73c7b29d087f0ed055a013fb20c469660317acf1f2df826255ce564ed318468cb0f72af39ebf47a
-DIST v4l-utils-1.0.0.tar.bz2 963427 SHA256 1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30 SHA512 19e31167015623f50f93dc27becb8f053ca7488ffc41e275c195cb46af63671a0cec6cecea71d90a43b3b01b47f6e6cc2f44517dddd3c2c376bb1d82f770117e WHIRLPOOL 133d85232457545a828e783ca503d368a5da814ab51d70648ef9a727947a21a07bf82e8ebdcbc48b4fc9a139bdff22c73f0dd1ad666cf8f8a051f7df93e4f2fe
-DIST v4l-utils-1.2.1.tar.bz2 1042071 SHA256 9b658fbcaaf8127115316e07fea314aebc21dd6dc3491cd8753a768521c4b9af SHA512 d70f2ea53b7e687aaafb3d59ba5d4d045ecbac731926f37cdd40f1d9d41ac14250055d1caa55dd2602bf86b2b80210ab63cc44208cc94570ebbcb48a70e067a5 WHIRLPOOL 99ca9702062e173ab2180cc99334881735ace042a621adc7acb7b6093b5a66bf79c51a073b550eea2e5c02f36e414a48b6138f0b2185bfe8de1b4667dceeaf5b
-DIST v4l-utils-1.6.0.tar.bz2 1146003 SHA256 6054d3120c67a1524993e699b3b02036c817bb000b742c332682163966dc7605 SHA512 328d771a58fd8aa5378a7bd96c4e1d9fa805f0fa2331f9446f3311951f0a9df1441d344abe485cf144e92b0fdf4f9505eb812c7b99410941f2fc543f8cb2ee20 WHIRLPOOL 26ee7e63c6624f4da59e0ac5b4f8e78cce918528595caae63111a4909efbf7be955d6be3d5752cb5628353fce5dbc4e49ac8a7d94f5de0cf49e545035608e500
DIST v4l-utils-1.6.2.tar.bz2 1148309 SHA256 d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 WHIRLPOOL bd1b825354ca52e62e8c5f83d43bfd2cec63611c65d6b2709a7274fd15ae0fa21345d2b95a073c0b3a33b7c94b304562f1efcf112e1357a58515bd0d6f37f396
diff --git a/media-libs/libv4l/files/libv4l-0.8.8-drop-Wp-flags.patch b/media-libs/libv4l/files/libv4l-0.8.8-drop-Wp-flags.patch
deleted file mode 100644
index 9146f04..0000000
--- a/media-libs/libv4l/files/libv4l-0.8.8-drop-Wp-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-don't bother generating dependency information:
- - we don't use/care because we aren't doing rebuilds
- - it uses the -Wp flag which is gcc specific for no good reason
-
-upstream has rewritten things to use autotools, so this will go away
-once they release another version
-
---- a/Make.rules
-+++ b/Make.rules
-@@ -23,10 +23,10 @@ LIB_RELEASE = 0
- # And last various rules
-
- %.o: %.c
-- $(CC) -Wp,-MMD,"$*.d",-MQ,"$@",-MP -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-
- %.o: %.cpp
-- $(CXX) -Wp,-MMD,"$*.d",-MQ,"$@",-MP -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
-+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
-
- %.so:
- $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS_$*)
diff --git a/media-libs/libv4l/libv4l-0.8.9.ebuild b/media-libs/libv4l/libv4l-0.8.9.ebuild
deleted file mode 100644
index 56c390a..0000000
--- a/media-libs/libv4l/libv4l-0.8.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils linux-info multilib toolchain-funcs
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/jpeg"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30-r1"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~SHMEM"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.8.8-drop-Wp-flags.patch
- sed -i \
- -e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
- -e "/^LIBDIR =/s:/lib:/$(get_libdir):" \
- -e "/^CFLAGS :=/d" \
- Make.rules || die
- tc-export CC
-}
-
-src_compile() {
- emake -C lib
-}
-
-src_install() {
- emake -C lib DESTDIR="${D}" install
- dodoc ChangeLog README.lib* TODO
-}
diff --git a/media-libs/libv4l/libv4l-0.9.5-r1.ebuild b/media-libs/libv4l/libv4l-0.9.5-r1.ebuild
deleted file mode 100644
index baa8ddb..0000000
--- a/media-libs/libv4l/libv4l-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info udev multilib-minimal
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND=">=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
- virtual/glu
- virtual/opengl
- x11-libs/libX11:=
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/os-headers
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-qv4l2 \
- --disable-v4l-utils \
- --with-udevdir="$(get_udevdir)"
-}
-
-multilib_src_compile() {
- emake -C lib
-}
-
-multilib_src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
- prune_libtool_files --all
-}
diff --git a/media-libs/libv4l/libv4l-0.9.5.ebuild b/media-libs/libv4l/libv4l-0.9.5.ebuild
deleted file mode 100644
index 1421593..0000000
--- a/media-libs/libv4l/libv4l-0.9.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info udev
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/jpeg:0=
- virtual/glu
- virtual/opengl
- x11-libs/libX11:=
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/os-headers
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-src_configure() {
- econf \
- --disable-static \
- --disable-qv4l2 \
- --disable-v4l-utils \
- --with-udevdir="$(get_udevdir)"
-}
-
-src_compile() {
- emake -C lib
-}
-
-src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
- dodoc ChangeLog README.lib* TODO
- prune_libtool_files --all
-}
diff --git a/media-libs/libv4l/libv4l-1.0.0.ebuild b/media-libs/libv4l/libv4l-1.0.0.ebuild
deleted file mode 100644
index e10ebbe..0000000
--- a/media-libs/libv4l/libv4l-1.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info udev multilib-minimal
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND=">=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
- virtual/glu
- virtual/opengl
- x11-libs/libX11:=
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/os-headers
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-qv4l2 \
- --disable-v4l-utils \
- --with-udevdir="$(get_udevdir)"
-}
-
-multilib_src_compile() {
- emake -C lib
-}
-
-multilib_src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
- prune_libtool_files --all
-}
diff --git a/media-libs/libv4l/libv4l-1.2.1.ebuild b/media-libs/libv4l/libv4l-1.2.1.ebuild
deleted file mode 100644
index baa8ddb..0000000
--- a/media-libs/libv4l/libv4l-1.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info udev multilib-minimal
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND=">=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
- virtual/glu
- virtual/opengl
- x11-libs/libX11:=
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/os-headers
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-qv4l2 \
- --disable-v4l-utils \
- --with-udevdir="$(get_udevdir)"
-}
-
-multilib_src_compile() {
- emake -C lib
-}
-
-multilib_src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
- prune_libtool_files --all
-}
diff --git a/media-libs/libv4l/libv4l-1.6.0-r1.ebuild b/media-libs/libv4l/libv4l-1.6.0-r1.ebuild
deleted file mode 100644
index 79ab2f0..0000000
--- a/media-libs/libv4l/libv4l-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info multilib-minimal
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
- )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/os-headers
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-multilib_src_configure() {
- # Hard disable the flags that apply only to the utils.
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-qv4l2 \
- --disable-v4l-utils \
- --without-libudev \
- $(use_with jpeg)
-}
-
-multilib_src_compile() {
- emake -C lib
-}
-
-multilib_src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
- prune_libtool_files --all
-}
diff --git a/media-libs/libv4l/libv4l-1.6.0.ebuild b/media-libs/libv4l/libv4l-1.6.0.ebuild
deleted file mode 100644
index e538920..0000000
--- a/media-libs/libv4l/libv4l-1.6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info udev multilib-minimal
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND=">=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
- virtual/glu
- virtual/opengl
- x11-libs/libX11:=
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
- )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/os-headers
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-qv4l2 \
- --disable-v4l-utils \
- --with-udevdir="$(get_udevdir)"
-}
-
-multilib_src_compile() {
- emake -C lib
-}
-
-multilib_src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
- prune_libtool_files --all
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2018-01-13 12:16 Alexis Ballier
0 siblings, 0 replies; 7+ messages in thread
From: Alexis Ballier @ 2018-01-13 12:16 UTC (permalink / raw
To: gentoo-commits
commit: 01d5ea3feda75913684f89f973863c873895a28c
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 11:50:36 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 12:16:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d5ea3f
media-libs/libv4l: fixup sysmacros includes with recent glibc
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../libv4l/files/libv4l-1.14.1-sysmacros.patch | 26 ++++++++++++++++++++++
media-libs/libv4l/libv4l-1.14.1.ebuild | 2 ++
2 files changed, 28 insertions(+)
diff --git a/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
new file mode 100644
index 00000000000..b8190507fc7
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-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 <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>
diff --git a/media-libs/libv4l/libv4l-1.14.1.ebuild b/media-libs/libv4l/libv4l-1.14.1.ebuild
index b52b6e56277..4ab5d355259 100644
--- a/media-libs/libv4l/libv4l-1.14.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.14.1.ebuild
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-1.14.1-sysmacros.patch ) #580910
+
pkg_setup() {
CONFIG_CHECK="~SHMEM"
linux-info_pkg_setup
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2020-02-25 23:38 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2020-02-25 23:38 UTC (permalink / raw
To: gentoo-commits
commit: 3eb69318e07bd2df74d4ee009e8eb3d8dc6563f6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 23:37:50 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 23:37:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb69318
media-libs/libv4l: Fix GCC 10 / -fno-common
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 | 44 ++++++++++++++++++++++
media-libs/libv4l/libv4l-1.16.6.ebuild | 4 +-
2 files changed, 47 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..ea43fb82e3f
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/lib/include/libdvbv5/desc_t2_delivery.h
++++ b/lib/include/libdvbv5/desc_t2_delivery.h
+@@ -215,7 +215,7 @@
+ * @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
+ }
+--- a/lib/libdvbv5/dvb-v5.h
++++ b/lib/libdvbv5/dvb-v5.h
+@@ -14,17 +14,17 @@
+ 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
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
index 3fafe417aec..b518b7a9219 100644
--- a/media-libs/libv4l/libv4l-1.16.6.ebuild
+++ b/media-libs/libv4l/libv4l-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"
@@ -29,6 +29,8 @@ BDEPEND="virtual/pkgconfig
S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
pkg_setup() {
CONFIG_CHECK="~SHMEM"
linux-info_pkg_setup
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2020-08-23 16:42 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2020-08-23 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 293838bf393bf79cd833e435f4bc0f75399726ca
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 16:31:22 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 16:42:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293838bf
media-libs/libv4l: Bump to 1.20.0, fix automagics
configure reportedly has some automagic dependencies but only libudev
makes any difference here and it's only used to build libdvbv5. There
is already an option for that.
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 <chewi <AT> gentoo.org>
media-libs/libv4l/Manifest | 1 +
.../libv4l/files/libv4l-1.20.0-automagic.patch | 52 +++++++++++++++
media-libs/libv4l/libv4l-1.20.0.ebuild | 78 ++++++++++++++++++++++
3 files changed, 131 insertions(+)
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index eb5d9c0f890..a7d5ec9eafe 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -3,4 +3,5 @@ DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedb
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.18.1.tar.bz2 1995211 BLAKE2B 853fd7390ea98bcb833ccf43a9408d2ab7212d87512351bf5f4cbb8e626f18e0b8224b953283eb57a93c4d4de5626ce1f9d896d1a9856623f6322ff2be5bb9a7 SHA512 2e9f77abc2fd65bd6a5508831185a941553441384719293f99ece7e6c53c37bb142eb3719532b11f1cef48df691667d2a4235d920338d672738d40659d499056
+DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
diff --git a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch b/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
new file mode 100644
index 00000000000..017513bcb90
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
@@ -0,0 +1,52 @@
+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
+
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
new file mode 100644
index 00000000000..9c2ddcdbbd2
--- /dev/null
+++ b/media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info multilib-minimal
+
+MY_P="v4l-utils-${PV}"
+
+DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dvb jpeg"
+
+RDEPEND="
+ dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
+ !elibc_glibc? ( sys-libs/argp-standalone )
+ jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ !media-tv/v4l2-ctl
+ !<media-tv/ivtv-utils-1.4.0-r2
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-automagic.patch
+)
+
+pkg_setup() {
+ CONFIG_CHECK="~SHMEM"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # Hard disable the flags that apply only to the utils.
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ $(use_enable dvb libdvbv5) \
+ --disable-qv4l2 \
+ --disable-qvidcap \
+ --disable-v4l-utils \
+ $(use_with jpeg) \
+ $(use_with dvb libudev)
+}
+
+multilib_src_compile() {
+ emake -C lib
+}
+
+multilib_src_install() {
+ emake -j1 -C lib DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog README.lib* TODO
+
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2024-02-09 22:23 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-02-09 22:23 UTC (permalink / raw
To: gentoo-commits
commit: f9c320c49081d55184f4852be82b56c9e0275f84
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 22:23:09 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 22:23:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c320c4
media-libs/libv4l: Patch to fix building against libc++
This has been submitted upstream.
Closes: https://bugs.gentoo.org/919795
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch | 58 ++++++++++++++++++++++
media-libs/libv4l/libv4l-1.26.1.ebuild | 1 +
2 files changed, 59 insertions(+)
diff --git a/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch b/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch
new file mode 100644
index 000000000000..5b5eea83bc9a
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch
@@ -0,0 +1,58 @@
+From c7ef1a55bb6accb708a4e09d71028b904b07e49e Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 7 Feb 2024 22:48:59 +0000
+Subject: [PATCH] v4l2-compliance: Fix building against libc++
+
+v4l2-test-time32-64.cpp included compiler.h, which checks
+_LIBCPP_VERSION. This only works against libc++ when a C++ header has
+already been included, which wasn't the case here.
+
+The <version> header is the C++20 method of defining _LIBCPP_VERSION,
+but for older versions, <ciso646> works as an alternative, so include
+that in compiler.h.
+
+compiler.h is for C as well as C++ though, so use __cplusplus to check
+for a C++ compiler before including <ciso646>.
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ include/compiler.h | 27 ++++++++++++---------------
+ 1 file changed, 12 insertions(+), 15 deletions(-)
+
+diff --git a/include/compiler.h b/include/compiler.h
+index 5ad54f41..169247a8 100644
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -1,17 +1,14 @@
+-#ifdef _LIBCPP_VERSION
+-#define fallthrough _LIBCPP_FALLTHROUGH()
++#if !defined(__cplusplus) || __cplusplus < 201103L
++ #define fallthrough ((void)0)
+ #else
+-
+-#if __cplusplus >= 201103L
+-
+-#ifdef __clang__
+-#define fallthrough [[clang::fallthrough]]
+-#else
+-#define fallthrough [[gnu::fallthrough]]
+-#endif // __clang__
+-
+-#else
+-#define fallthrough ((void)0)
+-
++ #include <ciso646>
++ #ifdef _LIBCPP_VERSION
++ #define fallthrough _LIBCPP_FALLTHROUGH()
++ #else
++ #ifdef __clang__
++ #define fallthrough [[clang::fallthrough]]
++ #else
++ #define fallthrough [[gnu::fallthrough]]
++ #endif // __clang__
++ #endif // _LIBCPP_VERSION
+ #endif // __cplusplus
+-#endif // _LIBCPP_VERSION
+--
+2.43.0
+
diff --git a/media-libs/libv4l/libv4l-1.26.1.ebuild b/media-libs/libv4l/libv4l-1.26.1.ebuild
index d29bf0e53ee9..3480dac0970b 100644
--- a/media-libs/libv4l/libv4l-1.26.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.26.1.ebuild
@@ -67,6 +67,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-1.26.0-meson.patch
+ "${FILESDIR}"/${PN}-1.26.1-libcxx.patch
)
check_llvm() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2024-10-04 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 5b5c6024b4c553ae857ca682bd8e68beb9d86dc9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 12:00:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 17:36:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5c6024
media-libs/libv4l: drop 1.22.1, 1.26.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/libv4l/Manifest | 2 -
media-libs/libv4l/files/libv4l-1.26.0-meson.patch | 111 -----------------
media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch | 58 ---------
media-libs/libv4l/libv4l-1.22.1.ebuild | 74 -----------
media-libs/libv4l/libv4l-1.26.1.ebuild | 136 ---------------------
5 files changed, 381 deletions(-)
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index f91463d984b7..56210e62db4a 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,3 +1 @@
-DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
-DIST v4l-utils-1.26.1.tar.xz 1192312 BLAKE2B 84a6b5737447fa332b64af8fdc2ecb308865528bc16487e55a4ccc00a76288239432b299ab2225829530db9158b0449f64e2e1c3fb782c7495da55ea8e7a171a SHA512 a3b12b311977afec410db8b430696e923a24e04f003a5891cc77ddeb667d0b98666a06d31a439c95ce57d9e9c9c2593c5e9dd9e7cf2be002adb95db5b8f00ac8
DIST v4l-utils-1.28.1.tar.xz 1246516 BLAKE2B a68728ab6802754cd766453375e212624ee731a7fc9b0d0da6a4c62ce19e75968c5bdbefa33d2977d439a23f36f5c8ff83efc44dae65eed206a31ef19ea57363 SHA512 6493c97f59af5fe0ffa4bb815ebac4531f5ea2b0612c2035c7f00a888ce686ee0aeeaef982553ff9ad6441c39dac63e6c718b1bedb0541cb2ce2e3c2f91ab12f
diff --git a/media-libs/libv4l/files/libv4l-1.26.0-meson.patch b/media-libs/libv4l/files/libv4l-1.26.0-meson.patch
deleted file mode 100644
index 9f8384033865..000000000000
--- a/media-libs/libv4l/files/libv4l-1.26.0-meson.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 11ca2682040d14ba1a3d65e95a6f0dfded5e4365 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 12 Dec 2023 13:39:21 +0000
-Subject: [PATCH 1/2] meson: Fix building with -Dv4l-utils=false
-
-ir_bpf_enabled was referenced without being defined.
----
- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index ab632976..7495a9c2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -358,6 +358,8 @@ subdir('lib')
- if get_option('v4l-utils')
- subdir('utils')
- subdir('contrib')
-+else
-+ ir_bpf_enabled = false
- endif
-
- subdir('doc')
---
-2.42.1
-
-From 15343c83e43805223c098e4c5efe9e176343e801 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 12 Dec 2023 13:59:13 +0000
-Subject: [PATCH 2/2] meson: Allow documentation directory to be specified with
- -Ddocdir
-
-This is needed by Gentoo Linux QA.
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- doc/meson.build | 2 +-
- meson.build | 5 +++++
- meson_options.txt | 2 ++
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/doc/meson.build b/doc/meson.build
-index 8f4437e7..4b23c3de 100644
---- a/doc/meson.build
-+++ b/doc/meson.build
-@@ -20,7 +20,7 @@ doxygen_install_dirs = []
- doxygen_output = []
- if get_option('doxygen-html')
- doxygen_output += 'html'
-- doxygen_install_dirs += get_option('datadir') / 'doc' / '@0@'.format(meson.project_name())
-+ doxygen_install_dirs += docdir
- endif
- if get_option('doxygen-man')
- doxygen_output += 'man'
-diff --git a/meson.build b/meson.build
-index 7495a9c2..0348b43b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -289,6 +289,11 @@ if udevdir == ''
- udevdir = '/lib/udev'
- endif
-
-+docdir = get_option('docdir')
-+if docdir == ''
-+ docdir = get_option('datadir') / 'doc' / '@0@'.format(meson.project_name())
-+endif
-+
- qt5_opengl_test = '''
- #define GL_GLEXT_PROTOTYPES
- #define QT_NO_OPENGL_ES_2
-diff --git a/meson_options.txt b/meson_options.txt
-index 2fa046c0..53cf832f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -32,6 +32,8 @@ option('v4l2-ctl-stream-to', type : 'boolean',
- description : 'Enable use of --stream-to in v4l2-ctl')
-
- # Directories
-+option('docdir', type : 'string',
-+ description : 'Set documentation directory')
- option('gconvsysdir', type : 'string',
- description : 'Set system gconv directory (default is to autodetect)')
- option('libv4l1subdir', type : 'string', value : 'libv4l',
---
-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
-
diff --git a/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch b/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch
deleted file mode 100644
index 5b5eea83bc9a..000000000000
--- a/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c7ef1a55bb6accb708a4e09d71028b904b07e49e Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 7 Feb 2024 22:48:59 +0000
-Subject: [PATCH] v4l2-compliance: Fix building against libc++
-
-v4l2-test-time32-64.cpp included compiler.h, which checks
-_LIBCPP_VERSION. This only works against libc++ when a C++ header has
-already been included, which wasn't the case here.
-
-The <version> header is the C++20 method of defining _LIBCPP_VERSION,
-but for older versions, <ciso646> works as an alternative, so include
-that in compiler.h.
-
-compiler.h is for C as well as C++ though, so use __cplusplus to check
-for a C++ compiler before including <ciso646>.
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- include/compiler.h | 27 ++++++++++++---------------
- 1 file changed, 12 insertions(+), 15 deletions(-)
-
-diff --git a/include/compiler.h b/include/compiler.h
-index 5ad54f41..169247a8 100644
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -1,17 +1,14 @@
--#ifdef _LIBCPP_VERSION
--#define fallthrough _LIBCPP_FALLTHROUGH()
-+#if !defined(__cplusplus) || __cplusplus < 201103L
-+ #define fallthrough ((void)0)
- #else
--
--#if __cplusplus >= 201103L
--
--#ifdef __clang__
--#define fallthrough [[clang::fallthrough]]
--#else
--#define fallthrough [[gnu::fallthrough]]
--#endif // __clang__
--
--#else
--#define fallthrough ((void)0)
--
-+ #include <ciso646>
-+ #ifdef _LIBCPP_VERSION
-+ #define fallthrough _LIBCPP_FALLTHROUGH()
-+ #else
-+ #ifdef __clang__
-+ #define fallthrough [[clang::fallthrough]]
-+ #else
-+ #define fallthrough [[gnu::fallthrough]]
-+ #endif // __clang__
-+ #endif // _LIBCPP_VERSION
- #endif // __cplusplus
--#endif // _LIBCPP_VERSION
---
-2.43.0
-
diff --git a/media-libs/libv4l/libv4l-1.22.1.ebuild b/media-libs/libv4l/libv4l-1.22.1.ebuild
deleted file mode 100644
index f87601a2e925..000000000000
--- a/media-libs/libv4l/libv4l-1.22.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dvb jpeg"
-
-RDEPEND="
- dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
- !elibc_glibc? ( sys-libs/argp-standalone )
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- # Hard disable the flags that apply only to the utils.
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- $(use_enable dvb libdvbv5) \
- --disable-qv4l2 \
- --disable-qvidcap \
- --disable-v4l-utils \
- $(use_with jpeg) \
- $(use_with dvb libudev)
-}
-
-multilib_src_compile() {
- emake -C lib
-}
-
-multilib_src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libv4l/libv4l-1.26.1.ebuild b/media-libs/libv4l/libv4l-1.26.1.ebuild
deleted file mode 100644
index 6a97e52ec66d..000000000000
--- a/media-libs/libv4l/libv4l-1.26.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info meson-multilib systemd udev xdg
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="v4l-utils libraries and optional utilities"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bpf doc dvb jpeg qt5 tracer +utils"
-
-REQUIRED_USE="
- bpf? ( utils )
- qt5? ( utils )
- tracer? ( utils )
-"
-
-RDEPEND="
- dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
- jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
- utils? (
- !elibc_glibc? ( sys-libs/argp-standalone )
- bpf? (
- dev-libs/libbpf:=
- virtual/libelf:=
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5[-gles2-only(-),-gles2(-)]
- dev-qt/qtwidgets:5
- media-libs/alsa-lib
- virtual/opengl
- )
- tracer? ( dev-libs/json-c:= )
- virtual/libudev
- )
- !<media-tv/v4l-utils-1.26
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
- doc? ( app-text/doxygen )
- utils? (
- dev-lang/perl
- qt5? ( dev-qt/qtcore:5 )
- )
-"
-
-# Not really prebuilt but BPF objects make our QA checks go crazy.
-QA_PREBUILT="*/rc_keymaps/protocols/*.o"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.26.0-meson.patch
- "${FILESDIR}"/${PN}-1.26.1-libcxx.patch
-)
-
-check_llvm() {
- if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
- local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}
- ${clang} -target bpf -print-supported-cpus &>/dev/null ||
- die "${clang} does not support the BPF target. Please check LLVM_TARGETS."
- fi
-}
-
-pkg_pretend() {
- has_version -b sys-devel/clang && check_llvm
-}
-
-pkg_setup() {
- check_llvm
- CONFIG_CHECK="~SHMEM" linux-info_pkg_setup
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_native_use_feature bpf)
- -Dgconv=disabled
- $(meson_feature jpeg)
- $(meson_feature dvb libdvbv5)
- $(meson_native_use_feature qt5 qv4l2)
- $(meson_native_use_feature qt5 qvidcap)
- $(meson_native_use_feature tracer v4l2-tracer)
- $(meson_native_use_bool utils v4l-utils)
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
- -Dudevdir="${EPREFIX}$(get_udevdir)"
- $(meson_native_use_feature doc doxygen-doc)
- $(meson_native_use_bool doc doxygen-html)
- $(meson_native_use_bool doc doxygen-man)
- )
- meson_src_configure
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
-
- if use utils; then
- dodoc README.md
- newdoc utils/dvb/README README.dvb
- newdoc utils/libv4l2util/TODO TODO.libv4l2util
- newdoc utils/libmedia_dev/README README.libmedia_dev
- newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- use utils && udev_reload
-
- if use utils && [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then
- ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so"
- ewarn "you may need to take action to avoid breakage. See"
- ewarn "https://bugs.gentoo.org/767175 for more details."
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- use utils && udev_reload
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-10-04 17:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-25 23:38 [gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/, media-libs/libv4l/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-10-04 17:37 Andreas Sturmlechner
2024-02-09 22:23 James Le Cuirot
2020-08-23 16:42 James Le Cuirot
2018-01-13 12:16 Alexis Ballier
2016-03-15 2:33 Mike Frysinger
2016-03-15 2:33 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox