Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -1,59 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 663b7be9d27c979c914011a3ce707e227987bc59 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sat, 3 Feb 2018 22:47:18 +0100
|
||||
Subject: [PATCH] keytable: fix EVIOCSCLOCKID related compile failure
|
||||
|
||||
Fixes:
|
||||
|
||||
keytable.c: In function 'test_event':
|
||||
keytable.c:1351:12: error: 'EVIOCSCLOCKID' undeclared (first use in this function)
|
||||
ioctl(fd, EVIOCSCLOCKID, &mode);
|
||||
^~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
utils/keytable/keytable.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
|
||||
index 34a1522e..925eab00 100644
|
||||
--- a/utils/keytable/keytable.c
|
||||
+++ b/utils/keytable/keytable.c
|
||||
@@ -55,6 +55,10 @@ struct input_keymap_entry_v2 {
|
||||
u_int8_t scancode[32];
|
||||
};
|
||||
|
||||
+#ifndef EVIOCSCLOCKID
|
||||
+#define EVIOCSCLOCKID _IOW('E', 0xa0, int)
|
||||
+#endif
|
||||
+
|
||||
#ifndef EVIOCGKEYCODE_V2
|
||||
#define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry_v2)
|
||||
#define EVIOCSKEYCODE_V2 _IOW('E', 0x04, struct input_keymap_entry_v2)
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From abfe3e7b2b4af1de9b891f3a7a996b70533b0a27 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sun, 4 Mar 2018 09:07:51 +0100
|
||||
Subject: [PATCH] libdvbv5: add optional copy of TEMP_FAILURE_RETRY macro (fix
|
||||
musl compile)
|
||||
|
||||
Fixes:
|
||||
|
||||
../../lib/libdvbv5/.libs/libdvbv5.so: undefined reference to `TEMP_FAILURE_RETRY'
|
||||
|
||||
[Upstream: https://www.mail-archive.com/linux-media@vger.kernel.org/msg127134.html]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
lib/libdvbv5/dvb-dev-local.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/lib/libdvbv5/dvb-dev-local.c b/lib/libdvbv5/dvb-dev-local.c
|
||||
index 8bc99d1..7a76d65 100644
|
||||
--- a/lib/libdvbv5/dvb-dev-local.c
|
||||
+++ b/lib/libdvbv5/dvb-dev-local.c
|
||||
@@ -44,6 +44,15 @@
|
||||
# define _(string) string
|
||||
#endif
|
||||
|
||||
+/* taken from glibc unistd.h */
|
||||
+#ifndef TEMP_FAILURE_RETRY
|
||||
+#define TEMP_FAILURE_RETRY(expression) \
|
||||
+ ({ long int __result; \
|
||||
+ do __result = (long int) (expression); \
|
||||
+ while (__result == -1L && errno == EINTR); \
|
||||
+ __result; })
|
||||
+#endif
|
||||
+
|
||||
struct dvb_dev_local_priv {
|
||||
dvb_dev_change_t notify_dev_change;
|
||||
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 5c407e130f8d0416f91f5a12bcdc2709f00dda65 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 29 Jun 2018 21:15:10 +0200
|
||||
Subject: [PATCH] Build sdlcam only if jpeg is enabled
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.net/results/1eded8b44cc369550566c6ce0b3c042f1aec8d44
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
contrib/test/Makefile.am | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am
|
||||
index 0188fe21..c7c38e7a 100644
|
||||
--- a/contrib/test/Makefile.am
|
||||
+++ b/contrib/test/Makefile.am
|
||||
@@ -17,8 +17,10 @@ noinst_PROGRAMS += v4l2gl
|
||||
endif
|
||||
|
||||
if HAVE_SDL
|
||||
+if HAVE_JPEG
|
||||
noinst_PROGRAMS += sdlcam
|
||||
endif
|
||||
+endif
|
||||
|
||||
driver_test_SOURCES = driver-test.c
|
||||
driver_test_LDADD = ../../utils/libv4l2util/libv4l2util.la
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
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.
|
||||
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
|
||||
|
||||
@@ -21,10 +20,9 @@ comment "libv4l JPEG support not enabled"
|
||||
|
||||
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.
|
||||
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
|
||||
@@ -37,12 +35,8 @@ config BR2_PACKAGE_LIBV4L_UTILS
|
||||
- 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 \
|
||||
comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS \
|
||||
|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
|
||||
|
||||
@@ -1,2 +1,7 @@
|
||||
# Locally calculated after checking signature
|
||||
# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2.asc
|
||||
sha256 7974e5626447407d8a1ed531da0461c0fe00e599a696cb548a240d17d3519005 v4l-utils-1.14.1.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 ac9f8c88bfffa3a7e85c0edd04f7d3d54e6a30c214e79f2c6ecc6fbf57cb229d v4l-utils-1.12.2.tar.bz2
|
||||
sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING
|
||||
sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l
|
||||
sha256 37d0f2c8dc3f267d864cb39d54f82c5092a599beb29cb5caa96d50d27e069a44 lib/libv4l1/libv4l1-kernelcode-license.txt
|
||||
|
||||
@@ -4,18 +4,22 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBV4L_VERSION = 1.12.2
|
||||
LIBV4L_VERSION = 1.14.1
|
||||
LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
|
||||
LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils
|
||||
LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
|
||||
LIBV4L_INSTALL_STAGING = YES
|
||||
LIBV4L_DEPENDENCIES = host-pkgconf
|
||||
LIBV4L_CONF_OPTS = --disable-doxygen-doc
|
||||
# We're patching contrib/test/Makefile.am
|
||||
LIBV4L_AUTORECONF = YES
|
||||
# add host-gettext for AM_ICONV macro
|
||||
LIBV4L_DEPENDENCIES += host-gettext
|
||||
|
||||
# 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 = GPL-2.0+ (utilities), LGPL-2.1+ (libraries)
|
||||
LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
|
||||
@@ -41,10 +45,7 @@ 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)
|
||||
@@ -53,19 +54,15 @@ 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
|
||||
LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
|
||||
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
|
||||
ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \
|
||||
ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \
|
||||
ac_cv_prog_UIC=$(HOST_DIR)/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"
|
||||
@@ -80,6 +77,10 @@ else
|
||||
LIBV4L_CONF_OPTS += --disable-v4l-utils
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y)
|
||||
LIBV4L_DEPENDENCIES += sdl2_image
|
||||
endif
|
||||
|
||||
LIBV4L_CONF_ENV += LIBS="$(LIBV4L_LIBS)"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user