[notify] libva: patch release VADisplayContext at the end of vaTerminate()

This commit is contained in:
Danny Rawlins 2014-07-04 01:39:20 +10:00
parent 371e80c317
commit 0f533cc34d
3 changed files with 45 additions and 4 deletions

View File

@ -1 +1,2 @@
e564ae7c20962c821ac2b5cb1693e1a2 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
eb4db967f068854444b597071c66b480 libva-1.3.1.tar.bz2

View File

@ -0,0 +1,38 @@
From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@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@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

View File

@ -2,22 +2,24 @@
# URL: http://freedesktop.org/wiki/Software/vaapi
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
# Packager: Tilman Sauerbeck, tilman at crux dot nu
# Depends on: mesa3d xorg-libpciaccess
# Depends on: mesa3d
name=libva
version=1.3.1
release=1
source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2)
release=2
source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2
0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
# --disable-wayland
sed -i -e '17547,17643d' configure
./configure \
--prefix=/usr \
--enable-glx \
--disable-wayland \
--disable-dependency-tracking