gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libv4l: Bump version to 1.0.1 

Quite some work has been done from 0.8.3 to 1.0.1, and as a result
this commit is very intrusive. The biggest change is the move to an
autotools package.

Then, the options that enable utilities individually have been deprecated
and moved to Config.in.legacy. Instead, we introduce new option to select
either all the utilities. This change loses granularity in favor of
maintainability.

[Peter: needs host-pkgconf. Select and use argp-standalone on uClibc]
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Ezequiel García 2014-07-05 18:07:40 -03:00 committed by Peter Korsgaard
parent de7c42fdf4
commit 07ac045655
6 changed files with 120 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Config.in.legacy
View File

@ -128,6 +128,46 @@ config BR2_PACKAGE_PROCPS
help
The procps package has been replaced by the equivalent procps-ng.
config BR2_PACKAGE_LIBV4L_DECODE_TM6000
bool "decode_tm6000"
select BR2_PACKAGE_LIBV4L_UTILS
select BR2_LEGACY
help
This libv4l option has been deprecated and replaced by a single
option to build all the libv4l utilities.
config BR2_PACKAGE_LIBV4L_IR_KEYTABLE
bool "ir-keytable"
select BR2_PACKAGE_LIBV4L_UTILS
select BR2_LEGACY
help
This libv4l option has been deprecated and replaced by a single
option to build all the libv4l utilities.
config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE
bool "v4l2-compliance"
select BR2_PACKAGE_LIBV4L_UTILS
select BR2_LEGACY
help
This libv4l option has been deprecated and replaced by a single
option to build all the libv4l utilities.
config BR2_PACKAGE_LIBV4L_V4L2_CTL
bool "v4l2-ctl"
select BR2_PACKAGE_LIBV4L_UTILS
select BR2_LEGACY
help
This libv4l option has been deprecated and replaced by a single
option to build all the libv4l utilities.
config BR2_PACKAGE_LIBV4L_V4L2_DBG
bool "v4l2-dbg"
select BR2_PACKAGE_LIBV4L_UTILS
select BR2_LEGACY
help
This libv4l option has been deprecated and replaced by a single
option to build all the libv4l utilities.
###############################################################################
comment "Legacy options removed in 2014.05"

65
package/libv4l/Config.in
View File

@ -3,63 +3,30 @@ config BR2_PACKAGE_LIBV4L
depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_JPEG
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
help
libv4l is an accompanying collection of libraries that adds a thin
abstraction layer on top of video4linux2 (V4L2) devices.
libv4l is a collection of libraries which adds a thin abstraction
layer on top of video4linux2 devices. libv4l consists of 3 different
libraries: libv4lconvert, libv4l1 and libv4l2.
http://freshmeat.net/projects/libv4l
if BR2_PACKAGE_LIBV4L
config BR2_PACKAGE_LIBV4L_DECODE_TM6000
bool "decode_tm6000"
depends on BR2_TOOLCHAIN_USES_GLIBC
comment "libv4l JPEG support not enabled"
depends on !BR2_PACKAGE_JPEG
config BR2_PACKAGE_LIBV4L_UTILS
bool "v4l-utils tools"
help
Tool to decode tm6000 proprietary format streams
comment "decode_tm6000 needs an (e)glibc toolchain"
depends on !BR2_TOOLCHAIN_USES_GLIBC
config BR2_PACKAGE_LIBV4L_IR_KEYTABLE
bool "ir-keytable"
depends on BR2_TOOLCHAIN_USES_GLIBC
help
Tool to alter keymaps of Remote Controller devices
comment "ir-keytable needs an (e)glibc toolchain"
depends on !BR2_TOOLCHAIN_USES_GLIBC
config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE
bool "v4l2-compliance"
depends on BR2_INSTALL_LIBSTDCPP
help
Tool to test v4l2 API compliance of drivers
comment "v4l2-compliance needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP
config BR2_PACKAGE_LIBV4L_V4L2_CTL
bool "v4l2-ctl"
depends on BR2_INSTALL_LIBSTDCPP
default y
help
Tool to configure v4l2 controls from the cmdline
comment "v4l2-ctl needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP
config BR2_PACKAGE_LIBV4L_V4L2_DBG
bool "v4l2-dbg"
depends on BR2_INSTALL_LIBSTDCPP
help
Tool to directly get and set registers of v4l2 devices
comment "v4l2-dbg needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP
v4l-utils is a collection of various video4linux and DVB utilities.
Enable this if you want to build the following tools:
cx18-ctl, ir-keytable, ivtv-ctl, v4l2-ctl, v4l2-sysfs-path and
others.
endif
comment "libv4l needs a toolchain w/ largefile, threads"
depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
comment "libv4l needs a toolchain w/ largefile, threads and C++"
depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU

