From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 14 Jul 2013 12:41:57 +0000 (+0200)
Subject: - up to 2.0.7
X-Git-Tag: auto/th/vlc-2.0.7-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=b95690c036b813d386a28e243daebdea60cec316;p=packages%2Fvlc.git

- up to 2.0.7
- fixed build with latest libva
---

diff --git a/libva.patch b/libva.patch
new file mode 100644
index 0000000..724336f
--- /dev/null
+++ b/libva.patch
@@ -0,0 +1,42 @@
+From 581e530bf98f253fea39ec9bfd9f3287acb1a8c6 Mon Sep 17 00:00:00 2001
+From: Timo Rothenpieler <timo@rothenpieler.org>
+Date: Sun, 20 Jan 2013 15:49:23 +0000
+Subject: [PATCH] Make vaapi decoder compatible with latest libva changes
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+(cherry picked from commit dc4b64c97b82d4d590ccf7fa1c938435cc26d98e)
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/codec/avcodec/vaapi.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
+index 893ea15..d8703a0 100644
+--- a/modules/codec/avcodec/vaapi.c
++++ b/modules/codec/avcodec/vaapi.c
+@@ -41,6 +41,11 @@
+ #include "va.h"
+ #include "copy.h"
+ 
++#ifndef VA_SURFACE_ATTRIB_SETTABLE
++#define vaCreateSurfaces(d, f, w, h, s, ns, a, na) \
++    vaCreateSurfaces(d, w, h, f, ns, s)
++#endif
++
+ #ifdef HAVE_AVCODEC_VAAPI
+ 
+ #include <vlc_xlib.h>
+@@ -258,8 +263,8 @@ static int CreateSurfaces( vlc_va_sys_t *p_va, void **pp_hw_ctx, vlc_fourcc_t *p
+ 
+     /* Create surfaces */
+     VASurfaceID pi_surface_id[p_va->i_surface_count];
+-    if( vaCreateSurfaces( p_va->p_display, i_width, i_height, VA_RT_FORMAT_YUV420,
+-                          p_va->i_surface_count, pi_surface_id ) )
++    if( vaCreateSurfaces( p_va->p_display, VA_RT_FORMAT_YUV420, i_width, i_height,
++                          pi_surface_id, p_va->i_surface_count, NULL, 0 ) )
+     {
+         for( int i = 0; i < p_va->i_surface_count; i++ )
+             p_va->p_surface[i].i_id = VA_INVALID_SURFACE;
+-- 
+1.7.10.4
+
diff --git a/vlc.spec b/vlc.spec
index 631c650..6a5679d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -60,17 +60,18 @@
 Summary:	VLC - a multimedia player and stream server
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
-Version:	2.0.6
-Release:	2
+Version:	2.0.7
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	b45be633c71dca04ca7d6c3d64dd728b
+# Source0-md5:	3b0e465b0990097b65abaf3e25589957
 Patch0:		%{name}-buildflags.patch
 Patch1:		%{name}-defaultfont.patch
 Patch2:		%{name}-system-minizip.patch
 Patch3:		xmas-sucks.patch
 Patch4:		%{name}-opencv.patch
+Patch5:		libva.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenGL-devel
@@ -319,6 +320,7 @@ Akcje klienta VLC dla Solid.
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}