The following commit has been merged in the master branch: commit 0d47f37cc8301873f4664458d67fd7707abe5f21 Author: Petr Salinger <petr.salin...@seznam.cz> Date: Tue Feb 8 19:49:55 2011 +0100
Fix FTBFS on kFreeBSD, Closes: #612480 diff --git a/debian/patches/kfreebsd-fixes.patch b/debian/patches/kfreebsd-fixes.patch new file mode 100644 index 0000000..81c0c30 --- /dev/null +++ b/debian/patches/kfreebsd-fixes.patch @@ -0,0 +1,67 @@ +From: Petr Salinger <petr.salin...@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)( + VADisplay dpy, + 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 _______________________________________________ pkg-multimedia-commits mailing list pkg-multimedia-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-commits _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers