[v4l-utils 0/5] Misc build fixes

[v4l-utils 0/5] Misc build fixes

[Thomas Petazzoni]

Hello,

Here is a small set of fixes against v4l-utils that we have
accumulated in the Buildroot project to fix a number of build
issues. Those build issues are related to linking with the musl C
library, or do linking with the libintl library when the gettext
functions are not provided by the C library (which is what happens the
uClibc C library is used).

Thanks,

Thomas

Peter Seiderer (1):
  dvb/keytable: fix missing libintl linking

Thomas Petazzoni (4):
  libv4lsyscall-priv.h: Use off_t instead of __off_t
  utils: Properly use ENABLE_NLS for locale related code
  utils/v4l2-compliance: Include <fcntl.h> instead of <sys/fcntl.h>
  libv4lsyscall-priv.h: Only define SYS_mmap2 if needed

 lib/libv4l1/v4l1compat.c               |  3 +--
 lib/libv4l2/v4l2convert.c              |  5 ++---
 lib/libv4lconvert/libv4lsyscall-priv.h | 13 +++++--------
 utils/dvb/Makefile.am                  |  8 ++++----
 utils/dvb/dvb-fe-tool.c                |  2 ++
 utils/dvb/dvb-format-convert.c         |  2 ++
 utils/dvb/dvbv5-scan.c                 |  2 ++
 utils/dvb/dvbv5-zap.c                  |  2 ++
 utils/keytable/Makefile.am             |  1 +
 utils/keytable/keytable.c              |  2 ++
 utils/v4l2-compliance/v4l-helpers.h    |  2 +-
 11 files changed, 24 insertions(+), 18 deletions(-)

-- 
2.6.2

[v4l-utils 1/5] libv4lsyscall-priv.h: Use off_t instead of __off_t

[Thomas Petazzoni]

__off_t is a kernel internal symbol, which happens to be user-visible
with glibc, but not necessarily with other C libraries such as
musl. In v4l-utils code, it's mainly used for the mmap() prototype,
but the mmap() manpage really uses off_t, not __off_t.

Switching from __off_t to off_t allows the code to build properly with
musl.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 lib/libv4l1/v4l1compat.c               |  3 +--
 lib/libv4l2/v4l2convert.c              |  5 ++---
 lib/libv4lconvert/libv4lsyscall-priv.h | 11 +++--------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c
index 393896c..cb79629 100644
--- a/lib/libv4l1/v4l1compat.c
+++ b/lib/libv4l1/v4l1compat.c
@@ -26,7 +26,6 @@
 #include <stdarg.h>
 #include <fcntl.h>
 #include <libv4l1.h>
-#include "../libv4lconvert/libv4lsyscall-priv.h" /* for __off_t */
 
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -116,7 +115,7 @@ LIBV4L_PUBLIC ssize_t read(int fd, void *buffer, size_t n)
 }
 
 LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd,
-		__off_t offset)
+		off_t offset)
 {
 	return v4l1_mmap(start, length, prot, flags, fd, offset);
 }
diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c
index 0384c13..6abccbf 100644
--- a/lib/libv4l2/v4l2convert.c
+++ b/lib/libv4l2/v4l2convert.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include "../libv4lconvert/libv4lsyscall-priv.h"
 #include <linux/videodev2.h>
 #include <libv4l2.h>
 
@@ -148,14 +147,14 @@ LIBV4L_PUBLIC ssize_t read(int fd, void *buffer, size_t n)
 }
 
 LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd,
-		__off_t offset)
+		off_t offset)
 {
 	return v4l2_mmap(start, length, prot, flags, fd, offset);
 }
 
 #if defined(linux) && defined(__GLIBC__)
 LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
-		__off64_t offset)
+		off64_t offset)
 {
 	return v4l2_mmap(start, length, prot, flags, fd, offset);
 }
diff --git a/lib/libv4lconvert/libv4lsyscall-priv.h b/lib/libv4lconvert/libv4lsyscall-priv.h
index f548fb2..f87eff4 100644
--- a/lib/libv4lconvert/libv4lsyscall-priv.h
+++ b/lib/libv4lconvert/libv4lsyscall-priv.h
@@ -59,11 +59,6 @@
 #define	_IOC_SIZE(cmd) IOCPARM_LEN(cmd)
 #define	MAP_ANONYMOUS MAP_ANON
 #define	MMAP2_PAGE_SHIFT 0