44
package/libv4l/libv4l-0001-fixup-lfs-mismatch-in-preload-libraries.patch Normal file
View File

@ -0,0 +1,44 @@
From e5952b043a71fe83fbc392e498e8f77774fca0d8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 28 Jun 2014 09:32:53 -0300
Subject: [PATCH] fixup lfs mismatch in preload libraries
Ensure that the lfs variants are not transparently used instead of the !lfs
ones so both can be wrapped, independently of any custom CFLAGS/CPPFLAGS.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
lib/libv4l1/v4l1compat.c | 3 +++
lib/libv4l2/v4l2convert.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c
index e328288..70eb74f 100644
--- a/lib/libv4l1/v4l1compat.c
+++ b/lib/libv4l1/v4l1compat.c
@@ -19,6 +19,9 @@
# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
*/
+/* ensure we see *64 variants and they aren't transparently used */
+#undef _LARGEFILE_SOURCE
+#undef _FILE_OFFSET_BITS
#define _LARGEFILE64_SOURCE 1
#include <config.h>
diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c
index 9b46ab8..bc41056 100644
--- a/lib/libv4l2/v4l2convert.c
+++ b/lib/libv4l2/v4l2convert.c
@@ -23,6 +23,9 @@
/* prevent GCC 4.7 inlining error */
#undef _FORTIFY_SOURCE
+/* ensure we see *64 variants and they aren't transparently used */
+#undef _LARGEFILE_SOURCE
+#undef _FILE_OFFSET_BITS
#define _LARGEFILE64_SOURCE 1
#include <config.h>
--
1.9.1

39
package/libv4l/libv4l-01-largefile.patch
View File

@ -1,39 +0,0 @@
[PATCH] fixup lfs mismatch in preload libraries
Ensure that the lfs variants are not transparently used instead of the !lfs
ones so both can be wrapped, independently of any custom CFLAGS/CPPFLAGS.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
lib/libv4l1/v4l1compat.c | 3 +++
lib/libv4l2/v4l2convert.c | 3 +++
2 files changed, 6 insertions(+)
Index: v4l-utils-0.8.5/lib/libv4l1/v4l1compat.c
===================================================================
--- v4l-utils-0.8.5.orig/lib/libv4l1/v4l1compat.c
+++ v4l-utils-0.8.5/lib/libv4l1/v4l1compat.c
@@ -19,6 +19,9 @@
# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
*/
+/* ensure we see *64 variants and they aren't transparently used */
+#undef _LARGEFILE_SOURCE
+#undef _FILE_OFFSET_BITS
#define _LARGEFILE64_SOURCE 1
#include <stdlib.h>
Index: v4l-utils-0.8.5/lib/libv4l2/v4l2convert.c
===================================================================
--- v4l-utils-0.8.5.orig/lib/libv4l2/v4l2convert.c
+++ v4l-utils-0.8.5/lib/libv4l2/v4l2convert.c
@@ -20,6 +20,9 @@
# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
*/
+/* ensure we see *64 variants and they aren't transparently used */
+#undef _LARGEFILE_SOURCE
+#undef _FILE_OFFSET_BITS
#define _LARGEFILE64_SOURCE 1
#include <stdarg.h>

