From faf387049e83c09e808878192bcc07b2c87a7d03 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Sun, 18 Nov 2012 23:19:03 +1100
Subject: [PATCH] [notify]: vdpau-video 0.7.3 -> libva-vdpau-driver 0.7.4

---
 {vdpau-video => libva-vdpau-driver}/.footprint |  0
 libva-vdpau-driver/.md5sum                     |  2 ++
 {vdpau-video => libva-vdpau-driver}/Pkgfile    | 11 +++++++----
 libva-vdpau-driver/glx.patch                   | 17 +++++++++++++++++
 vdpau-video/.md5sum                            |  1 -
 5 files changed, 26 insertions(+), 5 deletions(-)
 rename {vdpau-video => libva-vdpau-driver}/.footprint (100%)
 create mode 100644 libva-vdpau-driver/.md5sum
 rename {vdpau-video => libva-vdpau-driver}/Pkgfile (61%)
 create mode 100644 libva-vdpau-driver/glx.patch
 delete mode 100644 vdpau-video/.md5sum

diff --git a/vdpau-video/.footprint b/libva-vdpau-driver/.footprint
similarity index 100%
rename from vdpau-video/.footprint
rename to libva-vdpau-driver/.footprint
diff --git a/libva-vdpau-driver/.md5sum b/libva-vdpau-driver/.md5sum
new file mode 100644
index 000000000..efaa80b3e
--- /dev/null
+++ b/libva-vdpau-driver/.md5sum
@@ -0,0 +1,2 @@
+aa5f63941036c18e928cd0444ec58310  glx.patch
+5ec6d452d2dd307434ea3d32da49c3e5  libva-vdpau-driver-0.7.4.tar.bz2
diff --git a/vdpau-video/Pkgfile b/libva-vdpau-driver/Pkgfile
similarity index 61%
rename from vdpau-video/Pkgfile
rename to libva-vdpau-driver/Pkgfile
index 5596d600b..820f2125e 100644
--- a/vdpau-video/Pkgfile
+++ b/libva-vdpau-driver/Pkgfile
@@ -1,17 +1,20 @@
 # Description: VDPAU back-end for NVIDIA and VIA chipsets.
-# URL: http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/
+# URL: http://freedesktop.org/wiki/Software/vaapi
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Danny Rawlins, monster dot romster at gmail dot com
 # Depends on: libva libvdpau
 
-name=vdpau-video
-version=0.7.3
+name=libva-vdpau-driver
+version=0.7.4
 release=1
-source=(http://www.splitted-desktop.com/~gbeauchesne/$name/$name-$version.tar.gz)
+source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2
+	glx.patch)
 
 build() {
 	cd $name-$version
 
+	patch -p1 -i $SRC/glx.patch
+
 	./configure \
 		--prefix=/usr \
 		--enable-glx
diff --git a/libva-vdpau-driver/glx.patch b/libva-vdpau-driver/glx.patch
new file mode 100644
index 000000000..7143d8bb0
--- /dev/null
+++ b/libva-vdpau-driver/glx.patch
@@ -0,0 +1,17 @@
+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/vdpau-video/.md5sum b/vdpau-video/.md5sum
deleted file mode 100644
index f7eea730d..000000000
--- a/vdpau-video/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-18870e007ecdc50a528861fa55556364  vdpau-video-0.7.3.tar.gz