[libva/f20] Fix rhbz #1105890

[Nicolas Chauvet]

commit 1a3e6410ae4467a505ce26ba8468fb6ef3f12c7b
Author: Elad Alfassa <elad at fedoraproject.org>
Date:   Tue Jun 24 20:11:49 2014 +0300

    Fix rhbz #1105890

 firefox-crash-fix.patch |   36 ++++++++++++++++++++++++++++++++++++
 libva.spec              |    7 ++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/firefox-crash-fix.patch b/firefox-crash-fix.patch
new file mode 100644
index 0000000..5ba5e44
--- /dev/null
+++ b/firefox-crash-fix.patch
@@ -0,0 +1,36 @@
+From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001
+From: Xiang, Haihao <haihao.xiang at intel.com>
+Date: Thu, 18 Jul 2013 05:13:31 +0000
+Subject: 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>
+---
+(limited to 'va/va.c')
+
+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;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/libva.spec b/libva.spec
index 0c8ff1c..210ee15 100644
--- a/libva.spec
+++ b/libva.spec
@@ -1,11 +1,12 @@
 Name:		libva
 Version:	1.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Video Acceleration (VA) API for Linux
 Group:		System Environment/Libraries
 License:	MIT
 URL:		http://freedesktop.org/wiki/Software/vaapi
 Source0:	http://www.freedesktop.org/software/vaapi/releases/libva/libva-%{version}.tar.bz2
+Patch0:	firefox-crash-fix.patch
 
 BuildRequires:	libudev-devel
 BuildRequires:	libXext-devel
@@ -65,6 +66,7 @@ of %{name}, to use with wayland.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static \
@@ -116,6 +118,9 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 }
 
 %changelog
+* Fri Jun 20 2014 Elad Alfassa <elad at fedoraproject.org> - 1.2.1-3
+- Apply upstream patch to fix a firefox crash (rhbz #1105890)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild