[SCM] libva/master: Refreshed patches.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0541b59e3a2d7c20fa2c644991f23c222b63179e
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Fri Mar 16 10:59:31 2012 -0400

    Refreshed patches.

diff --git a/debian/patches/kfreebsd-fixes.patch b/debian/patches/kfreebsd-fixes.patch
index 1a6706a..966007b 100644
--- a/debian/patches/kfreebsd-fixes.patch
+++ b/debian/patches/kfreebsd-fixes.patch
@@ -28,7 +28,7 @@ Bug-Debian: http://bugs.debian.org/612480
  
  struct VADriverVTableTPI
  {
-@@ -43,6 +45,8 @@ struct VADriverVTableTPI
+@@ -43,6 +45,8 @@
  		VASurfaceID *surface		/* out */
  	);
      
@@ -37,7 +37,7 @@ Bug-Debian: http://bugs.debian.org/612480
          VAStatus (*vaCreateSurfaceFromV4L2Buf) (
  		VADriverContextP ctx,
                  int v4l2_fd,         /* file descriptor of V4L2 device */
-@@ -51,6 +55,8 @@ struct VADriverVTableTPI
+@@ -51,6 +55,8 @@
                  VASurfaceID *surface	           /* out */
          );
  
@@ -48,7 +48,7 @@ Bug-Debian: http://bugs.debian.org/612480
                  int width,
 --- a/va/va_tpi.c
 +++ b/va/va_tpi.c
-@@ -66,6 +66,8 @@ VAStatus vaCreateSurfaceFromCIFrame (
+@@ -66,6 +66,8 @@
    
  }
  
@@ -57,7 +57,7 @@ Bug-Debian: http://bugs.debian.org/612480
  /* 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(
+@@ -98,6 +100,7 @@
        return VA_STATUS_ERROR_UNIMPLEMENTED;
  }
  
diff --git a/debian/patches/remove-unneeded-dep.patch b/debian/patches/remove-unneeded-dep.patch
index 1b5b001..9f97a18 100644
--- a/debian/patches/remove-unneeded-dep.patch
+++ b/debian/patches/remove-unneeded-dep.patch
@@ -5,7 +5,7 @@ Description: Patch to remove unnecessary dependency to libva-x11 for dummy drive
 ==========================================================================
 --- a/dummy_drv_video/Makefile.am
 +++ b/dummy_drv_video/Makefile.am
-@@ -26,8 +26,6 @@ if BUILD_DUMMY_DRIVER
+@@ -26,8 +26,6 @@
  dummy_drv_video_la_LTLIBRARIES	= dummy_drv_video.la
  dummy_drv_video_ladir		= $(LIBVA_DRIVERS_PATH)
  dummy_drv_video_la_LDFLAGS	= -module -avoid-version -no-undefined -Wl,--no-undefined
diff --git a/debian/patches/remove-unneeded-dep2.patch b/debian/patches/remove-unneeded-dep2.patch
index ee8ff88..84dd212 100644
--- a/debian/patches/remove-unneeded-dep2.patch
+++ b/debian/patches/remove-unneeded-dep2.patch
@@ -6,7 +6,7 @@ Last-Update: 2011-02-13
 
 --- a/va/Makefile.am
 +++ b/va/Makefile.am
-@@ -71,8 +71,8 @@ SUBDIRS				+= x11
+@@ -71,8 +71,8 @@
  lib_LTLIBRARIES			+= libva-x11.la
  libva_x11_la_SOURCES		= 
  libva_x11_la_LDFLAGS		= $(LDADD)
@@ -19,7 +19,7 @@ Last-Update: 2011-02-13
  if USE_GLX
 --- a/test/basic/Makefile.am
 +++ b/test/basic/Makefile.am
-@@ -25,7 +25,8 @@ check_PROGRAMS = test_01 test_02 test_03
+@@ -25,7 +25,8 @@
  
  AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
  

-- 
libva packaging