package/libv4l: bump version to 1.18.0
PATCH v2 1/1 package/libv4l: bump version to 1.18.0
- remove 0001-fixup-lfs-mismatch-in-preload-libraries.patch (Upstream applied [1])
- remove 0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch (Upstream applied [2])
- remove 0003-Build-sdlcam-only-if-jpeg-is-enabled.patch (Upstream applied [3])
- remove 0004-v4l2-compliance-needs-fork.patch
(Upstream applied [4])
Despite all patches (specially the ones touching configure.ac/Makefile.am) removed keep LIBV4L_AUTORECONF = YES to get utils/qv4l linker flags right (seems the original debian based libtool sets a wrong link_all_deplibs parameter), see [5] for details.
[1] https://git.linuxtv.org/v4l-utils.git/commit/?id=9f0354c3320f3cc62983f726bfed66e1d0c21f83
[2] https://git.linuxtv.org/v4l-utils.git/commit/?id=a3367e92f4b06667a36fb9485f22f7df52891a2f
[3] https://git.linuxtv.org/v4l-utils.git/commit/?id=692c2f0f35dd663e84d363867f2841d387726154
[4] https://git.linuxtv.org/v4l-utils.git/commit/?id=577ab225929c4e8dce7d2b911eeed38469a559bb
[5] http://lists.busybox.net/pipermail/buildroot/2019-October/261558.html
---
Changes v1 -> v2:
- add rational and comment for keeping LIBV4L_AUTORECONF
--- ...up-lfs-mismatch-in-preload-libraries.patch | 44 ----------- ...VIOCSCLOCKID-related-compile-failure.patch | 35 --------- ...Build-sdlcam-only-if-jpeg-is-enabled.patch | 31 -------- .../0004-v4l2-compliance-needs-fork.patch | 76 ------------------- package/libv4l/libv4l.hash | 5 +- package/libv4l/libv4l.mk | 4 +- 6 files changed, 5 insertions(+), 190 deletions(-) delete mode 100644 package/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch delete mode 100644 package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch delete mode 100644 package/libv4l/0003-Build-sdlcam-only-if-jpeg-is-enabled.patch delete mode 100644 package/libv4l/0004-v4l2-compliance-needs-fork.patch
package/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch deleted +0 -44
@@ -1,44 +0,0 @@ -From e5952b043a71fe83fbc392e498e8f77774fca0d8 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <[email protected]> -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 <[email protected]> ---- - 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
package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 663b7be9d27c979c914011a3ce707e227987bc59 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <[email protected]> -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 <[email protected]> ---- - 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 -
package/libv4l/0003-Build-sdlcam-only-if-jpeg-is-enabled.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 5c407e130f8d0416f91f5a12bcdc2709f00dda65 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -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 <[email protected]> ---- - 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 -
package/libv4l/0004-v4l2-compliance-needs-fork.patch deleted +0 -76
76 lines not on this page · raw message
package/libv4l/libv4l.hash +3 -2
@@ -1,7 +1,8 @@ # Locally calculated after checking signature -# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.6.tar.bz2.asc +# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.18.0.tar.bz2.asc # with key 05D0169C26E41593418129DF199A64FADFB500FF -sha256 f9dac1878e3d5636eab7f56bb209fdfc66b94ee8a2aae54dcb4282fe63a678ae v4l-utils-1.16.6.tar.bz2 +sha256 6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d v4l-utils-1.18.0.tar.bz2 + # Locally calculated sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l
package/libv4l/libv4l.mk +2 -2
@@ -4,13 +4,13 @@ # ################################################################################ -LIBV4L_VERSION = 1.16.6 +LIBV4L_VERSION = 1.18.0 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES LIBV4L_DEPENDENCIES = host-pkgconf LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap -# We're patching contrib/test/Makefile.am +# needed to get utils/qv4l link flags right LIBV4L_AUTORECONF = YES # add host-gettext for AM_ICONV macro LIBV4L_DEPENDENCIES += host-gettext
--
2.23.0
Thomas Petazzoni
AppliedPATCH v2 1/1 package/libv4l: bump version to 1.18.0
Quoted 24 lines · On Mon, 21 Oct 2019 20:45:10 +0200 Peter Seiderer <[email protected]> wrote:
- remove 0001-fixup-lfs-mismatch-in-preload-libraries.patch (Upstream applied [1])
- remove 0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch (Upstream applied [2])
- remove 0003-Build-sdlcam-only-if-jpeg-is-enabled.patch (Upstream applied [3])
- remove 0004-v4l2-compliance-needs-fork.patch
(Upstream applied [4])Despite all patches (specially the ones touching configure.ac/Makefile.am) removed keep
LIBV4L_AUTORECONF= YES to get utils/qv4l linker flags right (seems the original debian based libtool sets a wronglink_all_deplibsparameter), see [5] for details.[1] https://git.linuxtv.org/v4l-utils.git/commit/?id=9f0354c3320f3cc62983f726bfed66e1d0c21f83
[2] https://git.linuxtv.org/v4l-utils.git/commit/?id=a3367e92f4b06667a36fb9485f22f7df52891a2f
[3] https://git.linuxtv.org/v4l-utils.git/commit/?id=692c2f0f35dd663e84d363867f2841d387726154
[4] https://git.linuxtv.org/v4l-utils.git/commit/?id=577ab225929c4e8dce7d2b911eeed38469a559bb
[5] http://lists.busybox.net/pipermail/buildroot/2019-October/261558.htmlSigned-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- add rational and comment for keepingLIBV4L_AUTORECONF
Quoted 12 lines
--- ...up-lfs-mismatch-in-preload-libraries.patch | 44 ----------- ...VIOCSCLOCKID-related-compile-failure.patch | 35 --------- ...Build-sdlcam-only-if-jpeg-is-enabled.patch | 31 -------- .../0004-v4l2-compliance-needs-fork.patch | 76 ------------------- package/libv4l/libv4l.hash | 5 +- package/libv4l/libv4l.mk | 4 +- 6 files changed, 5 insertions(+), 190 deletions(-) delete mode 100644 package/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch delete mode 100644 package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch delete mode 100644 package/libv4l/0003-Build-sdlcam-only-if-jpeg-is-enabled.patch delete mode 100644 package/libv4l/0004-v4l2-compliance-needs-fork.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com