[SCM] vdpau-video/master: Split SDS checks and checks for GLX into seperate patches.

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

The following commit has been merged in the master branch:
commit a8ca4e09d8de6eaa6017f6b61c60bd06f1b0723c
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri Sep 10 15:11:13 2010 -0400

    Split SDS checks and checks for GLX into seperate patches.

diff --git a/debian/patches/libva_glx_detection.patch b/debian/patches/libva_glx_detection.patch
index 3eff5ac..daca4a7 100644
--- a/debian/patches/libva_glx_detection.patch
+++ b/debian/patches/libva_glx_detection.patch
@@ -1,41 +1,8 @@
-Don't need to check for SDS version of libva, as of libva >= 1.0.4.
+libva >= 1.0.4 has GLX extensions
 ==========================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -147,6 +147,9 @@
-   CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS"
-   AC_TRY_COMPILE([
-     #include <va/va_version.h>
-+    #ifndef VA_SDS_VERSION
-+    # error "Not using SDS library"
-+    #endif
-     #if VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 29
-     # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_SDS_VERSION_0_29)
-     #  error "VA API version >= 0.29.0-sds$LIBVA_SDS_VERSION_0_29 is required"
-@@ -179,16 +182,14 @@
-                           ${VA_MICRO_VERSION:-0} "*" 100     + \
-                           ${VA_SDS_VERSION:-0}`
- VA_DRIVER_INIT_FUNC="__vaDriverInit_${VA_MAJOR_VERSION}_${VA_MINOR_VERSION}"
--if test $va_full_version_int -ge 00310005; then
--    VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_${VA_MICRO_VERSION}_sds${VA_SDS_VERSION}"
--else
--    VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_sds"
--fi
- if test "$ac_cv_libva_sds_extensions" = "yes"; then
--    AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC], [Define driver entry-point])
--else
--    AC_MSG_ERROR([Your VA API SDK does not include SDS extensions])
-+    if test $va_full_version_int -ge 00310005; then
-+        VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_${VA_MICRO_VERSION}_sds${VA_SDS_VERSION}"
-+    else
-+        VA_DRIVER_INIT_FUNC="${VA_DRIVER_INIT_FUNC}_sds"
-+    fi
- fi
-+AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC], [Define driver entry-point])
- 
- dnl Check for OpenGL rendering extensions to VA API
- AC_CACHE_CHECK([for VA API (GLX extensions)],
-@@ -197,15 +198,8 @@
+@@ -198,15 +198,8 @@
    CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS"
    AC_TRY_COMPILE([
      #include <va/va_version.h>
diff --git a/debian/patches/libva_glx_detection.patch b/debian/patches/libva_sds_detection.patch
similarity index 67%
copy from debian/patches/libva_glx_detection.patch
copy to debian/patches/libva_sds_detection.patch
index 3eff5ac..f765669 100644
--- a/debian/patches/libva_glx_detection.patch
+++ b/debian/patches/libva_sds_detection.patch
@@ -35,21 +35,3 @@ Don't need to check for SDS version of libva, as of libva >= 1.0.4.
  
  dnl Check for OpenGL rendering extensions to VA API
  AC_CACHE_CHECK([for VA API (GLX extensions)],
-@@ -197,15 +198,8 @@
-   CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS"
-   AC_TRY_COMPILE([
-     #include <va/va_version.h>
--    #if VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 30
--    # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_GLX_SDS_VERSION_0_30)
--    #  error "VA API version >= 0.30.0-sds$LIBVA_GLX_SDS_VERSION_0_30 is required"
--    # endif
--    #elif VA_MAJOR_VERSION == 0 && VA_MINOR_VERSION == 31
--    # if !defined(VA_SDS_VERSION) || (VA_SDS_VERSION < $LIBVA_GLX_SDS_VERSION_0_31)
--    #  error "VA API version >= 0.31.0-sds$LIBVA_GLX_SDS_VERSION_0_31 is required"
--    # endif
--    #else
-+    #include <va/va_glx.h>
-+    #if !(VA_MAJOR_VERSION == 0 && (VA_MINOR_VERSION == 30 || VA_MINOR_VERSION == 31))
-     # error "This version of VA API is not supported for OpenGL rendering"
-     #endif
-   ], [],
diff --git a/debian/patches/series b/debian/patches/series
index 935997f..8209a89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+libva_sds_detection.patch
 libva_glx_detection.patch
 autoreconf_-vif.patch

-- 
vdpau-video packaging