libva-vdpau-driver: opt -> contrib

6 files changed, 102 insertions, 0 deletions

diff --git a/libva-vdpau-driver/.footprint b/libva-vdpau-driver/.footprint
new file mode 100644
index 000000000..237093f99
--- /dev/null
+++ b/libva-vdpau-driver/.footprint
@@ -0,0 +1,8 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/dri/
+lrwxrwxrwx	root/root	usr/lib/dri/nouveau_drv_video.so -> vdpau_drv_video.so
+lrwxrwxrwx	root/root	usr/lib/dri/nvidia_drv_video.so -> vdpau_drv_video.so
+lrwxrwxrwx	root/root	usr/lib/dri/s3g_drv_video.so -> vdpau_drv_video.so
+-rwxr-xr-x	root/root	usr/lib/dri/vdpau_drv_video.la
+-rwxr-xr-x	root/root	usr/lib/dri/vdpau_drv_video.so
diff --git a/libva-vdpau-driver/.signature b/libva-vdpau-driver/.signature
new file mode 100644
index 000000000..4c1f08535
--- /dev/null
+++ b/libva-vdpau-driver/.signature
@@ -0,0 +1,8 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF32dWH5PMTTsK6/bm+R+GkveX0Yd5mcRv/muJXhIV8eORX8dh8hFrN3K6mLoNc0VaQA9e7RQCygurEnh0RlHwZgU=
+SHA256 (Pkgfile) = 41060a3f5fd456af8330e0cb24dddc7f2f3cab2f0b5976f4cb75f621c12a29f8
+SHA256 (.footprint) = 1ca80acf81c1d37cd345cf7d75352e8abdfa7e128ac596e668d8888d8441f35c
+SHA256 (libva-vdpau-driver-0.7.4.tar.bz2) = 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9
+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
new file mode 100644
index 000000000..72682cf5d
--- /dev/null
+++ b/libva-vdpau-driver/Pkgfile
@@ -0,0 +1,30 @@
+# Description: VDPAU back-end for NVIDIA and VIA chipsets.
+# URL: http://freedesktop.org/wiki/Software/vaapi
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: libva
+
+name=libva-vdpau-driver
+version=0.7.4
+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/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 \
+		--enable-glx
+
+	make
+	make DESTDIR=$PKG install
+
+	# required for nouveau driver
+	ln -s vdpau_drv_video.so $PKG/usr/lib/dri/nouveau_drv_video.so
+}
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/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch b/libva-vdpau-driver/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
new file mode 100644
index 000000000..ab3a47998
--- /dev/null
+++ b/libva-vdpau-driver/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
@@ -0,0 +1,11 @@
+--- 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,
+             obj_context->vdp_bitstream_buffers_count,
+             obj_context->vdp_bitstream_buffers
+         );