commit: 05f6da75ba2013cb09fcfb1818e7e915f2807631
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sun Aug 3 07:35:14 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct 10 18:20:32 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=05f6da75
media-libs/libv4l: Remove argp.h check and disable wrappers
---
.../libv4l/files/libv4l-1.0.0-configure.patch | 27 +++++++++
media-libs/libv4l/files/libv4l-1.0.0-off_t.patch | 11 ++++
media-libs/libv4l/libv4l-1.0.0-r99.ebuild | 66 ++++++++++++++++++++++
media-libs/libv4l/metadata.xml | 28 +++++++++
4 files changed, 132 insertions(+)
diff --git a/media-libs/libv4l/files/libv4l-1.0.0-configure.patch
b/media-libs/libv4l/files/libv4l-1.0.0-configure.patch
new file mode 100644
index 0000000..d9437e6
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.0.0-configure.patch
@@ -0,0 +1,27 @@
+--- 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
new file mode 100644
index 0000000..4fdd632
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.0.0-off_t.patch
@@ -0,0 +1,11 @@
+--- 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/libv4l-1.0.0-r99.ebuild
b/media-libs/libv4l/libv4l-1.0.0-r99.ebuild
new file mode 100644
index 0000000..70e5e11
--- /dev/null
+++ b/media-libs/libv4l/libv4l-1.0.0-r99.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 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 $
+
+EAPI=5
+inherit eutils linux-info udev multilib-minimal autotools
+
+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="amd64 arm ~mips x86"
+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
+}
+
+src_prepare() {
+ epatch ${FILESDIR}/${P}-configure.patch
+ epatch ${FILESDIR}/${P}-off_t.patch
+ eautoreconf
+}
+
+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/metadata.xml b/media-libs/libv4l/metadata.xml
new file mode 100644
index 0000000..1e04bfc
--- /dev/null
+++ b/media-libs/libv4l/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <herd>media-tv</herd>
+ <maintainer>
+ <email>[email protected]</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>
+
