Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2013-07-23 12:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlc (Old) and /work/SRC/openSUSE:Factory/.vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vlc" Changes: -------- --- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2013-07-04 18:07:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vlc.new/vlc.changes 2013-07-23 12:32:37.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 13 16:17:36 UTC 2013 - [email protected] + +- Add vlc-vaapi.patch: Make vaapi decoder compatible with latest + libva changes. + +------------------------------------------------------------------- New: ---- vlc-vaapi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.A7oHsZ/_old 2013-07-23 12:32:38.000000000 +0200 +++ /var/tmp/diff_new_pack.A7oHsZ/_new 2013-07-23 12:32:38.000000000 +0200 @@ -36,6 +36,8 @@ 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 [email protected] -- 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 @@ %setup -q -n %{name}-%{_version} %patch1 -p1 %patch3 -p1 +%patch4 -p1 rm -rf contrib echo '********* ENDED PREP PHASE *********' date ++++++ vlc-vaapi.patch ++++++ commit dc4b64c97b82d4d590ccf7fa1c938435cc26d98e Author: Timo Rothenpieler <[email protected]> Date: Sun Jan 20 15:49:23 2013 +0000 Make vaapi decoder compatible with latest libva changes Signed-off-by: Jean-Baptiste Kempf <[email protected]> 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 @@ -46,6 +46,7 @@ #include <libavcodec/vaapi.h> #include <X11/Xlib.h> +#include <va/va_version.h> #include <va/va_x11.h> typedef struct @@ -246,8 +247,14 @@ static int CreateSurfaces( vlc_va_vaapi_ /* Create surfaces */ VASurfaceID pi_surface_id[p_va->i_surface_count]; +/* vaCreateSurfaces API changed with version 1.2.0 */ +#if VA_CHECK_VERSION( 0, 34, 0 ) + if( vaCreateSurfaces( p_va->p_display, VA_RT_FORMAT_YUV420, i_width, i_height, + pi_surface_id, p_va->i_surface_count, NULL, 0 ) ) +#else if( vaCreateSurfaces( p_va->p_display, i_width, i_height, VA_RT_FORMAT_YUV420, p_va->i_surface_count, pi_surface_id ) ) +#endif { for( int i = 0; i < p_va->i_surface_count; i++ ) p_va->p_surface[i].i_id = VA_INVALID_SURFACE; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
