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

["Alexis Ballier" <aballier@gentoo.org>]

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

media-tv/v4l-utils: bump to 1.14.1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

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

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

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch b/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch
new file mode 100644
index 00000000000..b8190507fc7
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch
@@ -0,0 +1,26 @@
+Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
+===================================================================
+--- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c
++++ v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
+@@ -20,9 +20,7 @@
+  */
+ 
+ #include <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-tv/v4l-utils/v4l-utils-1.14.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.14.1.ebuild
new file mode 100644
index 00000000000..eebf081d09a
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.14.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic udev xdg-utils
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
+SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="qt5"
+
+RDEPEND=">=media-libs/libv4l-${PV}
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		virtual/opengl
+		media-libs/alsa-lib
+	)
+	virtual/libudev
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.14.1-sysmacros.patch ) #580910
+
+src_configure() {
+	if use qt5; then
+		append-cxxflags -std=c++11
+		local qt5_paths=( \
+			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
+			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
+			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
+		)
+	fi
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable qt5 qv4l2) \
+		--with-udevdir="$(get_udevdir)" \
+		--without-jpeg \
+		"${qt5_paths[@]}"
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}