* [gentoo-commits] proj/musl:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2015-07-18 15:02 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2015-07-18 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 2f1b1b7c5bb2811b8abb8fc4051f8ab19e23c647
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 13:16:17 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 15:05:02 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2f1b1b7c
media-libs/libv4l: fix 1.6.2.
media-libs/libv4l/ChangeLog | 417 +++++++++++++++++++++
media-libs/libv4l/Manifest | 10 +-
.../libv4l/files/libv4l-1.0.0-configure.patch | 27 --
media-libs/libv4l/files/libv4l-1.0.0-off_t.patch | 11 -
.../libv4l/files/libv4l-1.6.2-musl-ioctl.patch | 30 ++
.../files/libv4l-1.6.2-musl-open64-mmap64.patch | 108 ++++++
media-libs/libv4l/files/libv4l-1.6.2-off_t.patch | 16 +
...4l-1.0.0-r99.ebuild => libv4l-1.6.2-r99.ebuild} | 30 +-
8 files changed, 593 insertions(+), 56 deletions(-)
diff --git a/media-libs/libv4l/ChangeLog b/media-libs/libv4l/ChangeLog
new file mode 100644
index 0000000..6cb4a2e
--- /dev/null
+++ b/media-libs/libv4l/ChangeLog
@@ -0,0 +1,417 @@
+# ChangeLog for media-libs/libv4l
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.112 2015/07/16 15:45:55 klausman Exp $
+
+ 16 Jul 2015; Tobias Klausmann <klausman@gentoo.org> libv4l-1.6.2.ebuild:
+ Stable on alpha, bug 552014
+
+ 28 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> libv4l-1.6.2.ebuild:
+ x86 stable wrt bug #552014
+
+ 27 Jun 2015; Markus Meier <maekke@gentoo.org> libv4l-1.6.2.ebuild:
+ arm stable, bug #552014
+
+ 26 Jun 2015; Agostino Sarubbo <ago@gentoo.org> libv4l-1.6.2.ebuild:
+ Stable for amd64, wrt bug #552014
+
+*libv4l-1.6.2 (25 Nov 2014)
+
+ 25 Nov 2014; Alexis Ballier <aballier@gentoo.org> +libv4l-1.6.2.ebuild:
+ version bump
+
+ 14 Nov 2014; Alexis Ballier <aballier@gentoo.org> libv4l-1.6.0-r1.ebuild:
+ drop useless deps, bug #468684
+
+*libv4l-1.6.0-r1 (14 Nov 2014)
+
+ 14 Nov 2014; Mike Frysinger <vapier@gentoo.org> +libv4l-1.6.0-r1.ebuild:
+ Drop udev logic as that applies only to the utils, and make jpeg support
+ optoinal.
+
+*libv4l-1.6.0 (30 Oct 2014)
+
+ 30 Oct 2014; Mike Frysinger <vapier@gentoo.org> +libv4l-1.6.0.ebuild:
+ Version bump.
+
+*libv4l-1.2.1 (20 Aug 2014)
+
+ 20 Aug 2014; Mike Frysinger <vapier@gentoo.org> +libv4l-1.2.1.ebuild:
+ Version bump #504748 by teidakankan.
+
+ 20 Aug 2014; Mike Frysinger <vapier@gentoo.org> libv4l-1.0.0.ebuild:
+ Mark stable for alpha/ia64/ppc64/sparc #516314.
+
+ 31 Jul 2014; Jeroen Roovers <jer@gentoo.org> libv4l-1.0.0.ebuild:
+ Stable for HPPA (bug #516314).
+
+ 28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> libv4l-1.0.0.ebuild:
+ Stable for ppc, wrt bug #512012
+
+ 23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> libv4l-1.0.0.ebuild:
+ Stable for x86, wrt bug #512012
+
+ 22 Jul 2014; Agostino Sarubbo <ago@gentoo.org> libv4l-1.0.0.ebuild:
+ Stable for amd64, wrt bug #512912
+
+ 20 Jul 2014; Markus Meier <maekke@gentoo.org> libv4l-1.0.0.ebuild:
+ arm stable, bug #512012
+
+ 18 Jun 2014; Michał Górny <mgorny@gentoo.org> libv4l-0.9.5-r1.ebuild,
+ libv4l-1.0.0.ebuild:
+ Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+ #513718.
+
+*libv4l-1.0.0 (06 Aug 2013)
+
+ 06 Aug 2013; Alexis Ballier <aballier@gentoo.org> +libv4l-1.0.0.ebuild:
+ version bump
+
+ 05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5-r1.ebuild,
+ libv4l-0.9.5.ebuild:
+ Pull in correct SLOT of libjpeg for headers.
+
+ 31 Jul 2013; Alexis Ballier <aballier@gentoo.org> libv4l-0.9.5-r1.ebuild:
+ add emul blocker so that it is stacked for medialibs -r6
+
+ 31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5-r1.ebuild:
+ Remove now unnecessary emul- baselibs USE="development" requirement now that
+ we have multilib virtual/jpeg.
+
+ 31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5-r1.ebuild:
+ Missing multilib depend for virtual/jpeg.
+
+ 13 Jul 2013; Michał Górny <mgorny@gentoo.org> libv4l-0.9.5-r1.ebuild:
+ Add abi_x86_32 blockers for emul-linux.
+
+ 05 May 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5.ebuild,
+ libv4l-0.9.5-r1.ebuild:
+ Use -j1 for emake install because of the following error:
+
+ libtool: relink: gcc ... -o .libs/v4l2convert.so
+ ld: cannot find -lv4l2
+ collect2: error: ld returned 1 exit status
+ libtool: install: error: relink `v4l2convert.la' with the above command
+ before installing it
+
+ 04 May 2013; Samuli Suominen <ssuominen@gentoo.org> -libv4l-0.8.9-r1.ebuild:
+ old
+
+*libv4l-0.9.5-r1 (04 May 2013)
+*libv4l-0.9.5 (04 May 2013)
+
+ 04 May 2013; Samuli Suominen <ssuominen@gentoo.org> +libv4l-0.9.5.ebuild,
+ +libv4l-0.9.5-r1.ebuild:
+ Version bump wrt #458388 by "teidakankan"
+
+ 16 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.8.9-r1.ebuild:
+ Inherit multilib despite inheriting multilib-minimal to silence repoman
+ warning of get_libdir usage.
+
+*libv4l-0.8.9-r1 (16 Mar 2013)
+
+ 16 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> +libv4l-0.8.9-r1.ebuild:
+ Port to multilib-minimal.eclass and ABI_X86="32" to replace the existing copy
+ in app-emulation/emul-linux-x86-medialibs.
+
+ 16 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> -libv4l-0.8.8.ebuild:
+ old
+
+ 21 Feb 2013; Alexis Ballier <aballier@gentoo.org> metadata.xml:
+ remove myself from metadata, I have not been doing anything there since years
+
+ 29 Dec 2012; Raúl Porcel <armin76@gentoo.org> libv4l-0.8.9.ebuild:
+ alpha/sparc stable wrt #446036
+
+ 19 Dec 2012; Jeroen Roovers <jer@gentoo.org> libv4l-0.8.9.ebuild:
+ Stable for HPPA (bug #446036).
+
+ 18 Dec 2012; Agostino Sarubbo <ago@gentoo.org> libv4l-0.8.9.ebuild:
+ Stable for ia64, wrt bug #446036
+
+ 17 Dec 2012; Markus Meier <maekke@gentoo.org> libv4l-0.8.9.ebuild:
+ arm stable, bug #446036
+
+ 16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> libv4l-0.8.9.ebuild:
+ Stable for ppc, wrt bug #446036
+
+ 16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> libv4l-0.8.9.ebuild:
+ Stable for x86, wrt bug #446036
+
+ 11 Dec 2012; Chema Alonso <nimiux@gentoo.org> libv4l-0.8.9.ebuild:
+ Stable for amd64 wrt bug #446036
+
+ 10 Dec 2012; Agostino Sarubbo <ago@gentoo.org> libv4l-0.8.9.ebuild:
+ Stable for ppc64, wrt bug #446036
+
+ 05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -libv4l-0.8.5.ebuild, -libv4l-0.8.5-r1.ebuild,
+ -files/libv4l-0.8.5-disable_fancy_upsampling.patch:
+ Drop old.
+
+*libv4l-0.8.9 (20 Oct 2012)
+
+ 20 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> libv4l-0.8.5.ebuild,
+ libv4l-0.8.5-r1.ebuild, -libv4l-0.8.6.ebuild, libv4l-0.8.8.ebuild,
+ +libv4l-0.8.9.ebuild:
+ Version bump, improves pixart jpeg compression support and adds fixes for
+ more laptop models (bug #438244, thanks to Wojciech Myrda). Update license.
+ Drop old.
+
+ 26 Sep 2012; Mike Frysinger <vapier@gentoo.org>
+ +files/libv4l-0.8.8-drop-Wp-flags.patch, libv4l-0.8.8.ebuild:
+ Drop useless gcc-specific -Wp flags.
+
+ 27 Aug 2012; Raúl Porcel <armin76@gentoo.org> libv4l-0.8.8.ebuild:
+ alpha/ia64/sparc stable wrt #419099
+
+ 06 Aug 2012; Brent Baude <ranger@gentoo.org> libv4l-0.8.8.ebuild:
+ Marking libv4l-0.8.8 ppc64 for bug 419099
+
+ 06 Aug 2012; Brent Baude <ranger@gentoo.org> libv4l-0.8.8.ebuild:
+ Marking libv4l-0.8.8 ppc for bug 419099
+
+ 24 Jul 2012; Markos Chandras <hwoarang@gentoo.org> libv4l-0.8.8.ebuild:
+ Stable on amd64 wrt bug #419099
+
+ 24 Jul 2012; Jeroen Roovers <jer@gentoo.org> libv4l-0.8.8.ebuild:
+ Stable for HPPA (bug #419099).
+
+ 23 Jul 2012; Markus Meier <maekke@gentoo.org> libv4l-0.8.8.ebuild:
+ arm stable, bug #419099
+
+ 16 Jul 2012; Jeff Horelick <jdhore@gentoo.org> libv4l-0.8.8.ebuild:
+ marked x86 per bug 419099
+
+*libv4l-0.8.8 (14 Apr 2012)
+
+ 14 Apr 2012; Alexis Ballier <aballier@gentoo.org> +libv4l-0.8.8.ebuild:
+ version bump
+
+*libv4l-0.8.6 (19 Feb 2012)
+
+ 19 Feb 2012; Alexis Ballier <aballier@gentoo.org> +libv4l-0.8.6.ebuild:
+ version bump
+
+*libv4l-0.8.5-r1 (02 Feb 2012)
+
+ 02 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> +libv4l-0.8.5-r1.ebuild,
+ +files/libv4l-0.8.5-disable_fancy_upsampling.patch:
+ Since JPEG 7.x the fancy upsampling has been enabled by default and should
+ explicitely be disabled in apps not supporting it wrt #401865 by Denilson Sá
+
+ 13 Jan 2012; Mike Frysinger <vapier@gentoo.org> libv4l-0.8.5.ebuild:
+ Simplify ebuild a bit.
+
+ 30 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> -libv4l-0.8.1.ebuild,
+ -libv4l-0.8.3.ebuild, -libv4l-0.8.4.ebuild:
+ old
+
+ 30 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.8.5.ebuild:
+ ppc/ppc64 stable wrt #382727
+
+ 20 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> metadata.xml:
+ Updated my email address.
+
+ 23 Oct 2011; Raúl Porcel <armin76@gentoo.org> libv4l-0.8.5.ebuild:
+ alpha/ia64/sparc stable wrt #382727
+
+ 05 Oct 2011; Jeroen Roovers <jer@gentoo.org> libv4l-0.8.5.ebuild:
+ Stable for HPPA (bug #382727).
+
+ 04 Oct 2011; Markus Meier <maekke@gentoo.org> libv4l-0.8.5.ebuild:
+ arm stable, bug #382727
+
+ 18 Sep 2011; Markus Meier <maekke@gentoo.org> libv4l-0.8.5.ebuild:
+ x86 stable, bug #382727
+
+ 16 Sep 2011; Tony Vroon <chainsaw@gentoo.org> libv4l-0.8.5.ebuild:
+ Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo,
+ Elijah "Armageddon" El Lazkani & Ian "idella4" Delaney in bug #382727.
+
+*libv4l-0.8.5 (04 Aug 2011)
+
+ 04 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +libv4l-0.8.5.ebuild:
+ Version bump.
+
+ 16 Jun 2011; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.8.4.ebuild:
+ Fix missing virtual/jpeg dep wrt #371879 by Markus Knetschke
+
+*libv4l-0.8.4 (10 Jun 2011)
+
+ 10 Jun 2011; Samuli Suominen <ssuominen@gentoo.org> +libv4l-0.8.4.ebuild:
+ Version bump.
+
+ 01 Jun 2011; Brent Baude <ranger@gentoo.org> libv4l-0.8.3.ebuild:
+ Marking libv4l-0.8.3 ppc stable for bug 354033
+
+ 09 May 2011; Markos Chandras <hwoarang@gentoo.org> libv4l-0.8.3.ebuild:
+ Stable on amd64 wrt bug #354033
+
+ 09 May 2011; Thomas Kahle <tomka@gentoo.org> libv4l-0.8.3.ebuild:
+ x86 stable per bug 354033
+
+ 02 Apr 2011; Raúl Porcel <armin76@gentoo.org> libv4l-0.8.1.ebuild,
+ libv4l-0.8.3.ebuild:
+ Add ~ia64 wrt #359771
+
+ 13 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> libv4l-0.8.1.ebuild:
+ ppc stable wrt #344327
+
+ 03 Mar 2011; Jonathan Callen <abcd@gentoo.org> libv4l-0.8.3.ebuild:
+ Add ~amd64-linux/~x86-linux keywords
+
+*libv4l-0.8.3 (16 Feb 2011)
+
+ 16 Feb 2011; Alexis Ballier <aballier@gentoo.org> +libv4l-0.8.3.ebuild:
+ version bump
+
+ 04 Jan 2011; Michael Weber <xmw@gentoo.org> libv4l-0.8.1.ebuild:
+ sparc stable (bug 344327)
+
+ 22 Dec 2010; Tobias Klausmann <klausman@gentoo.org> libv4l-0.8.1.ebuild:
+ Stable on alpha, bug #344327
+
+ 24 Nov 2010; Jeroen Roovers <jer@gentoo.org> libv4l-0.8.1.ebuild:
+ Stable for HPPA (bug #344327).
+
+ 09 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.8.1.ebuild:
+ ppc64 stable wrt #344327
+
+ 09 Nov 2010; Markus Meier <maekke@gentoo.org> libv4l-0.8.1.ebuild:
+ arm stable, bug #344327
+
+ 09 Nov 2010; Markus Meier <maekke@gentoo.org> libv4l-0.8.1.ebuild:
+ x86 stable, bug #344327
+
+ 07 Nov 2010; Markos Chandras <hwoarang@gentoo.org> libv4l-0.8.1.ebuild:
+ Stable on amd64 wrt bug #344327
+
+*libv4l-0.8.1 (23 Oct 2010)
+
+ 23 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> +libv4l-0.8.1.ebuild:
+ Version bump wrt #332533 by Alexandre Rostovtsev.
+
+ 18 Jul 2010; Raúl Porcel <armin76@gentoo.org> libv4l-0.6.1.ebuild:
+ arm stable
+
+ 10 Jul 2010; Raúl Porcel <armin76@gentoo.org> libv4l-0.6.1.ebuild:
+ sparc stable
+
+ 10 Jul 2010; Jeroen Roovers <jer@gentoo.org> libv4l-0.6.1.ebuild:
+ Stable for HPPA (bug #306419).
+
+ 09 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.6.1.ebuild,
+ libv4l-0.7.91.ebuild:
+ DEPEND >=sys-kernel/linux-headers-2.6.30-r1 wrt #323307 by Jonas Berlin.
+
+ 16 May 2010; Raúl Porcel <armin76@gentoo.org> libv4l-0.6.1.ebuild:
+ alpha stable wrt #306419
+
+*libv4l-0.7.91 (10 May 2010)
+
+ 10 May 2010; Samuli Suominen <ssuominen@gentoo.org> +libv4l-0.7.91.ebuild:
+ Version bump wrt #314885.
+
+ 23 Mar 2010; Brent Baude <ranger@gentoo.org> libv4l-0.6.1.ebuild:
+ stable ppc, bug 306419
+
+ 22 Mar 2010; Christian Faulhammer <fauli@gentoo.org> libv4l-0.6.1.ebuild:
+ stable x86, bug 306419
+
+ 21 Mar 2010; Brent Baude <ranger@gentoo.org> libv4l-0.6.1.ebuild:
+ stable ppc64, bug 306419
+
+ 11 Mar 2010; Markos Chandras <hwoarang@gentoo.org> libv4l-0.6.1.ebuild:
+ Stable on amd64 wrt bug #306419
+
+*libv4l-0.6.4 (25 Feb 2010)
+
+ 25 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> +libv4l-0.6.4.ebuild:
+ Version bump.
+
+ 24 Feb 2010; Raúl Porcel <armin76@gentoo.org> libv4l-0.5.3.ebuild,
+ libv4l-0.6.1.ebuild:
+ Add ~sparc
+
+ 19 Jan 2010; Jeroen Roovers <jer@gentoo.org> libv4l-0.5.3.ebuild:
+ Stable for HPPA too.
+
+ 13 Nov 2009; Joseph Jezak <josejx@gentoo.org> libv4l-0.5.3.ebuild:
+ Marked ppc64 stable.
+
+ 06 Sep 2009; Alexis Ballier <aballier@gentoo.org> -libv4l-0.5.8.ebuild,
+ -libv4l-0.6.0.ebuild:
+ remove old
+
+*libv4l-0.6.1 (06 Sep 2009)
+
+ 06 Sep 2009; Alexis Ballier <aballier@gentoo.org> +libv4l-0.6.1.ebuild:
+ version bump, by Peter Volkov <pva@gentoo.org>, bug #283746
+
+*libv4l-0.6.0 (17 Jul 2009)
+
+ 17 Jul 2009; Alexis Ballier <aballier@gentoo.org> +libv4l-0.6.0.ebuild:
+ version bump, by Alexandre Rostovtsev <tetromino@gmail.com>, bug #278116
+
+ 04 Jul 2009; Jeroen Roovers <jer@gentoo.org> libv4l-0.5.8.ebuild:
+ Marked ~hppa (bug #276355).
+
+ 04 Apr 2009; <solar@gentoo.org> libv4l-0.5.8.ebuild:
+ - Keyword ~arm
+
+ 19 Jan 2009; Alexis Ballier <aballier@gentoo.org> -libv4l-0.5.5.ebuild,
+ -libv4l-0.5.6.ebuild, -libv4l-0.5.7.ebuild:
+ remove old
+
+*libv4l-0.5.8 (19 Jan 2009)
+
+ 19 Jan 2009; Alexis Ballier <aballier@gentoo.org> +libv4l-0.5.8.ebuild:
+ verion bump, bug #254598
+
+ 13 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> libv4l-0.5.3.ebuild:
+ ppc stable, bug #249391
+
+*libv4l-0.5.7 (08 Dec 2008)
+
+ 08 Dec 2008; Alexis Ballier <aballier@gentoo.org> +libv4l-0.5.7.ebuild:
+ version bump, bug #249759
+
+*libv4l-0.5.6 (27 Nov 2008)
+
+ 27 Nov 2008; Alexis Ballier <aballier@gentoo.org> +libv4l-0.5.6.ebuild:
+ verion bump, bug #248938
+
+*libv4l-0.5.5 (23 Nov 2008)
+
+ 23 Nov 2008; Alexis Ballier <aballier@gentoo.org> +libv4l-0.5.5.ebuild:
+ version bump, bug #248042
+
+ 12 Nov 2008; Alexis Ballier <aballier@gentoo.org> -libv4l-0.5.1.ebuild:
+ remove old
+
+ 09 Nov 2008; Tobias Klausmann <klausman@gentoo.org> libv4l-0.5.3.ebuild:
+ Stable on alpha, bug #245774
+
+ 09 Nov 2008; Markus Meier <maekke@gentoo.org> libv4l-0.5.3.ebuild:
+ amd64/x86 stable, bug #245774
+
+ 30 Oct 2008; Tobias Scherbaum <dertobi123@gentoo.org> libv4l-0.5.3.ebuild:
+ Added ~ppc, bug #242740
+
+*libv4l-0.5.3 (29 Oct 2008)
+
+ 29 Oct 2008; Alexis Ballier <aballier@gentoo.org> +libv4l-0.5.3.ebuild:
+ Version bump, thanks Alexandre.
+
+ 29 Oct 2008; Alexis Ballier <aballier@gentoo.org> libv4l-0.5.1.ebuild:
+ Add second, more informative homepage, by Alexandre.
+
+ 28 Oct 2008; Brent Baude <ranger@gentoo.org> libv4l-0.5.1.ebuild:
+ Marking libv4l-0.5.1 ~ppc64 for bug 242740
+
+*libv4l-0.5.1 (18 Oct 2008)
+
+ 18 Oct 2008; Alexis Ballier <aballier@gentoo.org> +metadata.xml,
+ +libv4l-0.5.1.ebuild:
+ Initial import, ebuild by Alex Rostovtsev tetromino@gmail.com who will
+ proxy maintain it, bug #240090
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index bcbfc59..d3fb157 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,5 +1,7 @@
-AUX libv4l-1.0.0-configure.patch 1260 SHA256 f66fec7cfdb7949b4586237212479fd6bcb7ce6ca5a914b46e2501c835a98157 SHA512 bf566845bd7a396dc79160415c76428022b8cdfe9cf30447e9e9c039351a870badc7f7c7f5b1895f971e42ca8f447e2dbd286345991fcd44c0cb3eeb4906c4d8 WHIRLPOOL e573bde3807672428c2b2779eaff1ad620650d139ac1fe1f93ce4b41bcb1d37004076bd6156089ccc10763c0c309eecc4f8244ac6651014f0094035b8a86ed23
-AUX libv4l-1.0.0-off_t.patch 455 SHA256 8d6a072021c93621815565132cc6138a98c2f5ccf6748d04798fce88a6520c70 SHA512 4300d14693735a84fe08041d89792479f64cebd4f3db90cdf3add86b6570796444acd5384f57692d0765c215d321ec61c1f0c730a9782f9c211ef9a079735e62 WHIRLPOOL f4e6eb716dcf59fd10ab043f227d4397ee9a6b751fa06ffee08df48ed5d63fe56d189f1e22c55e056ef264aeafb105de99a0996cf0b13d0578ac91f84cc294ec
-DIST v4l-utils-1.0.0.tar.bz2 963427 SHA256 1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30 SHA512 19e31167015623f50f93dc27becb8f053ca7488ffc41e275c195cb46af63671a0cec6cecea71d90a43b3b01b47f6e6cc2f44517dddd3c2c376bb1d82f770117e WHIRLPOOL 133d85232457545a828e783ca503d368a5da814ab51d70648ef9a727947a21a07bf82e8ebdcbc48b4fc9a139bdff22c73f0dd1ad666cf8f8a051f7df93e4f2fe
-EBUILD libv4l-1.0.0-r99.ebuild 1567 SHA256 c5c0e4782b1ff2715ae8ada2e564bf81c9c90823484d25438bd8c29758bbb6ae SHA512 cd146eebb9170b1a330999eb069092ff6582f81023c1ccdd6173cbf0b40b2964d3371274f7119430514bfac91e12bf38f546a9540d36cbdbcbc386c9227341bd WHIRLPOOL a41038a311f46dceba86abb9132f68118819952c0e0c8245f28f64b7180116aca16d3e6c9a7ff4ebc27f8944e9d269040404273f49a9f0e8d5afc9cc01e1faa0
+AUX libv4l-1.6.2-musl-ioctl.patch 1138 SHA256 fddb0ec60a66fe9963aba4b01d34a03c9f6ee523ca8b8c037ee155428bcb513f SHA512 5051aeff12d5cd538bf2d071ca61437ec2565f2326d610ebf2ba0dce8b65c373ca61ca406d0867f6e2bbcc4601b5bcc1ff0ace9786e5b53395b0f5fe4a103fad WHIRLPOOL 90b181aa72c1588ad75fedb46061b13d451a4a08f59397c18de0752eb0dd8be1289c04afbaa95e210a1634963bb7d43d640edfcd1d18e163a6f9179096a90161
+AUX libv4l-1.6.2-musl-open64-mmap64.patch 2490 SHA256 d2a94392ace321c4c4a9ad78098ecee53f62402bef987cefd2909191abd24a46 SHA512 3487e905ac08c8a80829c3f75d82f13b098cac48784f0e0620eea4478a1f8e5aa5fd7eadcea3c188120df5c781c0e7dcbf36a63130d95cfadc2633a0e9a11064 WHIRLPOOL bb7e3820669ab5ae0c6b97cc5bc86c609b605bd9202e97e75ad735af8982b717b09fe1918ebe869b98c76a17392f19a20660ba54f7b5d2160197db0368e875b3
+AUX libv4l-1.6.2-off_t.patch 603 SHA256 ee7cebd020b29a7ed9a92fb2ff5be76d37fd714671c8530dd2ff6eb900b072b9 SHA512 27429e512fd2d6115e68ca3d62e90f3bf0c9ddda9deabee03cca35b653e228a16079fb8e488e6f434eef3eeacaada52c16d413f913b7c3395fa2225f6a7b4931 WHIRLPOOL fce897fa42306d50b321aed3e5a9db80c8f7bbdbe89cab8bc92a80adaf9d7dc5f1166d5cce2e626289845a6191c413ac92e56b40055aff6fd9f4b3ee8ed44ff7
+DIST v4l-utils-1.6.2.tar.bz2 1148309 SHA256 d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 WHIRLPOOL bd1b825354ca52e62e8c5f83d43bfd2cec63611c65d6b2709a7274fd15ae0fa21345d2b95a073c0b3a33b7c94b304562f1efcf112e1357a58515bd0d6f37f396
+EBUILD libv4l-1.6.2-r99.ebuild 1669 SHA256 0a1698c817fabaa210e27fb0bf8a592b556048cd604fe34fb418446585a32ee8 SHA512 a5b27c60d4f16e92f11fdb576eb1f2df3622e837f8c6e6fd541468292edb6e6b30dab9ceeb914d5b89854d3a16cf2b9d283ae71b0b5cf27f2540aee166f08edd WHIRLPOOL ff6f0bd05b656caafd7ad1a502f5bd6a18438441f01524019fea6f5134271cd7655ac8fd10b7c8c39ef1bc3989289ce8fb37403df686f14c1cc848be1a4d1f68
+MISC ChangeLog 14089 SHA256 8a391e108dc68ef56ec624d5e70dd0ebaa0e785a4be52691e8b981d468d4874c SHA512 5c1487b3a326874cbc59c5a0c0d7e08bea3fbead61fe10ca66ff7df1f32bed52933b698149896a4da1dd05e4ed87d209d0bb24ee57f0f4a448bdb09db0c2dd7e WHIRLPOOL 987d5c2af58ee15aac70bddf0fe39fb09ac5f0cc9cfcd0ac84a8836b21dcd78550d2691a85e5100d1880d47b447dce9c8b0dfa2a9b707979b5697efa1be9c85d
MISC metadata.xml 1135 SHA256 3aa2704309b6a8c6c1d407871f5765ae9a35875f83ea140f24d67639f1926c1e SHA512 e051f1b40363405e66d863331f965e643722474eb83250a998a4d920b86ab615d217e1aff251651b2b70aecf938708a5d7669fab21e8586b5c95472edf35042a WHIRLPOOL dd1ccf47f383388c51c6ac1e904a05e569dcec6473728c5464d6424aed5676c82d498126958254c14b70dbaf3ef7be1a23bc36d098dd7e50ff3a07c502455fa6
diff --git a/media-libs/libv4l/files/libv4l-1.0.0-configure.patch b/media-libs/libv4l/files/libv4l-1.0.0-configure.patch
deleted file mode 100644
index d9437e6..0000000
--- a/media-libs/libv4l/files/libv4l-1.0.0-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/v4l-utils-1.0.0/configure.ac
-+++ b/v4l-utils-1.0.0/configure.ac
-@@ -144,15 +144,6 @@
- AC_SUBST([DLOPEN_LIBS])
- LIBS=$dl_saved_libs
-
--AC_CHECK_HEADER([argp.h],,AC_MSG_ERROR(Cannot continue: argp.h not found))
--argp_saved_libs=$LIBS
-- AC_SEARCH_LIBS([argp_parse],
-- [argp],
-- [test "$ac_cv_search_argp_parse" = "none required" || ARGP_LIBS=$ac_cv_search_argp_parse],
-- [AC_MSG_ERROR([unable to find the argp_parse() function])])
-- AC_SUBST([ARGP_LIBS])
--LIBS=$argp_saved_libs
--
- AC_CHECK_HEADER([linux/i2c-dev.h], [linux_i2c_dev=yes], [linux_i2c_dev=no])
- AM_CONDITIONAL([HAVE_LINUX_I2C_DEV], [test x$linux_i2c_dev = xyes])
-
-@@ -238,7 +229,7 @@
- AM_CONDITIONAL([WITH_V4LUTILS], [test x$enable_v4lutils != xno])
- AM_CONDITIONAL([WITH_QV4L2], [test ${qt_pkgconfig} = true -a x$enable_qv4l2 != xno])
- AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_libv4l != xno -a x$enable_shared != xno])
--AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_libv4l != xno -a x$enable_shared != xno])
-+AM_CONDITIONAL([WITH_V4L_WRAPPERS], [false])
-
- # append -static to libtool compile and link command to enforce static libs
- AS_IF([test x$enable_libdvbv5 != xyes], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])])
diff --git a/media-libs/libv4l/files/libv4l-1.0.0-off_t.patch b/media-libs/libv4l/files/libv4l-1.0.0-off_t.patch
deleted file mode 100644
index 4fdd632..0000000
--- a/media-libs/libv4l/files/libv4l-1.0.0-off_t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/v4l-utils-1.0.0/lib/libv4lconvert/libv4lsyscall-priv.h
-+++ b/v4l-utils-1.0.0/lib/libv4lconvert/libv4lsyscall-priv.h
-@@ -99,7 +99,7 @@
- #else
- #define SYS_MMAP(addr, len, prot, flags, fd, off) \
- syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
-- (int)(prot), (int)(flags), (int)(fd), (__off_t)((off) >> MMAP2_PAGE_SHIFT))
-+ (int)(prot), (int)(flags), (int)(fd), (off_t)((off) >> MMAP2_PAGE_SHIFT))
- #endif
-
- #define SYS_MUNMAP(addr, len) \
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch b/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch
new file mode 100644
index 0000000..a84fcb0
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch
@@ -0,0 +1,30 @@
+musl defines `int ioctl (int, int, ...);` in <sys/ioctl.h>
+which is different than glibc and uClib.c which use an
+unsigned long int for the second paramater. `man 2 ioctl`
+
+Since there is no single standard here, meh.
+
+diff -Naur v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c
+--- v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c 2015-07-18 14:50:06.220267837 +0000
++++ v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c 2015-07-18 14:51:08.744265485 +0000
+@@ -72,7 +72,7 @@
+ return v4l1_dup(fd);
+ }
+
+-LIBV4L_PUBLIC int ioctl(int fd, unsigned long int request, ...)
++LIBV4L_PUBLIC int ioctl(int fd, int request, ...)
+ {
+ void *arg;
+ va_list ap;
+diff -Naur v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c
+--- v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c 2015-07-18 14:50:06.220267837 +0000
++++ v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c 2015-07-18 14:50:59.348265838 +0000
+@@ -96,7 +96,7 @@
+ return v4l2_dup(fd);
+ }
+
+-LIBV4L_PUBLIC int ioctl(int fd, unsigned long int request, ...)
++LIBV4L_PUBLIC int ioctl(int fd, int request, ...)
+ {
+ void *arg;
+ va_list ap;
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch b/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch
new file mode 100644
index 0000000..043b9b3
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch
@@ -0,0 +1,108 @@
+Note that musl uses
+
+#define open64 open
+
+in <fcntl.h> and
+
+#define mmap64 mmap
+
+in <sys/mman.h>. These break with the following attempt to wrap the libc
+function. Its (hopefully?) safe to remove them because of the musl defines.
+
+diff -Naur v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c
+--- v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c 2013-06-28 20:10:56.000000000 +0000
++++ v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c 2015-07-18 14:44:18.140280932 +0000
+@@ -62,28 +62,6 @@
+ return fd;
+ }
+
+-#ifdef linux
+-LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
+-{
+- int fd;
+-
+- if (oflag & O_CREAT) {
+- va_list ap;
+- mode_t mode;
+-
+- va_start(ap, oflag);
+- mode = va_arg(ap, mode_t);
+-
+- fd = v4l1_open(file, oflag | O_LARGEFILE, mode);
+-
+- va_end(ap);
+- } else
+- fd = v4l1_open(file, oflag | O_LARGEFILE);
+-
+- return fd;
+-}
+-#endif
+-
+ LIBV4L_PUBLIC int close(int fd)
+ {
+ return v4l1_close(fd);
+@@ -117,14 +95,6 @@
+ return v4l1_mmap(start, length, prot, flags, fd, offset);
+ }
+
+-#ifdef linux
+-LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
+- __off64_t offset)
+-{
+- return v4l1_mmap(start, length, prot, flags, fd, offset);
+-}
+-#endif
+-
+ LIBV4L_PUBLIC int munmap(void *start, size_t length)
+ {
+ return v4l1_munmap(start, length);
+diff -Naur v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c
+--- v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c 2013-06-28 20:10:56.000000000 +0000
++++ v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c 2015-07-18 14:44:03.728281474 +0000
+@@ -86,31 +86,6 @@
+ return fd;
+ }
+
+-#ifdef linux
+-LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
+-{
+- int fd;
+-
+- /* original open code */
+- if (oflag & O_CREAT) {
+- va_list ap;
+- mode_t mode;
+-
+- va_start(ap, oflag);
+- mode = va_arg(ap, PROMOTED_MODE_T);
+-
+- fd = open(file, oflag | O_LARGEFILE, mode);
+-
+- va_end(ap);
+- } else {
+- fd = open(file, oflag | O_LARGEFILE);
+- }
+- /* end of original open code */
+-
+- return fd;
+-}
+-#endif
+-
+ LIBV4L_PUBLIC int close(int fd)
+ {
+ return v4l2_close(fd);
+@@ -144,14 +119,6 @@
+ return v4l2_mmap(start, length, prot, flags, fd, offset);
+ }
+
+-#ifdef linux
+-LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
+- __off64_t offset)
+-{
+- return v4l2_mmap(start, length, prot, flags, fd, offset);
+-}
+-#endif
+-
+ LIBV4L_PUBLIC int munmap(void *start, size_t length)
+ {
+ return v4l2_munmap(start, length);
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch b/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch
new file mode 100644
index 0000000..03667a2
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch
@@ -0,0 +1,16 @@
+diff -Naur v4l-utils-1.6.2.orig/lib/libv4lconvert/libv4lsyscall-priv.h v4l-utils-1.6.2/lib/libv4lconvert/libv4lsyscall-priv.h
+--- v4l-utils-1.6.2.orig/lib/libv4lconvert/libv4lsyscall-priv.h 2013-06-28 20:10:56.000000000 +0000
++++ v4l-utils-1.6.2/lib/libv4lconvert/libv4lsyscall-priv.h 2015-07-18 13:41:01.904423751 +0000
+@@ -59,7 +59,12 @@
+ #define _IOC_SIZE(cmd) IOCPARM_LEN(cmd)
+ #define MAP_ANONYMOUS MAP_ANON
+ #define MMAP2_PAGE_SHIFT 0
++#endif
++
++#if !defined(__GLIBC__) && !defined(__UCLIBC__)
++#include <sys/types.h>
+ typedef off_t __off_t;
++typedef off64_t __off64_t;
+ #endif
+
+ #undef SYS_OPEN
diff --git a/media-libs/libv4l/libv4l-1.0.0-r99.ebuild b/media-libs/libv4l/libv4l-1.6.2-r99.ebuild
similarity index 59%
rename from media-libs/libv4l/libv4l-1.0.0-r99.ebuild
rename to media-libs/libv4l/libv4l-1.6.2-r99.ebuild
index 51985fb..978b0a9 100644
--- a/media-libs/libv4l/libv4l-1.0.0-r99.ebuild
+++ b/media-libs/libv4l/libv4l-1.6.2-r99.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-1.0.0.ebuild,v 1.6 2014/07/28 13:46:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-1.6.2.ebuild,v 1.5 2015/07/16 15:45:55 klausman Exp $
EAPI=5
-inherit eutils linux-info udev multilib-minimal autotools
+inherit eutils flag-o-matic linux-info multilib-minimal
MY_P=v4l-utils-${PV}
@@ -14,17 +14,16 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
+IUSE="jpeg"
# 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:=
+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(-)] )"
+ 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
@@ -38,18 +37,21 @@ pkg_setup() {
}
src_prepare() {
- epatch ${FILESDIR}/${P}-configure.patch
- epatch ${FILESDIR}/${P}-off_t.patch
- eautoreconf
+ epatch "${FILESDIR}"/${P}-off_t.patch
+ epatch "${FILESDIR}"/${P}-musl-open64-mmap64.patch
+ epatch "${FILESDIR}"/${P}-musl-ioctl.patch
+ multilib_copy_sources
}
multilib_src_configure() {
+ # Hard disable the flags that apply only to the utils.
ECONF_SOURCE=${S} \
econf \
--disable-static \
--disable-qv4l2 \
--disable-v4l-utils \
- --with-udevdir="$(get_udevdir)"
+ --without-libudev \
+ $(use_with jpeg)
}
multilib_src_compile() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: media-libs/libv4l/, media-libs/libv4l/files/
@ 2017-09-05 13:39 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2017-09-05 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 48c7bcf4c79c2d46b732894afee7e6bffb179c36
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Sep 4 07:30:35 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:39:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=48c7bcf4
media-libs/libv4l: in tree version works
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
media-libs/libv4l/Manifest | 7 --
.../libv4l/files/libv4l-1.6.2-musl-ioctl.patch | 30 ------
.../files/libv4l-1.6.2-musl-open64-mmap64.patch | 108 ---------------------
media-libs/libv4l/files/libv4l-1.6.2-off_t.patch | 16 ---
.../libv4l/files/libv4l-1.6.2-sysmacros.patch | 57 -----------
media-libs/libv4l/libv4l-1.6.2.ebuild | 68 -------------
media-libs/libv4l/metadata.xml | 26 -----
7 files changed, 312 deletions(-)
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
deleted file mode 100644
index 78a5c9b..0000000
--- a/media-libs/libv4l/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libv4l-1.6.2-musl-ioctl.patch 1138 SHA256 fddb0ec60a66fe9963aba4b01d34a03c9f6ee523ca8b8c037ee155428bcb513f SHA512 5051aeff12d5cd538bf2d071ca61437ec2565f2326d610ebf2ba0dce8b65c373ca61ca406d0867f6e2bbcc4601b5bcc1ff0ace9786e5b53395b0f5fe4a103fad WHIRLPOOL 90b181aa72c1588ad75fedb46061b13d451a4a08f59397c18de0752eb0dd8be1289c04afbaa95e210a1634963bb7d43d640edfcd1d18e163a6f9179096a90161
-AUX libv4l-1.6.2-musl-open64-mmap64.patch 2490 SHA256 d2a94392ace321c4c4a9ad78098ecee53f62402bef987cefd2909191abd24a46 SHA512 3487e905ac08c8a80829c3f75d82f13b098cac48784f0e0620eea4478a1f8e5aa5fd7eadcea3c188120df5c781c0e7dcbf36a63130d95cfadc2633a0e9a11064 WHIRLPOOL bb7e3820669ab5ae0c6b97cc5bc86c609b605bd9202e97e75ad735af8982b717b09fe1918ebe869b98c76a17392f19a20660ba54f7b5d2160197db0368e875b3
-AUX libv4l-1.6.2-off_t.patch 603 SHA256 ee7cebd020b29a7ed9a92fb2ff5be76d37fd714671c8530dd2ff6eb900b072b9 SHA512 27429e512fd2d6115e68ca3d62e90f3bf0c9ddda9deabee03cca35b653e228a16079fb8e488e6f434eef3eeacaada52c16d413f913b7c3395fa2225f6a7b4931 WHIRLPOOL fce897fa42306d50b321aed3e5a9db80c8f7bbdbe89cab8bc92a80adaf9d7dc5f1166d5cce2e626289845a6191c413ac92e56b40055aff6fd9f4b3ee8ed44ff7
-AUX libv4l-1.6.2-sysmacros.patch 1821 SHA256 702a8a81073fa35dafdcb69410d0626aaf5af7df2cbe31d135d7ed7e330ab3b2 SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55 WHIRLPOOL 2e008b1d1e018dde80cd3b435eb7f08a8d4e154d97d74a272817e85604330a22b76de4a7cad814fd13970e4b489a7d1f8398b913114c387087624f5a2aeeecc5
-DIST v4l-utils-1.6.2.tar.bz2 1148309 SHA256 d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 WHIRLPOOL bd1b825354ca52e62e8c5f83d43bfd2cec63611c65d6b2709a7274fd15ae0fa21345d2b95a073c0b3a33b7c94b304562f1efcf112e1357a58515bd0d6f37f396
-EBUILD libv4l-1.6.2.ebuild 1669 SHA256 1e40efbe0562f0f3673c55d13f228c4a87dddc15b9151fa0f68b3f308b4f4887 SHA512 ec1b2af1fc938c91956b89e6d4505c44b00998be37526715912634f53b51be82e930729c11382b76793901020aab3a6110fa66cc942e267897b35a54eae91d7e WHIRLPOOL 11c2b81a6c852c8a309a526293e9034c08b93640d8eddd1c67b5ee0d093ab2dc0558bb891b8e476c6ed174de9e4ca76d0c980b4435942d5d3730f60457b58578
-MISC metadata.xml 1125 SHA256 1be1fac7b283729b4f1ebc9f53d12d21c6fe65839e7981794633ef8072209558 SHA512 5594f9030eb7da8b32c90e1710ebe6370339ef4fbb3a1b23a99024e9c0ef5bbbde31e421e3c9e23edf5e44709970fa1a60523c8fa615b90ce16437b28d5714c7 WHIRLPOOL e777f9b89fcb3b6626b5ca250606186f60b1f7433ccd3ccbad08fcff88d3b9b66a1ce41a7cca2684e926aa66fb180f29c3be4705e5c4bc893b3a019854213bd4
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch b/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch
deleted file mode 100644
index a84fcb0..0000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-musl defines `int ioctl (int, int, ...);` in <sys/ioctl.h>
-which is different than glibc and uClib.c which use an
-unsigned long int for the second paramater. `man 2 ioctl`
-
-Since there is no single standard here, meh.
-
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c
---- v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c 2015-07-18 14:50:06.220267837 +0000
-+++ v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c 2015-07-18 14:51:08.744265485 +0000
-@@ -72,7 +72,7 @@
- return v4l1_dup(fd);
- }
-
--LIBV4L_PUBLIC int ioctl(int fd, unsigned long int request, ...)
-+LIBV4L_PUBLIC int ioctl(int fd, int request, ...)
- {
- void *arg;
- va_list ap;
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c
---- v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c 2015-07-18 14:50:06.220267837 +0000
-+++ v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c 2015-07-18 14:50:59.348265838 +0000
-@@ -96,7 +96,7 @@
- return v4l2_dup(fd);
- }
-
--LIBV4L_PUBLIC int ioctl(int fd, unsigned long int request, ...)
-+LIBV4L_PUBLIC int ioctl(int fd, int request, ...)
- {
- void *arg;
- va_list ap;
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch b/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch
deleted file mode 100644
index 043b9b3..0000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Note that musl uses
-
-#define open64 open
-
-in <fcntl.h> and
-
-#define mmap64 mmap
-
-in <sys/mman.h>. These break with the following attempt to wrap the libc
-function. Its (hopefully?) safe to remove them because of the musl defines.
-
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c
---- v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c 2013-06-28 20:10:56.000000000 +0000
-+++ v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c 2015-07-18 14:44:18.140280932 +0000
-@@ -62,28 +62,6 @@
- return fd;
- }
-
--#ifdef linux
--LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
--{
-- int fd;
--
-- if (oflag & O_CREAT) {
-- va_list ap;
-- mode_t mode;
--
-- va_start(ap, oflag);
-- mode = va_arg(ap, mode_t);
--
-- fd = v4l1_open(file, oflag | O_LARGEFILE, mode);
--
-- va_end(ap);
-- } else
-- fd = v4l1_open(file, oflag | O_LARGEFILE);
--
-- return fd;
--}
--#endif
--
- LIBV4L_PUBLIC int close(int fd)
- {
- return v4l1_close(fd);
-@@ -117,14 +95,6 @@
- return v4l1_mmap(start, length, prot, flags, fd, offset);
- }
-
--#ifdef linux
--LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
-- __off64_t offset)
--{
-- return v4l1_mmap(start, length, prot, flags, fd, offset);
--}
--#endif
--
- LIBV4L_PUBLIC int munmap(void *start, size_t length)
- {
- return v4l1_munmap(start, length);
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c
---- v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c 2013-06-28 20:10:56.000000000 +0000
-+++ v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c 2015-07-18 14:44:03.728281474 +0000
-@@ -86,31 +86,6 @@
- return fd;
- }
-
--#ifdef linux
--LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
--{
-- int fd;
--
-- /* original open code */
-- if (oflag & O_CREAT) {
-- va_list ap;
-- mode_t mode;
--
-- va_start(ap, oflag);
-- mode = va_arg(ap, PROMOTED_MODE_T);
--
-- fd = open(file, oflag | O_LARGEFILE, mode);
--
-- va_end(ap);
-- } else {
-- fd = open(file, oflag | O_LARGEFILE);
-- }
-- /* end of original open code */
--
-- return fd;
--}
--#endif
--
- LIBV4L_PUBLIC int close(int fd)
- {
- return v4l2_close(fd);
-@@ -144,14 +119,6 @@
- return v4l2_mmap(start, length, prot, flags, fd, offset);
- }
-
--#ifdef linux
--LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
-- __off64_t offset)
--{
-- return v4l2_mmap(start, length, prot, flags, fd, offset);
--}
--#endif
--
- LIBV4L_PUBLIC int munmap(void *start, size_t length)
- {
- return v4l2_munmap(start, length);
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch b/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch
deleted file mode 100644
index 03667a2..0000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4lconvert/libv4lsyscall-priv.h v4l-utils-1.6.2/lib/libv4lconvert/libv4lsyscall-priv.h
---- v4l-utils-1.6.2.orig/lib/libv4lconvert/libv4lsyscall-priv.h 2013-06-28 20:10:56.000000000 +0000
-+++ v4l-utils-1.6.2/lib/libv4lconvert/libv4lsyscall-priv.h 2015-07-18 13:41:01.904423751 +0000
-@@ -59,7 +59,12 @@
- #define _IOC_SIZE(cmd) IOCPARM_LEN(cmd)
- #define MAP_ANONYMOUS MAP_ANON
- #define MMAP2_PAGE_SHIFT 0
-+#endif
-+
-+#if !defined(__GLIBC__) && !defined(__UCLIBC__)
-+#include <sys/types.h>
- typedef off_t __off_t;
-+typedef off64_t __off64_t;
- #endif
-
- #undef SYS_OPEN
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
deleted file mode 100644
index db49740..0000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index 3e323ff..0000000
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic 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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch
- epatch "${FILESDIR}"/${P}-off_t.patch
- epatch "${FILESDIR}"/${P}-musl-open64-mmap64.patch
- epatch "${FILESDIR}"/${P}-musl-ioctl.patch
- multilib_copy_sources
-}
-
-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/metadata.xml b/media-libs/libv4l/metadata.xml
deleted file mode 100644
index e0bdc27..0000000
--- a/media-libs/libv4l/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>tetromino@gentoo.org</email>
- <name>Alexandre Rostovtsev</name>
- </maintainer>
- <longdescription lang="en">
- libv4l is a collection of libraries which adds a thin abstraction layer on
- top of video4linux2 devices. The purpose of this (thin) layer is to make it
- easy for application writers to support a wide variety of devices without
- having to write separate code for different devices in the same class.
-
- libv4l consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
-
- libv4lconvert offers functions to convert from any (known) pixelformat
- to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420.
-
- libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent
- of the drivers for those devices supporting v4l1 compatibility (which many
- v4l2 drivers do not).
-
- libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
- application transparent libv4lconvert conversion where necessary.
- </longdescription>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-05 13:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-18 15:02 [gentoo-commits] proj/musl:master commit in: media-libs/libv4l/, media-libs/libv4l/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2017-09-05 13:39 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox