[SCM] libva/master: Revert "remove debian/patches/kfreebsd-fixes.patch, applied upstream" (Closes: #621759)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c132bb90ccf6d6d7576066edadffcecd30dad37c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 17 09:13:16 2011 +0200

    Revert "remove debian/patches/kfreebsd-fixes.patch, applied upstream" (Closes: #621759)
    
    It was not applied upstream after all and seems to be still necessary.
    This reverts commit a985467fa440578ef6772ed373161e6e0f9b7de5.

diff --git a/debian/patches/kfreebsd-fixes.patch b/debian/patches/kfreebsd-fixes.patch
new file mode 100644
index 0000000..1a6706a
--- /dev/null
+++ b/debian/patches/kfreebsd-fixes.patch
@@ -0,0 +1,67 @@
+From: Petr Salinger <Petr.Salinger at seznam.cz>
+Subject: libva: FTBFS on GNU/kFreeBSD
+Date: Tue, 8 Feb 2011 19:22:15 +0100 (CET)
+Bug-Debian: http://bugs.debian.org/612480
+
+--- a/va/va_backend.h
++++ b/va/va_backend.h
+@@ -33,7 +33,10 @@
+ #ifndef ANDROID
+ #include <X11/Xlib.h>
+ #endif
++
++#ifdef __linux__
+ #include <linux/videodev2.h>
++#endif
+ 
+ typedef struct VADriverContext *VADriverContextP;
+ typedef struct VADisplayContext *VADisplayContextP;
+--- a/va/va_backend_tpi.h
++++ b/va/va_backend_tpi.h
+@@ -32,7 +32,9 @@
+ #include <va/va.h>
+ #include <va/va_backend.h>
+ 
++#ifdef __linux__
+ #include <linux/videodev2.h>
++#endif
+ 
+ struct VADriverVTableTPI
+ {
+@@ -43,6 +45,8 @@ struct VADriverVTableTPI
+ 		VASurfaceID *surface		/* out */
+ 	);
+     
++#ifdef __linux__
++
+         VAStatus (*vaCreateSurfaceFromV4L2Buf) (
+ 		VADriverContextP ctx,
+                 int v4l2_fd,         /* file descriptor of V4L2 device */
+@@ -51,6 +55,8 @@ struct VADriverVTableTPI
+                 VASurfaceID *surface	           /* out */
+         );
+ 
++#endif 
++
+         VAStatus (*vaCreateSurfacesForUserPtr)(
+ 		VADriverContextP ctx,
+                 int width,
+--- a/va/va_tpi.c
++++ b/va/va_tpi.c
+@@ -66,6 +66,8 @@ VAStatus vaCreateSurfaceFromCIFrame (
+   
+ }
+ 
++#ifdef __linux__
++
+ /* Wrap a V4L2 buffer as a VA surface, so that V4L2 camera, VA encode
+  * can share the data without copy
+  * The VA driver should query the camera device from v4l2_fd to see
+@@ -98,6 +100,7 @@ VAStatus vaCreateSurfaceFromV4L2Buf(
+       return VA_STATUS_ERROR_UNIMPLEMENTED;
+ }
+ 
++#endif
+ 
+ /*
+  * The surfaces could be shared and accessed with extern devices
diff --git a/debian/patches/series b/debian/patches/series
index b340384..867cd27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-warnings.patch
 remove-unneeded-dep.patch
 remove-unneeded-dep2.patch
+kfreebsd-fixes.patch

-- 
libva packaging