[SCM] vdpau-video/master: Add multiple patches to make the package build

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f00e6210fa4626c2f423d7177954b838726913ad
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri May 9 16:50:22 2014 +0200

    Add multiple patches to make the package build

diff --git a/debian/control b/debian/control
index 4e09db1..56d8186 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
  libva-dev (>= 1.0.4),
- libvdpau-dev,
+ libvdpau-dev (>= 0.7-2),
  libx11-dev,
  libgl1-mesa-dev | libgl-dev,
 Standards-Version: 3.9.5
diff --git a/debian/patches/GL-version-1_3.patch b/debian/patches/GL-version-1_3.patch
new file mode 100644
index 0000000..ec67d58
--- /dev/null
+++ b/debian/patches/GL-version-1_3.patch
@@ -0,0 +1,23 @@
+Description: Define PFNGLMULTITEXCOORD2FPROC if it is missing
+Origin: vendor, http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/vdpau-video/trusty/view/head:/debian/patches/GL_VER_1_3.patch
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713612
+Last-Update: 2014-05-09
+
+diff --git a/src/utils_glx.h b/src/utils_glx.h
+index f753780..e02cedc 100644
+--- a/src/utils_glx.h
++++ b/src/utils_glx.h
+@@ -48,6 +48,13 @@ typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int
+ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
+ #endif
+ 
++#if GL_GLEXT_VERSION >= 85
++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++   block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++   Redefine the type here as an interim solution */
++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
++
+ #ifndef GL_FRAMEBUFFER_BINDING
+ #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
+ #endif
diff --git a/debian/patches/cast.patch b/debian/patches/cast.patch
new file mode 100644
index 0000000..b3e3fec
--- /dev/null
+++ b/debian/patches/cast.patch
@@ -0,0 +1,19 @@
+Description: Cast to the correct type
+ A patch in libvdpau 0.7-2 changes the definition of VdpPictureInfo, so we need
+ to adopt the cast here.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2014-05-09
+
+diff --git a/src/vdpau_decode.c b/src/vdpau_decode.c
+index 4a402d7..20bd897 100644
+--- a/src/vdpau_decode.c
++++ b/src/vdpau_decode.c
+@@ -1289,7 +1289,7 @@ vdpau_EndPicture(
+             driver_data,
+             obj_context->vdp_decoder,
+             obj_surface->vdp_surface,
+-            (VdpPictureInfo)&obj_context->vdp_picture_info,
++            (VdpPictureInfo*)&obj_context->vdp_picture_info,
+             obj_context->vdp_bitstream_buffers_count,
+             obj_context->vdp_bitstream_buffers
+         );
diff --git a/debian/patches/libva-constants.patch b/debian/patches/libva-constants.patch
new file mode 100644
index 0000000..5965e61
--- /dev/null
+++ b/debian/patches/libva-constants.patch
@@ -0,0 +1,21 @@
+Description: Remove constants dropped from VA API
+Origin: upstream,
+ http://lists.freedesktop.org/archives/libva/2013-June/001762.html
+Last-Update: 2014-05-09
+
+diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c
+index 899888b..610e7cd 100644
+--- a/src/vdpau_dump.c
++++ b/src/vdpau_dump.c
+@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type)
+         _(VAEncSequenceParameterBufferType);
+         _(VAEncPictureParameterBufferType);
+         _(VAEncSliceParameterBufferType);
+-        _(VAEncH264VUIBufferType);
+-        _(VAEncH264SEIBufferType);
+ #endif
+ #if VA_CHECK_VERSION(0,31,1)
+         _(VAQMatrixBufferType);
+-- 
+1.7.9.5
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bc4776d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+cast.patch
+GL-version-1_3.patch
+libva-constants.patch

-- 
vdpau-video packaging