[arch-commits] Commit in libva/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Friday, June 20, 2014 @ 17:19:28
  Author: bpiotrowski
Revision: 215316

upgpkg: libva 1.3.1-2

backport patch fixing flashplugin and firefox segfaults (FS#40914, FS#40807)

Added:
  libva/trunk/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
Modified:
  libva/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch |   38 ++++++++++
 PKGBUILD                                                        |   15 ++-
 2 files changed, 49 insertions(+), 4 deletions(-)

Added: 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
===================================================================
--- 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch	                        (rev 0)
+++ 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch	2014-06-20 15:19:28 UTC (rev 215316)
@@ -0,0 +1,38 @@
+From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001
+From: "Xiang, Haihao" <haihao.xiang at intel.com>
+Date: Thu, 18 Jul 2013 13:13:31 +0800
+Subject: [PATCH] va: release VADisplayContext at the end of vaTerminate()
+
+Otherwise it will result in invalid reading in va_TraceEnd()
+
+Signed-off-by: Xiang, Haihao <haihao.xiang at intel.com>
+---
+ va/va.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/va/va.c b/va/va.c
+index 6cb17ef..0ba595b 100644
+--- a/va/va.c
++++ b/va/va.c
+@@ -515,15 +515,15 @@ VAStatus vaTerminate (
+   free(old_ctx->vtable_vpp);
+   old_ctx->vtable_vpp = NULL;
+ 
+-  if (VA_STATUS_SUCCESS == vaStatus)
+-      pDisplayContext->vaDestroy(pDisplayContext);
+-
+   VA_TRACE_LOG(va_TraceTerminate, dpy);
+ 
+   va_TraceEnd(dpy);
+ 
+   va_FoolEnd(dpy);
+ 
++  if (VA_STATUS_SUCCESS == vaStatus)
++      pDisplayContext->vaDestroy(pDisplayContext);
++
+   return vaStatus;
+ }
+ 
+-- 
+2.0.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-20 14:30:38 UTC (rev 215315)
+++ PKGBUILD	2014-06-20 15:19:28 UTC (rev 215316)
@@ -4,7 +4,7 @@
 
 pkgname=libva
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Video Acceleration (VA) API for Linux'
 arch=('i686' 'x86_64')
 url='http://freedesktop.org/wiki/Software/vaapi'
@@ -13,9 +13,16 @@
 makedepends=('mesa')
 optdepends=('libva-vdpau-driver: vdpau back-end for nvidia'
             'libva-intel-driver: back-end for intel cards')
-source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('eb4db967f068854444b597071c66b480')
+source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+        0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch)
+md5sums=('eb4db967f068854444b597071c66b480'
+         'e564ae7c20962c821ac2b5cb1693e1a2')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr
@@ -25,5 +32,5 @@
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }