diff mbox series

libv4l: fix build with glibc 2.28

Message ID 7acb964ef43990041ffde9bf8477122943a1c5aa.1537386923.git.baruch@tkos.co.il
State Accepted
Headers show
Series libv4l: fix build with glibc 2.28 | expand

Commit Message

Baruch Siach Sept. 19, 2018, 7:55 p.m. UTC 
Add two upstream patches adding the needed header for the major/minor
macros.

Fixes:
http://autobuild.buildroot.net/results/f38/f3858970c1bbb7b0201389f7656c9ccf15a59fda/

Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 ...5-libv4lconvert-fix-compiler-warning.patch | 45 +++++++++++++++++++
 .../libv4l/0006-fix-glibc-2.28-build.patch    | 23 ++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 package/libv4l/0005-libv4lconvert-fix-compiler-warning.patch
 create mode 100644 package/libv4l/0006-fix-glibc-2.28-build.patch

Comments

Thomas Petazzoni Sept. 20, 2018, 7:27 p.m. UTC | #1 
Hello,

On Wed, 19 Sep 2018 22:55:23 +0300, Baruch Siach wrote:
> Add two upstream patches adding the needed header for the major/minor
> macros.
> 
> Fixes:
> http://autobuild.buildroot.net/results/f38/f3858970c1bbb7b0201389f7656c9ccf15a59fda/
> 
> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

I've applied, but I have one request, see below.


> diff --git a/package/libv4l/0006-fix-glibc-2.28-build.patch b/package/libv4l/0006-fix-glibc-2.28-build.patch
> new file mode 100644
> index 000000000000..295c0bb54525
> --- /dev/null
> +++ b/package/libv4l/0006-fix-glibc-2.28-build.patch
> @@ -0,0 +1,23 @@
> +v4l2-ctl: fix glibc 2.28 build
> +
> +Include header needed for the major/minor macros in glibc 2.28+.
> +
> +This patch is extracted from upstream commit 65e7b2a4076845d (v4l2-ctl: show
> +media/entity info if available).
> +
> +Signed-off-by: Baruch Siach <baruch@tkos.co.il>

This patch should have been Git-formatted, just like the other 5
patches that already existed in libv4l. I fixed that up when applying.

Thanks,

Thomas
diff mbox series

Patch

diff --git a/package/libv4l/0005-libv4lconvert-fix-compiler-warning.patch b/package/libv4l/0005-libv4lconvert-fix-compiler-warning.patch
new file mode 100644
index 000000000000..941a51e638c5
--- /dev/null
+++ b/package/libv4l/0005-libv4lconvert-fix-compiler-warning.patch
@@ -0,0 +1,45 @@ 
+From 380fe7d4548a99bfcfc1594b6f0b3dd2369978f1 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <hans.verkuil@cisco.com>
+Date: Sun, 1 Apr 2018 12:10:33 +0200
+Subject: [PATCH] libv4lconvert: fix compiler warning
+
+  CC       control/libv4lconvert_la-libv4lcontrol.lo
+control/libv4lcontrol.c: In function ‘v4lcontrol_get_usb_info’:
+control/libv4lcontrol.c:391:13: warning: In the GNU C Library, "minor" is defined
+ by <sys/sysmacros.h>. For historical compatibility, it is
+ currently defined by <sys/types.h> as well, but we plan to
+ remove this soon. To use "minor", include <sys/sysmacros.h>
+ directly. If you did not intend to use a system-defined macro
+ "minor", you should undefine it after including <sys/types.h>.
+       c == '\n' && minor_dev == minor(st.st_rdev))
+             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dropped the '#if defined(MAJOR_IN_SYSMACROS)' to ensure that sysmacros.h
+is always included. It seems that #if is no longer needed. At least,
+nobody complained when I removed it in other places earlier :-)
+
+Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit 380fe7d4548a9
+
+ lib/libv4lconvert/control/libv4lcontrol.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
+index 1e784eda8a92..59f28b137b98 100644
+--- a/lib/libv4lconvert/control/libv4lcontrol.c
++++ b/lib/libv4lconvert/control/libv4lcontrol.c
+@@ -20,9 +20,7 @@
+  */
+ 
+ #include <sys/types.h>
+-#if defined(MAJOR_IN_SYSMACROS)
+ #include <sys/sysmacros.h>
+-#endif
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+-- 
+2.18.0
+
diff --git a/package/libv4l/0006-fix-glibc-2.28-build.patch b/package/libv4l/0006-fix-glibc-2.28-build.patch
new file mode 100644
index 000000000000..295c0bb54525
--- /dev/null
+++ b/package/libv4l/0006-fix-glibc-2.28-build.patch
@@ -0,0 +1,23 @@ 
+v4l2-ctl: fix glibc 2.28 build
+
+Include header needed for the major/minor macros in glibc 2.28+.
+
+This patch is extracted from upstream commit 65e7b2a4076845d (v4l2-ctl: show
+media/entity info if available).
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit 65e7b2a4076845d
+
+diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp
+index e02dc7563e50..12a19bc7ac06 100644
+--- a/utils/v4l2-ctl/v4l2-ctl.cpp
++++ b/utils/v4l2-ctl/v4l2-ctl.cpp
+@@ -33,6 +33,7 @@
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
++#include <sys/sysmacros.h>
+ #include <dirent.h>
+ #include <math.h>
+