libva-vdpau-driver: patches update

7 files changed, 61 insertions, 45 deletions

diff --git a/libva-vdpau-driver/.signature b/libva-vdpau-driver/.signature
index 4ede1f66d..5b2becc27 100644
--- a/libva-vdpau-driver/.signature
+++ b/libva-vdpau-driver/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dRa86jojVWpF6zxN6aYT/Rhj9Cchw/7oSxteHsLY8kkwfvR8VeYGuyqANCsMxCRcC84ILxDKeOBZIfhVu2t9wY=
-SHA256 (Pkgfile) = fb01dc5113db43f14afd3f85f384c2515fd60b56d267f6247dcec100c4ee2649
+RWSE3ohX2g5d/SLBoi3g9DJS9M4x6QhOBWtrpNxMfWggaxItbE76Fb6vtXdlXHXMyS8e7VG0jaovO6WT7dKXrg7Lr5qYx5VOnwM=
+SHA256 (Pkgfile) = 41060a3f5fd456af8330e0cb24dddc7f2f3cab2f0b5976f4cb75f621c12a29f8
 SHA256 (.footprint) = 1ca80acf81c1d37cd345cf7d75352e8abdfa7e128ac596e668d8888d8441f35c
 SHA256 (libva-vdpau-driver-0.7.4.tar.bz2) = 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9
-SHA256 (glx.patch) = 5194acdaebbe7972d4a90c9c30a5e51d8a1209cc05a26849ef01091bce6ed15e
-SHA256 (libva.patch) = 3ce9ca25b761b21223fffd2d28086e0b0f28611a6de42dfb8f2ef2e229bc0648
-SHA256 (vdpau.patch) = 2b623c19aed1f2e804e0a6ee110827984c03897a4421ce4144b77b0cf5349b32
+SHA256 (libva-vdpau-driver-0.7.4-glext-missing-definition.patch) = 776bfe4c101cdde396d8783029b288c6cd825d0cdbc782ca3d94a5f9ffb4558c
+SHA256 (libva-vdpau-driver-0.7.4-libvdpau-0.8.patch) = 5e567b026b97dc0e207b6c05410cc1b7b77a58ceb5046801d0ea1a321cba3b9d
+SHA256 (libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch) = 1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98
diff --git a/libva-vdpau-driver/Pkgfile b/libva-vdpau-driver/Pkgfile
index 8a158dee1..72682cf5d 100644
--- a/libva-vdpau-driver/Pkgfile
+++ b/libva-vdpau-driver/Pkgfile
@@ -1,21 +1,22 @@
 # Description: VDPAU back-end for NVIDIA and VIA chipsets.
 # URL: http://freedesktop.org/wiki/Software/vaapi
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Danny Rawlins, crux at romster dot me
 # Depends on: libva
 
 name=libva-vdpau-driver
 version=0.7.4
-release=4
-source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2
-	glx.patch libva.patch vdpau.patch)
+release=5
+source=(https://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2
+	libva-vdpau-driver-0.7.4-glext-missing-definition.patch
+	libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
+	libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch)
 
 build() {
 	cd $name-$version
 
-	patch -p1 -i $SRC/glx.patch
-	patch -p1 -i $SRC/libva.patch
-	patch -p1 -i $SRC/vdpau.patch
+	patch -p1 -i $SRC/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
+	patch -p1 -i $SRC/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
+	patch -p1 -i $SRC/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
 
 	./configure \
 		--prefix=/usr \
diff --git a/libva-vdpau-driver/glx.patch b/libva-vdpau-driver/glx.patch
deleted file mode 100644
index 7143d8bb0..000000000
--- a/libva-vdpau-driver/glx.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur a/src/utils_glx.h b/src/utils_glx.h
---- a/src/utils_glx.h	2012-10-05 10:02:58.000000000 -0500
-+++ b/src/utils_glx.h	2012-10-26 22:00:13.039341049 -0500
-@@ -27,6 +27,13 @@
- #include <GL/glxext.h>
- #include <vdpau/vdpau.h>
- 
-+#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
-+
- /* GL_NV_vdpau_interop */
- #if GL_GLEXT_VERSION < 64
- typedef GLintptr GLvdpauSurfaceNV;
diff --git a/libva-vdpau-driver/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch b/libva-vdpau-driver/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
new file mode 100644
index 000000000..74caee348
--- /dev/null
+++ b/libva-vdpau-driver/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
@@ -0,0 +1,29 @@
+>From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001
+From: "Xiang, Haihao" <haihao.xiang@intel.com>
+Date: Fri, 21 Jun 2013 12:55:30 +0800
+Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are
+ dropped from VA API
+
+The driver doesn't use them indeed
+
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+---
+ src/vdpau_dump.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+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/libva-vdpau-driver/libva-vdpau-driver-0.7.4-glext-missing-definition.patch b/libva-vdpau-driver/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
new file mode 100644
index 000000000..b56d26834
--- /dev/null
+++ b/libva-vdpau-driver/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
@@ -0,0 +1,16 @@
+--- a/src/utils_glx.h~	2012-10-05 16:02:58.000000000 +0100
++++ b/src/utils_glx.h	2012-10-19 08:44:12.469642440 +0100
+@@ -48,6 +48,13 @@
+ 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/libva-vdpau-driver/vdpau.patch b/libva-vdpau-driver/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
index c90011f0e..ab3a47998 100644
--- a/libva-vdpau-driver/vdpau.patch
+++ b/libva-vdpau-driver/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
@@ -1,12 +1,11 @@
-diff -ur a/src/vdpau_decode.c b/src/vdpau_decode.c
---- a/src/vdpau_decode.c	2012-10-05 10:02:58.000000000 -0500
-+++ b/src/vdpau_decode.c	2014-07-18 07:42:37.240166340 -0500
+--- a/src/vdpau_decode.c
++++ b/src/vdpau_decode.c
 @@ -1289,7 +1289,7 @@
              driver_data,
              obj_context->vdp_decoder,
              obj_surface->vdp_surface,
 -            (VdpPictureInfo)&obj_context->vdp_picture_info,
-+            (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/libva-vdpau-driver/libva.patch b/libva-vdpau-driver/libva.patch
deleted file mode 100644
index 8b629623e..000000000
--- a/libva-vdpau-driver/libva.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/src/vdpau_dump.c b/src/vdpau_dump.c
---- a/src/vdpau_dump.c	2012-10-05 10:02:58.000000000 -0500
-+++ b/src/vdpau_dump.c	2013-07-12 14:21:19.990069043 -0500
-@@ -59,8 +59,6 @@
-         _(VAEncSequenceParameterBufferType);
-         _(VAEncPictureParameterBufferType);
-         _(VAEncSliceParameterBufferType);
--        _(VAEncH264VUIBufferType);
--        _(VAEncH264SEIBufferType);
- #endif
- #if VA_CHECK_VERSION(0,31,1)
-         _(VAQMatrixBufferType);