Skip to content

Commit

Permalink
x11-libs/libva-vdpau-driver: Fix build with >=x11-libs/libva-2.5.0
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/689530
Signed-off-by: Matt Turner <[email protected]>
  • Loading branch information
mattst88 committed Jul 15, 2019
1 parent d119b63 commit 34d5cc6
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch
"${FILESDIR}"/${P}-libvdpau-0.8.patch
"${FILESDIR}"/${P}-sigfpe-crash.patch
"${FILESDIR}"/${P}-include-linux-videodev2.h.patch
)

src_prepare() {
Expand Down

0 comments on commit 34d5cc6

Please sign in to comment.