From 0f533cc34d98738120e9d8517db9e74e6830637c Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Fri, 4 Jul 2014 01:39:20 +1000
Subject: [PATCH] [notify] libva: patch release VADisplayContext at the end of
 vaTerminate()

---
 libva/.md5sum                                 |  1 +
 ...playContext-at-the-end-of-vaTerminat.patch | 38 +++++++++++++++++++
 libva/Pkgfile                                 | 10 +++--
 3 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch

diff --git a/libva/.md5sum b/libva/.md5sum
index 6af5c9b6b..32f16542b 100644
--- a/libva/.md5sum
+++ b/libva/.md5sum
@@ -1 +1,2 @@
+e564ae7c20962c821ac2b5cb1693e1a2  0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
 eb4db967f068854444b597071c66b480  libva-1.3.1.tar.bz2
diff --git a/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch b/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
new file mode 100644
index 000000000..6c1df31f1
--- /dev/null
+++ b/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
@@ -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
+
diff --git a/libva/Pkgfile b/libva/Pkgfile
index eeeea89b0..49f4d3279 100644
--- a/libva/Pkgfile
+++ b/libva/Pkgfile
@@ -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