Accepting request 185438 from multimedia:libs

Update to 2.0.8

OBS-URL: https://build.opensuse.org/request/show/185438
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=10

vlc-2.0.7.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314
-size 18538256

vlc-2.0.8.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a02af28345d4560e718066623f881b6eaf29ddce3b778fbf839e08b2415d1702
+size 18858236

vlc-avcodec-encoder-single-threaded.patch

@@ -0,0 +1,23 @@
+From 5a43de506f31e1fa5460f8b62e25a1d640136597 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
+Date: Tue, 28 May 2013 11:29:07 +0200
+Subject: [PATCH] avcodec encoder: disable multithreading
+
+More work is needed before we can support it
+Close #8544
+---
+ modules/codec/avcodec/encoder.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: vlc-2.0.8/modules/codec/avcodec/encoder.c
+===================================================================
+--- vlc-2.0.8.orig/modules/codec/avcodec/encoder.c
++++ vlc-2.0.8/modules/codec/avcodec/encoder.c
+@@ -354,6 +354,7 @@ int OpenEncoder( vlc_object_t *p_this )
+ #endif
+     p_sys->p_context = p_context;
+     p_sys->p_context->codec_id = p_sys->p_codec->id;
++    p_context->thread_type = 0;
+     p_context->debug = var_InheritInteger( p_enc, "ffmpeg-debug" );
+     p_context->opaque = (void *)p_this;
+ 

vlc-vaapi.patch

@@ -1,35 +0,0 @@
-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
-@@ -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;

vlc.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Tue Jul 30 18:03:49 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 2.0.8:
+  + Access:
+    - Fix ISDB-S tuning.
+    - Fix crash in QTsound.
+    - Fix screen mouse file location.
+    - Fix invalid memcpy in MMS access.
+  + Demux:
+    - Fix use after free in sgimb.
+    - Improve resistance and checking against malformed MKV files.
+  + Decoders:
+    - Fix crash in the libavcodec module.
+  + Mac OS X:
+    - Fix interface crashes.
+    - Fix autostart playback option.
+    - Respect "playlist-autostart" option.
+  + Updated translations.
+- Drop vlc-vaapi.patch: fixed upstream.
+- Add vlc-avcodec-encoder-single-threaded.patch: disable
+  multithreading for avcodec encoder for now. Taken from git.
+
+-------------------------------------------------------------------
+Sun Jul 28 21:38:22 UTC 2013 - reddwarf@opensuse.org
+
+- Add pkgconfig(dirac) BuildRequires to enable Dirac support.
+
 -------------------------------------------------------------------
 Sat Jul 13 16:17:36 UTC 2013 - dimstar@opensuse.org
 

vlc.spec

@@ -30,14 +30,14 @@ Summary:        VLC - Video Lan Client
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players	
 Name:           vlc
-Version:        2.0.7
+Version:        2.0.8
 Release:        0
-%define _version 2.0.7
+%define _version 2.0.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 dimstar@opensuse.org -- Fix build with latest vaapi changes, taken from git.
-Patch4:         vlc-vaapi.patch
+# PATCH-FIX-UPSTREAM vlc-avcodec-encoder-single-threaded.patch dimstar@opensuse.org -- Disable avcodec encoder multithreading for now, taken from git.
+Patch4:         vlc-avcodec-encoder-single-threaded.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-devel
@@ -80,6 +80,7 @@ BuildRequires:  libmtp-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  libogg-devel
 BuildRequires:  libopus-devel
+BuildRequires:  pkgconfig(dirac) >= 0.10.0
 BuildRequires:  pkgconfig(libgme)
 %if 0%{suse_version} >= 1120
 BuildRequires:  libproxy-devel
@@ -603,6 +604,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/vlc/plugins/codec/libcdg_plugin.so
 %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so
 %{_libdir}/vlc/plugins/codec/libddummy_plugin.so
+%{_libdir}/vlc/plugins/codec/libdirac_plugin.so
 %{_libdir}/vlc/plugins/codec/libdts_plugin.so
 %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
 %{_libdir}/vlc/plugins/codec/libedummy_plugin.so