summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2019-07-15 16:35:46 -0700
committerMatt Turner <mattst88@gentoo.org>2019-07-15 16:42:46 -0700
commit34d5cc6fcf1d76c1c2833cb534717246c221214c (patch)
treed6e29128fc80b573528511097188854a4e3c7624 /x11-libs/libva-vdpau-driver/files
parentwww-apps/karma-bin: 0.40 bump (diff)
downloadgentoo-34d5cc6fcf1d76c1c2833cb534717246c221214c.tar.gz
gentoo-34d5cc6fcf1d76c1c2833cb534717246c221214c.tar.bz2
gentoo-34d5cc6fcf1d76c1c2833cb534717246c221214c.zip
x11-libs/libva-vdpau-driver: Fix build with >=x11-libs/libva-2.5.0
Closes: https://bugs.gentoo.org/689530 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-libs/libva-vdpau-driver/files')
-rw-r--r--x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch
new file mode 100644
index 000000000000..0d92074ced93
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/689530
+
+libva commit 93c52a17b8d2 ("va_backend: remove unneeded
+linux/videodev2.h include") removed an include that provided the
+prototype of v4l2_format among other v4l2_* structs.
+
+Without this or a forward declaration of 'struct v4l2_format', the prototype
+and definition of vdpau_CreateSurfaceFromV4L2Buf() (which has a 'struct
+v4l2_format *' parameter) are seen as conflicting.
+
+Just include the removed header where we need it.
+
+diff --git a/src/vdpau_driver.h b/src/vdpau_driver.h
+index 6286d16..54d37fb 100644
+--- a/src/vdpau_driver.h
++++ b/src/vdpau_driver.h
+@@ -21,6 +21,8 @@
+ #ifndef VDPAU_DRIVER_H
+ #define VDPAU_DRIVER_H
+
++#include <linux/videodev2.h>
++
+ #include <va/va_backend.h>
+ #include "vaapi_compat.h"
+ #include "vdpau_gate.h"