media-libs/libv4l: fixup sysmacros includes with recent glibc

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
new file mode 100644 (file)
index 0000000..b819050
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
@@ -0,0 +1,26 @@
+Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
+===================================================================
+--- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c
++++ v4l-utils-1.14.1/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>
+Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
+===================================================================
+--- v4l-utils-1.14.1.orig/utils/v4l2-ctl/v4l2-ctl.cpp
++++ v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>

diff --git a/media-libs/libv4l/libv4l-1.14.1.ebuild b/media-libs/libv4l/libv4l-1.14.1.ebuild
index b52b6e562770c55ea220c7b0c49bef35402aff98..4ab5d35525917f4472091869fd540183fd1aa71e 100644 (file)
--- a/media-libs/libv4l/libv4l-1.14.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.14.1.ebuild
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${PN}-1.14.1-sysmacros.patch ) #580910
+
 pkg_setup() {
        CONFIG_CHECK="~SHMEM"
        linux-info_pkg_setup