summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2018-01-13 12:50:36 +0100
committerAlexis Ballier <aballier@gentoo.org>2018-01-13 13:16:26 +0100
commit01d5ea3feda75913684f89f973863c873895a28c (patch)
treeda295f18dc54d6eca1c61bb2652a1bc3ea979558 /media-libs
parentmedia-tv/v4l-utils: bump to 1.14.1 (diff)
downloadgentoo-01d5ea3feda75913684f89f973863c873895a28c.tar.gz
gentoo-01d5ea3feda75913684f89f973863c873895a28c.tar.bz2
gentoo-01d5ea3feda75913684f89f973863c873895a28c.zip
media-libs/libv4l: fixup sysmacros includes with recent glibc
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch26
-rw-r--r--media-libs/libv4l/libv4l-1.14.1.ebuild2
2 files changed, 28 insertions, 0 deletions
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
index 000000000000..b8190507fc7d
--- /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 b52b6e562770..4ab5d3552591 100644
--- 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