[SCM] libva packaging branch, master, updated. upstream/1.0.1-15-g5860348

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

The following commit has been merged in the master branch:
commit 58603488b2322fbb8c7add833583f53e52c7f343
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Jun 2 19:02:13 2010 -0400

    Refresh all patches.

diff --git a/debian/patches/fix-warnings.patch b/debian/patches/fix-warnings.patch
index b0c3e11..232feac 100644
--- a/debian/patches/fix-warnings.patch
+++ b/debian/patches/fix-warnings.patch
@@ -3,11 +3,9 @@ Fix for strtok_r is for "expected ‘char * __restrict__’ but argument is of t
 ‘const char *’" warning.
 Second is to fix "cast to pointer from integer of different size" warning.
 ==========================================================================
-diff --git a/src/va.c b/src/va.c
-index bc469a0..09a7a3c 100644
 --- a/src/va.c
 +++ b/src/va.c
-@@ -141,7 +141,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
+@@ -141,7 +141,7 @@
      }
  
      search_path = strdup((const char *)search_path);
@@ -16,11 +14,9 @@ index bc469a0..09a7a3c 100644
      while(driver_dir)
      {
          void *handle = NULL;
-diff --git a/test/putsurface/putsurface.c b/test/putsurface/putsurface.c
-index 335368a..638bee3 100644
 --- a/test/putsurface/putsurface.c
 +++ b/test/putsurface/putsurface.c
-@@ -241,7 +241,7 @@ static int putsurface_thread(void *data)
+@@ -241,7 +241,7 @@
          while (surface_id == VA_INVALID_SURFACE)
              surface_id = get_next_free_surface(&index);
  
diff --git a/debian/patches/remove-unneeded-dep.patch b/debian/patches/remove-unneeded-dep.patch
index 13f5a0c..1e0f2a4 100644
--- a/debian/patches/remove-unneeded-dep.patch
+++ b/debian/patches/remove-unneeded-dep.patch
@@ -1,7 +1,5 @@
 Patch to remove unnecessary dependency to libva-x11 for dummy driver
 ==========================================================================
-diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am
-index 4e75a7b..b5bb74c 100644
 --- a/dummy_drv_video/Makefile.am
 +++ b/dummy_drv_video/Makefile.am
 @@ -23,8 +23,6 @@

-- 
libva packaging