pool/vlc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with libva 1.2.1 when doing 'full' builds

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2013-07-13 16:24:07 +00:00 committed by Git OBS Bridge
parent 4522f9be39
commit 652a86fcc9
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vlc-vaapi.patch Normal file
View File

@ -0,0 +1,35 @@
commit dc4b64c97b82d4d590ccf7fa1c938435cc26d98e
Author: Timo Rothenpieler <timo@rothenpieler.org>
Date: Sun Jan 20 15:49:23 2013 +0000
Make vaapi decoder compatible with latest libva changes
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Index: vlc-2.0.7/modules/codec/avcodec/vaapi.c
===================================================================
--- vlc-2.0.7.orig/modules/codec/avcodec/vaapi.c
+++ vlc-2.0.7/modules/codec/avcodec/vaapi.c
@@ -45,6 +45,11 @@
#include <libavcodec/vaapi.h>
+#ifndef VA_SURFACE_ATTRIB_SETTABLE
+#define vaCreateSurfaces(d, f, w, h, s, ns, a, na) \
+ vaCreateSurfaces(d, w, h, f, ns, s)
+#endif
+
#include <X11/Xlib.h>
#include <va/va_x11.h>
@@ -246,8 +251,8 @@ static int CreateSurfaces( vlc_va_vaapi_
/* 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;

6
vlc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jul 13 16:17:36 UTC 2013 - dimstar@opensuse.org
- Add vlc-vaapi.patch: Make vaapi decoder compatible with latest
libva changes.
-------------------------------------------------------------------
Thu Jul 4 10:41:24 UTC 2013 - hrvoje.senjan@gmail.com

3
vlc.spec
View File

@ -36,6 +36,8 @@ Release: 0
Source: http://download.videolan.org/vlc/%{_version}/vlc-%{_version}.tar.xz
Patch1: fix_font_path.patch
Patch3: 0001-no-return-in-non-void.patch
# PATCH-FIX-UPSTREAM vlc-vaapi.patch dimstar@opensuse.org -- Fix build with latest vaapi changes, taken from git.
Patch4: vlc-vaapi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: aalib-devel
BuildRequires: alsa-devel
@ -250,6 +252,7 @@ date
%setup -q -n %{name}-%{_version}
%patch1 -p1
%patch3 -p1
%patch4 -p1
rm -rf contrib
echo '********* ENDED PREP PHASE *********'
date