-typedef off_t __off_t;
-#endif
-
-#if defined(ANDROID)
-typedef off_t __off_t;
 #endif
 
 #undef SYS_OPEN
@@ -95,15 +90,15 @@ typedef off_t __off_t;
 #if defined(__FreeBSD__)
 #define SYS_MMAP(addr, len, prot, flags, fd, off) \
 	__syscall(SYS_mmap, (void *)(addr), (size_t)(len), \
-			(int)(prot), (int)(flags), (int)(fd), (__off_t)(off))
+			(int)(prot), (int)(flags), (int)(fd), (off_t)(off))
 #elif defined(__FreeBSD_kernel__)
 #define SYS_MMAP(addr, len, prot, flags, fd, off) \
 	syscall(SYS_mmap, (void *)(addr), (size_t)(len), \
-			(int)(prot), (int)(flags), (int)(fd), (__off_t)(off))
+			(int)(prot), (int)(flags), (int)(fd), (off_t)(off))
 #else
 #define SYS_MMAP(addr, len, prot, flags, fd, off) \
 	syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
-			(int)(prot), (int)(flags), (int)(fd), (__off_t)((off) >> MMAP2_PAGE_SHIFT))
+			(int)(prot), (int)(flags), (int)(fd), (off_t)((off) >> MMAP2_PAGE_SHIFT))
 #endif
 
 #define SYS_MUNMAP(addr, len) \
-- 
2.6.2

[v4l-utils 2/5] utils: Properly use ENABLE_NLS for locale related code

[Thomas Petazzoni]

Various tools in utils/ use ENABLE_NLS to decide whether locale
support is available or not, and only include <locale.h> if ENABLE_NLS
is defined. However, they unconditionally use functions defined in
<locale.h> such as setlocale(), bindtextdomain() or textdomain(),
which causes build failures when the prototypes of such functions are
not available due to <locale.h> not being included.

In order to fix this, we add ENABLE_NLS conditionals around the calls
to these functions.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 utils/dvb/dvb-fe-tool.c        | 2 ++
 utils/dvb/dvb-format-convert.c | 2 ++
 utils/dvb/dvbv5-scan.c         | 2 ++
 utils/dvb/dvbv5-zap.c          | 2 ++
 utils/keytable/keytable.c      | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/utils/dvb/dvb-fe-tool.c b/utils/dvb/dvb-fe-tool.c
index efc2ebf..ba01aa9 100644
--- a/utils/dvb/dvb-fe-tool.c
+++ b/utils/dvb/dvb-fe-tool.c
@@ -276,9 +276,11 @@ int main(int argc, char *argv[])
 	struct dvb_v5_fe_parms *parms;
 	int fe_flags = O_RDWR;
 
+#ifdef ENABLE_NLS
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
+#endif
 
 	argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, 0, 0);
 
diff --git a/utils/dvb/dvb-format-convert.c b/utils/dvb/dvb-format-convert.c
index e39df03..09451d4 100644
--- a/utils/dvb/dvb-format-convert.c
+++ b/utils/dvb/dvb-format-convert.c
@@ -132,9 +132,11 @@ int main(int argc, char **argv)
 		.args_doc = N_("<input file> <output file>"),
 	};
 
+#ifdef ENABLE_NLS
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
+#endif
 
 	memset(&args, 0, sizeof(args));
 	argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, &idx, &args);
diff --git a/utils/dvb/dvbv5-scan.c b/utils/dvb/dvbv5-scan.c
index be1586d..1bb0ced 100644
--- a/utils/dvb/dvbv5-scan.c
+++ b/utils/dvb/dvbv5-scan.c
@@ -461,9 +461,11 @@ int main(int argc, char **argv)
 		.args_doc = N_("<initial file>"),
 	};
 
+#ifdef ENABLE_NLS
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
+#endif
 
 	memset(&args, 0, sizeof(args));
 	args.sat_number = -1;
diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c
index 2812166..848259b 100644
--- a/utils/dvb/dvbv5-zap.c
+++ b/utils/dvb/dvbv5-zap.c
@@ -758,9 +758,11 @@ int main(int argc, char **argv)
 		.args_doc = N_("<channel name> [or <frequency> if in monitor mode]"),
 	};
 
