[SCM] vdpau-video/master: Add patch to fix checks for SDS version of libva.

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

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

    Add patch to fix checks for SDS version of libva.

diff --git a/debian/patches/autoreconf_-vif.patch b/debian/patches/autoreconf_-vif.patch
new file mode 100644
index 0000000..c7b898c
--- /dev/null
+++ b/debian/patches/autoreconf_-vif.patch
@@ -0,0 +1,59 @@
+Patch with modifications after running autoreconf -vif
+==========================================================================
+--- a/configure
++++ b/configure
+@@ -12341,6 +12341,9 @@
+ /* end confdefs.h.  */
+ 
+     #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"
+@@ -12388,20 +12391,18 @@
+                           ${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
++    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
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define VA_DRIVER_INIT_FUNC $VA_DRIVER_INIT_FUNC
+ _ACEOF
+ 
+-else
+-    as_fn_error $? "Your VA API SDK does not include SDS extensions" "$LINENO" 5
+-fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VA API (GLX extensions)" >&5
+ $as_echo_n "checking for VA API (GLX extensions)... " >&6; }
+@@ -12415,15 +12416,8 @@
+ /* end confdefs.h.  */
+ 
+     #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/libva_glx_detection.patch b/debian/patches/libva_glx_detection.patch
new file mode 100644
index 0000000..3eff5ac
--- /dev/null
+++ b/debian/patches/libva_glx_detection.patch
@@ -0,0 +1,55 @@
+Don't need to check for SDS version of libva, as of libva >= 1.0.4.
+==========================================================================
+--- 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 @@
+   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 cafd205..935997f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-# Nothing to patch
+libva_glx_detection.patch
+autoreconf_-vif.patch

-- 
vdpau-video packaging