34
package/libv4l/libv4l-02-use-openat-when-available.patch
View File

@ -1,34 +0,0 @@
From: Riku Voipio <riku.voipio@linaro.org>
Date: Tue, 22 Jan 2013 15:37:22 +0000 (-0300)
Subject: v4l-utils: use openat when available
X-Git-Tag: v4l-utils-0.9.4~61
X-Git-Url: http://git.linuxtv.org
v4l-utils: use openat when available
New architectures such as 64-Bit arm build kernels without legacy
system calls - Such as the the no-at system calls. Thus, use
SYS_openat whenever it is available.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
diff --git a/lib/libv4lconvert/libv4lsyscall-priv.h b/lib/libv4lconvert/libv4lsyscall-priv.h
index 2dac49a..cdd38bc 100644
--- a/lib/libv4lconvert/libv4lsyscall-priv.h
+++ b/lib/libv4lconvert/libv4lsyscall-priv.h
@@ -72,8 +72,13 @@ typedef off_t __off_t;
#ifndef CONFIG_SYS_WRAPPER
+#ifdef SYS_openat
+#define SYS_OPEN(file, oflag, mode) \
+ syscall(SYS_openat, AT_FDCWD, (const char *)(file), (int)(oflag), (mode_t)(mode))
+#else
#define SYS_OPEN(file, oflag, mode) \
syscall(SYS_open, (const char *)(file), (int)(oflag), (mode_t)(mode))
+#endif
#define SYS_CLOSE(fd) \
syscall(SYS_close, (int)(fd))
#define SYS_IOCTL(fd, cmd, arg) \

50
package/libv4l/libv4l.mk
View File

@ -4,42 +4,32 @@
#
################################################################################
LIBV4L_VERSION = 0.8.9
LIBV4L_VERSION = 1.0.1
LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils/
LIBV4L_INSTALL_STAGING = YES
LIBV4L_MAKE_OPTS = PREFIX=/usr
LIBV4L_DEPENDENCIES = jpeg
LIBV4L_DEPENDENCIES = host-pkgconf
# v4l-utils components have different licences, see v4l-utils.spec for details
LIBV4L_LICENSE = GPLv2+ (utilities), LGPLv2.1+ (libraries)
LIBV4L_LICENSE_FILES = COPYING COPYING.LIB lib/libv4l1/libv4l1-kernelcode-license.txt
LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt
LIBV4L_DIRS_y += lib
LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_DECODE_TM6000) += utils/libv4l2util utils/decode_tm6000
LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_IR_KEYTABLE) += utils/keytable
LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE) += utils/v4l2-compliance
LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_V4L2_CTL) += utils/v4l2-ctl
LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_V4L2_DBG) += utils/v4l2-dbg
ifeq ($(BR2_PREFER_STATIC_LIB),y)
LIBV4L_MAKE_OPTS += LINKTYPE=static
ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
LIBV4L_DEPENDENCIES += argp-standalone
LIBV4L_CONF_ENV += LIBS="-largp"
endif
define LIBV4L_BUILD_CMDS
for i in $(LIBV4L_DIRS_y); do \
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
$(LIBV4L_MAKE_OPTS) || exit 1 ; done
endef
ifeq ($(BR2_PACKAGE_JPEG),y)
LIBV4L_DEPENDENCIES += jpeg
LIBV4L_CONF_OPT += --with-jpeg
else
LIBV4L_CONF_OPT += --without-jpeg
endif
define LIBV4L_INSTALL_STAGING_CMDS
for i in $(LIBV4L_DIRS_y); do \
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
DESTDIR=$(STAGING_DIR) $(LIBV4L_MAKE_OPTS) install || exit 1; done
endef
ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
LIBV4L_CONF_OPT += --enable-v4l-utils
else
LIBV4L_CONF_OPT += --disable-v4l-utils
endif
define LIBV4L_INSTALL_TARGET_CMDS
for i in $(LIBV4L_DIRS_y); do \
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install || exit 1; done
endef
$(eval $(generic-package))
$(eval $(autotools-package))