+#ifdef ENABLE_NLS
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
+#endif
 
 	memset(&args, 0, sizeof(args));
 	args.sat_number = -1;
diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
index 63938b9..3922ad2 100644
--- a/utils/keytable/keytable.c
+++ b/utils/keytable/keytable.c
@@ -1467,9 +1467,11 @@ int main(int argc, char *argv[])
 	static struct sysfs_names *names;
 	struct rc_device	  rc_dev;
 
+#ifdef ENABLE_NLS
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
+#endif
 
 	argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, 0, 0);
 
-- 
2.6.2

[v4l-utils 3/5] utils/v4l2-compliance: Include <fcntl.h> instead of <sys/fcntl.h>

[Thomas Petazzoni]

Code should not be including <sys/fcntl.h> header, but instead it
should include the public <fcntl.h> header.

On glibc and uClibc, <sys/fcntl.h> simply includes <fcntl.h>, but with
the musl C library, it spits out a warning telling you that you're not
doing the right thing:

In file included from ./v4l-helpers.h:12:0,
                 from ./cv4l-helpers.h:5,
                 from v4l2-compliance.h:36,
                 from v4l2-test-controls.cpp:33:
.../sysroot/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Wcpp]
 #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 utils/v4l2-compliance/v4l-helpers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/v4l2-compliance/v4l-helpers.h b/utils/v4l2-compliance/v4l-helpers.h
index d8a273d..9aafa34 100644
--- a/utils/v4l2-compliance/v4l-helpers.h
+++ b/utils/v4l2-compliance/v4l-helpers.h
@@ -9,7 +9,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <errno.h>
 
-- 
2.6.2

[v4l-utils 4/5] libv4lsyscall-priv.h: Only define SYS_mmap2 if needed

[Thomas Petazzoni]

The logic in libv4lsyscall-priv.h unconditionally defines SYS_mmap2 on
Linux systems, but with current versions of C libraries, SYS_mmap2 is
already defined, and therefore this additional definition causes some
build warnings:

In file included from processing/libv4lprocessing.h:24:0,
                 from libv4lconvert-priv.h:37,
                 from tinyjpeg.c:42:
processing/../libv4lsyscall-priv.h:44:0: warning: "SYS_mmap2" redefined
 #define SYS_mmap2 __NR_mmap2
 ^
In file included from .../sysroot/usr/include/sys/syscall.h:4:0,
                 from processing/../libv4lsyscall-priv.h:39,
                 from processing/libv4lprocessing.h:24,
                 from libv4lconvert-priv.h:37,
                 from tinyjpeg.c:42:
.../sysroot/usr/include/bits/syscall.h:504:0: note: this is the location of the previous definition
 #define SYS_mmap2 192

This commit fixes that by only defining SYS_mmap2 if not already
defined.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 lib/libv4lconvert/libv4lsyscall-priv.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/libv4lconvert/libv4lsyscall-priv.h b/lib/libv4lconvert/libv4lsyscall-priv.h
index f87eff4..bc18b21 100644
--- a/lib/libv4lconvert/libv4lsyscall-priv.h
+++ b/lib/libv4lconvert/libv4lsyscall-priv.h
@@ -41,7 +41,9 @@
 #include <linux/ioctl.h>
 /* On 32 bits archs we always use mmap2, on 64 bits archs there is no mmap2 */
 #ifdef __NR_mmap2
+#if !defined(SYS_mmap2)
 #define	SYS_mmap2 __NR_mmap2
+#endif
 #define	MMAP2_PAGE_SHIFT 12
 #else
 #define	SYS_mmap2 SYS_mmap
-- 
2.6.2

[v4l-utils 5/5] dvb/keytable: fix missing libintl linking

[Thomas Petazzoni]

From: Peter Seiderer <ps.report@gmx.net>

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 utils/dvb/Makefile.am      | 8 ++++----
 utils/keytable/Makefile.am | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/utils/dvb/Makefile.am b/utils/dvb/Makefile.am
