update buildroot to 2017.02.11
This commit is contained in:
@@ -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
|
||||
@@ -0,0 +1,59 @@
|
||||
From 9908872aaa614a6c4bba80d7a5f1adea7ca7117e Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Tue, 14 Feb 2017 21:27:59 +0100
|
||||
Subject: [PATCH] ir-ctl: fixes for musl compile
|
||||
|
||||
- add copy of TEMP_FAILURE_RETRY macro
|
||||
- use strdup instead of strdupa
|
||||
|
||||
Fixes [1]:
|
||||
|
||||
ir-ctl.c:(.text+0xb06): undefined reference to `strndupa'
|
||||
ir-ctl.c:(.text+0xe01): undefined reference to `TEMP_FAILURE_RETRY'
|
||||
|
||||
[1] http://autobuild.buildroot.net/results/b8b96c7bbf2147dacac62485cbfdbcfd758271a5
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
utils/ir-ctl/ir-ctl.c | 13 ++++++++++++-
|
||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c
|
||||
index bc58cee..e9da777 100644
|
||||
--- a/utils/ir-ctl/ir-ctl.c
|
||||
+++ b/utils/ir-ctl/ir-ctl.c
|
||||
@@ -44,6 +44,15 @@
|
||||
|
||||
# define N_(string) string
|
||||
|
||||
+/* taken from glibc unistd.h */
|
||||
+#ifndef TEMP_FAILURE_RETRY
|
||||
+#define TEMP_FAILURE_RETRY(expression) \
|
||||
+ (__extension__ \
|
||||
+ ({ long int __result; \
|
||||
+ do __result = (long int) (expression); \
|
||||
+ while (__result == -1L && errno == EINTR); \
|
||||
+ __result; }))
|
||||
+#endif
|
||||
|
||||
/* See drivers/media/rc/ir-lirc-codec.c line 23 */
|
||||
#define LIRCBUF_SIZE 512
|
||||
@@ -344,12 +353,14 @@ static struct file *read_scancode(const char *name)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- pstr = strndupa(name, p - name);
|
||||
+ pstr = strndup(name, p - name);
|
||||
|
||||
if (!protocol_match(pstr, &proto)) {
|
||||
fprintf(stderr, _("error: protocol '%s' not found\n"), pstr);
|
||||
+ free(pstr);
|
||||
return NULL;
|
||||
}
|
||||
+ free(pstr);
|
||||
|
||||
if (!strtoscancode(p + 1, &scancode)) {
|
||||
fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1);
|
||||
--
|
||||
2.11.0
|
||||
|
||||
48
bsp/buildroot-2017.02.11/package/libv4l/Config.in
Normal file
48
bsp/buildroot-2017.02.11/package/libv4l/Config.in
Normal file
@@ -0,0 +1,48 @@
|
||||
config BR2_PACKAGE_LIBV4L
|
||||
bool "libv4l"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers
|
||||
select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
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://linuxtv.org/wiki/index.php/V4l-utils
|
||||
|
||||
if BR2_PACKAGE_LIBV4L
|
||||
|
||||
comment "libv4l JPEG support not enabled"
|
||||
depends on !BR2_PACKAGE_JPEG
|
||||
|
||||
config BR2_PACKAGE_LIBV4L_UTILS
|
||||
bool "v4l-utils tools"
|
||||
depends on BR2_ENABLE_LOCALE
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
help
|
||||
v4l-utils is a collection of various video4linux and DVB utilities.
|
||||
Enable this if you want to build the following tools:
|
||||
- cx18-ctl
|
||||
- dvb-fe-tool, dvbv5-zap, dvbv5-scan, dvb-format-convert
|
||||
- decode_tm6000
|
||||
- ir-keytable
|
||||
- media-ctl
|
||||
- v4l2-compliance
|
||||
- v4l2-ctl, cx18-ctl, ivtv-ctl
|
||||
- v4l2-sysfs-path
|
||||
- rds-ctl
|
||||
- qv4l2 (if Qt is enabled)
|
||||
|
||||
comment "libv4l-utils tools need a toolchain w/ locale"
|
||||
depends on !BR2_ENABLE_LOCALE
|
||||
|
||||
endif
|
||||
|
||||
comment "libv4l needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
|
||||
|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
|
||||
2
bsp/buildroot-2017.02.11/package/libv4l/libv4l.hash
Normal file
2
bsp/buildroot-2017.02.11/package/libv4l/libv4l.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 ac9f8c88bfffa3a7e85c0edd04f7d3d54e6a30c214e79f2c6ecc6fbf57cb229d v4l-utils-1.12.2.tar.bz2
|
||||
85
bsp/buildroot-2017.02.11/package/libv4l/libv4l.mk
Normal file
85
bsp/buildroot-2017.02.11/package/libv4l/libv4l.mk
Normal file
@@ -0,0 +1,85 @@
|
||||
################################################################################
|
||||
#
|
||||
# libv4l
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBV4L_VERSION = 1.12.2
|
||||
LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
|
||||
LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils
|
||||
LIBV4L_INSTALL_STAGING = YES
|
||||
LIBV4L_DEPENDENCIES = host-pkgconf
|
||||
LIBV4L_CONF_OPTS = --disable-doxygen-doc
|
||||
|
||||
# fix uclibc-ng configure/compile
|
||||
LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
|
||||
|
||||
# v4l-utils components have different licences, see v4l-utils.spec for details
|
||||
LIBV4L_LICENSE = GPLv2+ (utilities), LGPLv2.1+ (libraries)
|
||||
LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
|
||||
LIBV4L_DEPENDENCIES += alsa-lib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
|
||||
LIBV4L_DEPENDENCIES += argp-standalone
|
||||
LIBV4L_LIBS += -largp
|
||||
endif
|
||||
|
||||
LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||
LIBV4L_DEPENDENCIES += jpeg
|
||||
LIBV4L_CONF_OPTS += --with-jpeg
|
||||
else
|
||||
LIBV4L_CONF_OPTS += --without-jpeg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
|
||||
LIBV4L_DEPENDENCIES += libgl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
LIBV4L_CONF_OPTS += --with-libudev
|
||||
LIBV4L_DEPENDENCIES += udev
|
||||
else
|
||||
LIBV4L_CONF_OPTS += --without-libudev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGLU),y)
|
||||
LIBV4L_DEPENDENCIES += libglu
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
|
||||
LIBV4L_CONF_OPTS += --enable-v4l-utils
|
||||
# clock_gettime is used, which is provided by librt for glibc < 2.17
|
||||
LIBV4L_LIBS += -lrt
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
LIBV4L_DEPENDENCIES += gettext
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)
|
||||
LIBV4L_CONF_OPTS += --enable-qv4l2
|
||||
LIBV4L_DEPENDENCIES += qt5base
|
||||
# protect against host version detection of moc-qt5/rcc-qt5/uic-qt5
|
||||
LIBV4L_CONF_ENV += \
|
||||
ac_cv_prog_MOC=$(HOST_DIR)/usr/bin/moc \
|
||||
ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc \
|
||||
ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic
|
||||
# qt5 needs c++11 (since qt-5.7)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
|
||||
endif
|
||||
else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
|
||||
LIBV4L_CONF_OPTS += --enable-qv4l2
|
||||
LIBV4L_DEPENDENCIES += qt
|
||||
else
|
||||
LIBV4L_CONF_OPTS += --disable-qv4l2
|
||||
endif
|
||||
else
|
||||
LIBV4L_CONF_OPTS += --disable-v4l-utils
|
||||
endif
|
||||
|
||||
LIBV4L_CONF_ENV += LIBS="$(LIBV4L_LIBS)"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user