libv4l: Bump version to 1.0.1
PATCH 1/1 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.
---
Changes from RFC v1:
* Moved to PATCH as suggested by Thomas
* Added a required dependency on toolchain C++ support
* Added support to enable/disable JPEG support
* Changed packages description based on v4l-utils.spec
Config.in.legacy | 40 ++++++++++++++ package/libv4l/Config.in | 61 ++++++---------------- ...1-fixup-lfs-mismatch-in-preload-libraries.patch | 44 ++++++++++++++++ package/libv4l/libv4l-01-largefile.patch | 39 -------------- .../libv4l-02-use-openat-when-available.patch | 34 ------------ package/libv4l/libv4l.mk | 46 ++++++---------- 6 files changed, 115 insertions(+), 149 deletions(-) create mode 100644 package/libv4l/libv4l-0001-fixup-lfs-mismatch-in-preload-libraries.patch delete mode 100644 package/libv4l/libv4l-01-largefile.patch delete mode 100644 package/libv4l/libv4l-02-use-openat-when-available.patch
Config.in.legacy +40 -0
@@ -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"
package/libv4l/Config.in +16 -45
79 lines not on this page · raw message
package/libv4l/libv4l-0001-fixup-lfs-mismatch-in-preload-libraries.patch new file +44 -0
44 lines not on this page · raw message
package/libv4l/libv4l-01-largefile.patch deleted +0 -39
@@ -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 <[email protected]> ---- - 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>
package/libv4l/libv4l-02-use-openat-when-available.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From: Riku Voipio <[email protected]> -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 <[email protected]> -Signed-off-by: Mauro Carvalho Chehab <[email protected]> ---- - -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) \
package/libv4l/libv4l.mk +15 -31
57 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 1/1 libv4l: Bump version to 1.0.1
Dear Ezequiel Garcia,
package/libv4l/Config.in config BR2_PACKAGE_LIBV4L · line 17
Quoted 5 lines · Ezequiel Garcia
package/libv4l/Config.in +2
-3-config BR2_PACKAGE_LIBV4L_V4L2_CTL - bool "v4l2-ctl" - depends on BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_LIBV4L_JPEG + bool "JPEG support"
I think there needs to be a justification as to why we want a sub-option to enable jpeg support, as opposed to have it directly handled as an optional dependency in the .mk file by testing BR2_PACKAGE_JPEG.
package/libv4l/Config.in config BR2_PACKAGE_LIBV4L · line 35
Quoted 4 lines
package/libv4l/Config.in +2
-1-comment "libv4l needs a toolchain w/ largefile, threads" +comment "libv4l needs a toolchain w/ largefile, threads and C++" depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_INSTALL_LIBSTDCPP
The main problem is here, you should use:
depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
Otherwise, the comment will not get displayed in the proper situations.
Can you fix that up and resend?
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 libv4l: Bump version to 1.0.1
Quoted 13 lines · Thomas Petazzoni
package/libv4l/Config.in config BR2_PACKAGE_LIBV4L · line 17
Quoted 5 lines · Ezequiel Garcia
package/libv4l/Config.in +2
-3-config BR2_PACKAGE_LIBV4L_V4L2_CTL - bool "v4l2-ctl" - depends on BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_LIBV4L_JPEG + bool "JPEG support"I think there needs to be a justification as to why we want a sub-option to enable jpeg support, as opposed to have it directly handled as an optional dependency in the .mk file by testing
BR2_PACKAGE_JPEG.
That could work, as long as we have a comment to show the dependency in the menu. Otherwise, I don't like to "hide" this from a user wanting to enable or disable this.
Quoted 7 lines
package/libv4l/Config.in config BR2_PACKAGE_LIBV4L · line 35
Quoted 4 lines
package/libv4l/Config.in +2
-1-comment "libv4l needs a toolchain w/ largefile, threads" +comment "libv4l needs a toolchain w/ largefile, threads and C++" depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_INSTALL_LIBSTDCPPThe main problem is here, you should use:
Quoted 6 lines
depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPPOtherwise, the comment will not get displayed in the proper situations.
Can you fix that up and resend?
No problem.
Signature · 2 lines
Ezequiel Garcia, VanguardiaSur www.vanguardiasur.com.ar