index 6aae408..a96a1a2 100644
--- a/utils/dvb/Makefile.am
+++ b/utils/dvb/Makefile.am
@@ -2,19 +2,19 @@ bin_PROGRAMS = dvb-fe-tool dvbv5-zap dvbv5-scan dvb-format-convert
 man_MANS = dvb-fe-tool.1 dvbv5-zap.1 dvbv5-scan.1 dvb-format-convert.1
 
 dvb_fe_tool_SOURCES = dvb-fe-tool.c
-dvb_fe_tool_LDADD = ../../lib/libdvbv5/libdvbv5.la
+dvb_fe_tool_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@
 dvb_fe_tool_LDFLAGS = $(ARGP_LIBS) -lm
 
 dvbv5_zap_SOURCES = dvbv5-zap.c
-dvbv5_zap_LDADD = ../../lib/libdvbv5/libdvbv5.la
+dvbv5_zap_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@
 dvbv5_zap_LDFLAGS = $(ARGP_LIBS) -lm
 
 dvbv5_scan_SOURCES = dvbv5-scan.c
-dvbv5_scan_LDADD = ../../lib/libdvbv5/libdvbv5.la
+dvbv5_scan_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@
 dvbv5_scan_LDFLAGS = $(ARGP_LIBS) -lm
 
 dvb_format_convert_SOURCES = dvb-format-convert.c
-dvb_format_convert_LDADD = ../../lib/libdvbv5/libdvbv5.la
+dvb_format_convert_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@
 dvb_format_convert_LDFLAGS = $(ARGP_LIBS) -lm
 
 EXTRA_DIST = README
diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am
index 925c8ea..8444ac2 100644
--- a/utils/keytable/Makefile.am
+++ b/utils/keytable/Makefile.am
@@ -5,6 +5,7 @@ keytablesystem_DATA = $(srcdir)/rc_keymaps/*
 udevrules_DATA = 70-infrared.rules
 
 ir_keytable_SOURCES = keytable.c parse.h
+ir_keytable_LDADD = @LIBINTL@
 ir_keytable_LDFLAGS = $(ARGP_LIBS)
 
 EXTRA_DIST = 70-infrared.rules rc_keymaps rc_keymaps_userspace gen_keytables.pl ir-keytable.1 rc_maps.cfg
-- 
2.6.2

Re: [v4l-utils 0/5] Misc build fixes

[Thomas Petazzoni]

Hello,

I didn't get any feedback about the below series of patches for
v4l-utils, which was submitted 2 months ago. Anything needs to be
changed/fixed in order to get the patches reviewed/applied ?

Thanks!

Thomas

On Tue,  3 Nov 2015 21:58:35 +0100, Thomas Petazzoni wrote:
> Hello,
> 
> Here is a small set of fixes against v4l-utils that we have
> accumulated in the Buildroot project to fix a number of build
> issues. Those build issues are related to linking with the musl C
> library, or do linking with the libintl library when the gettext
> functions are not provided by the C library (which is what happens the
> uClibc C library is used).
> 
> Thanks,
> 
> Thomas
> 
> Peter Seiderer (1):
>   dvb/keytable: fix missing libintl linking
> 
> Thomas Petazzoni (4):
>   libv4lsyscall-priv.h: Use off_t instead of __off_t
>   utils: Properly use ENABLE_NLS for locale related code
>   utils/v4l2-compliance: Include <fcntl.h> instead of <sys/fcntl.h>
>   libv4lsyscall-priv.h: Only define SYS_mmap2 if needed
> 
>  lib/libv4l1/v4l1compat.c               |  3 +--
>  lib/libv4l2/v4l2convert.c              |  5 ++---
>  lib/libv4lconvert/libv4lsyscall-priv.h | 13 +++++--------
>  utils/dvb/Makefile.am                  |  8 ++++----
>  utils/dvb/dvb-fe-tool.c                |  2 ++
>  utils/dvb/dvb-format-convert.c         |  2 ++
>  utils/dvb/dvbv5-scan.c                 |  2 ++
>  utils/dvb/dvbv5-zap.c                  |  2 ++
>  utils/keytable/Makefile.am             |  1 +
>  utils/keytable/keytable.c              |  2 ++
>  utils/v4l2-compliance/v4l-helpers.h    |  2 +-
>  11 files changed, 24 insertions(+), 18 deletions(-)
> 



-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [v4l-utils 0/5] Misc build fixes

[Hans Verkuil]

They are already merged, so there is nothing to do :-)

Weird, you should have gotten an email from patchwork when I accepted these
patches.

Regards,

	Hans

On 01/21/16 09:50, Thomas Petazzoni wrote:
> Hello,
> 
> I didn't get any feedback about the below series of patches for
> v4l-utils, which was submitted 2 months ago. Anything needs to be
> changed/fixed in order to get the patches reviewed/applied ?
> 
> Thanks!
> 
> Thomas
> 
> On Tue,  3 Nov 2015 21:58:35 +0100, Thomas Petazzoni wrote:
>> Hello,
>>
>> Here is a small set of fixes against v4l-utils that we have
>> accumulated in the Buildroot project to fix a number of build
>> issues. Those build issues are related to linking with the musl C
>> library, or do linking with the libintl library when the gettext
>> functions are not provided by the C library (which is what happens the
>> uClibc C library is used).
>>
>> Thanks,
>>
>> Thomas
>>
>> Peter Seiderer (1):
>>   dvb/keytable: fix missing libintl linking
>>
>> Thomas Petazzoni (4):
>>   libv4lsyscall-priv.h: Use off_t instead of __off_t
>>   utils: Properly use ENABLE_NLS for locale related code
>>   utils/v4l2-compliance: Include <fcntl.h> instead of <sys/fcntl.h>
>>   libv4lsyscall-priv.h: Only define SYS_mmap2 if needed
>>
>>  lib/libv4l1/v4l1compat.c               |  3 +--
>>  lib/libv4l2/v4l2convert.c              |  5 ++---
>>  lib/libv4lconvert/libv4lsyscall-priv.h | 13 +++++--------
>>  utils/dvb/Makefile.am                  |  8 ++++----
>>  utils/dvb/dvb-fe-tool.c                |  2 ++
>>  utils/dvb/dvb-format-convert.c         |  2 ++
>>  utils/dvb/dvbv5-scan.c                 |  2 ++
>>  utils/dvb/dvbv5-zap.c                  |  2 ++
>>  utils/keytable/Makefile.am             |  1 +
>>  utils/keytable/keytable.c              |  2 ++
>>  utils/v4l2-compliance/v4l-helpers.h    |  2 +-
>>  11 files changed, 24 insertions(+), 18 deletions(-)
>>
> 
> 
> 

Re: [v4l-utils 0/5] Misc build fixes

[Thomas Petazzoni]

Hans,

On Thu, 21 Jan 2016 10:04:03 +0100, Hans Verkuil wrote:
> They are already merged, so there is nothing to do :-)
> 
> Weird, you should have gotten an email from patchwork when I accepted these
> patches.

My bad then, I searched for e-mails from patchwork in my archives, and
indeed found one. Looks like I'm getting old. Sorry for the noise :-)

In order to make this somewhat useful, when will the next release of
v4l-utils, with those fixes, be published ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [v4l-utils 0/5] Misc build fixes

[Hans Verkuil]

Hi Thomas,

On 01/21/16 10:15, Thomas Petazzoni wrote:
> Hans,
> 
> On Thu, 21 Jan 2016 10:04:03 +0100, Hans Verkuil wrote:
>> They are already merged, so there is nothing to do :-)
>>
>> Weird, you should have gotten an email from patchwork when I accepted these
>> patches.
> 
> My bad then, I searched for e-mails from patchwork in my archives, and
> indeed found one. Looks like I'm getting old. Sorry for the noise :-)
> 
> In order to make this somewhat useful, when will the next release of
> v4l-utils, with those fixes, be published ?

No idea. Gregor, any plans for a new release? It's been a while, so I think
a new release isn't a bad idea.

Regards,

	Hans

Re: [v4l-utils 0/5] Misc build fixes

[Gregor Jasny]

Hello,

On 21/01/16 10:40, Hans Verkuil wrote:
> On 01/21/16 10:15, Thomas Petazzoni wrote:
>> In order to make this somewhat useful, when will the next release of
>> v4l-utils, with those fixes, be published ?
>
> No idea. Gregor, any plans for a new release? It's been a while, so I think
> a new release isn't a bad idea.

If noone objects I will try to release a new version during this weekend 
or the next weekend during FOSDEM :)