[arch-commits] Commit in libva-vdpau-driver/trunk (4 files)

[Bartłomiej Piotrowski]

    Date: Monday, August 18, 2014 @ 10:53:26
  Author: bpiotrowski
Revision: 220196

upgpkg: libva-vdpau-driver 0.7.4-2

mtree rebuild

Added:
  libva-vdpau-driver/trunk/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
  libva-vdpau-driver/trunk/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
  libva-vdpau-driver/trunk/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
Modified:
  libva-vdpau-driver/trunk/PKGBUILD

---------------------------------------------------------+
 PKGBUILD                                                |   24 ++++++++---
 libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch   |   29 ++++++++++++++
 libva-vdpau-driver-0.7.4-glext-missing-definition.patch |   16 +++++++
 libva-vdpau-driver-0.7.4-libvdpau-0.8.patch             |   11 +++++
 4 files changed, 73 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-18 08:44:18 UTC (rev 220195)
+++ PKGBUILD	2014-08-18 08:53:26 UTC (rev 220196)
@@ -2,17 +2,30 @@
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 pkgname=libva-vdpau-driver
 pkgver=0.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="VDPAU backend for VA API"
 arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
 license=('GPL')
-depends=('libva' 'libvdpau')
+depends=('libva' 'libvdpau' 'libgl')
 makedepends=('mesa')
 replaces=('vdpau-video')
-source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('224318f4ea8bafca6a0fec770e388b7d1a1a66b3')
+source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.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)
+sha1sums=('224318f4ea8bafca6a0fec770e388b7d1a1a66b3'
+          'e734b1e16211a78adc76c59279352dfeb8ea5b22'
+          'f465fbf5dfc32459b060f320b9b2fe15a13e6d9d'
+          '219a01631e2791fa3c3e077a9176c141aaf5f69b')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../libva-vdpau-driver-0.7.4-glext-missing-definition.patch
+  patch -p1 -i ../libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
+  patch -p1 -i ../libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr
@@ -21,10 +34,7 @@
 
 package() {
   cd $pkgname-$pkgver
-
   make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
-
-

Added: libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
===================================================================
--- libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch	                        (rev 0)
+++ libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch	2014-08-18 08:53:26 UTC (rev 220196)
@@ -0,0 +1,29 @@
+>From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001
+From: "Xiang, Haihao" <haihao.xiang at 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 at 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
+

Added: libva-vdpau-driver-0.7.4-glext-missing-definition.patch
===================================================================
--- libva-vdpau-driver-0.7.4-glext-missing-definition.patch	                        (rev 0)
+++ libva-vdpau-driver-0.7.4-glext-missing-definition.patch	2014-08-18 08:53:26 UTC (rev 220196)
@@ -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

Added: libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
===================================================================
--- libva-vdpau-driver-0.7.4-libvdpau-0.8.patch	                        (rev 0)
+++ libva-vdpau-driver-0.7.4-libvdpau-0.8.patch	2014-08-18 08:53:26 UTC (rev 220196)
@@ -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
+         );