From 714b763544e8203da70613a11a2003dff20bd2d159782b4ec8bca8c0a6510cf2 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 30 Jul 2013 18:08:40 +0000
Subject: [PATCH] Update to 2.0.8

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=27
---
 vlc-2.0.7.tar.xz |  3 ---
 vlc-2.0.8.tar.xz |  3 +++
 vlc-vaapi.patch  | 35 -----------------------------------
 vlc.changes      | 21 +++++++++++++++++++++
 vlc.spec         |  7 ++-----
 5 files changed, 26 insertions(+), 43 deletions(-)
 delete mode 100644 vlc-2.0.7.tar.xz
 create mode 100644 vlc-2.0.8.tar.xz
 delete mode 100644 vlc-vaapi.patch

diff --git a/vlc-2.0.7.tar.xz b/vlc-2.0.7.tar.xz
deleted file mode 100644
index 9f9d55e..0000000
--- a/vlc-2.0.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314
-size 18538256
diff --git a/vlc-2.0.8.tar.xz b/vlc-2.0.8.tar.xz
new file mode 100644
index 0000000..cc779dd
--- /dev/null
+++ b/vlc-2.0.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a02af28345d4560e718066623f881b6eaf29ddce3b778fbf839e08b2415d1702
+size 18858236
diff --git a/vlc-vaapi.patch b/vlc-vaapi.patch
deleted file mode 100644
index d941833..0000000
--- a/vlc-vaapi.patch
+++ /dev/null
@@ -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;
diff --git a/vlc.changes b/vlc.changes
index e182a73..dfaa57f 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Sun Jul 28 21:38:22 UTC 2013 - reddwarf@opensuse.org
 
diff --git a/vlc.spec b/vlc.spec
index 0ca00c9..7d87450 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -30,14 +30,12 @@ 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-devel
@@ -253,7 +251,6 @@ date
 %setup -q -n %{name}-%{_version}
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
 rm -rf contrib
 echo '********* ENDED PREP PHASE *********'
 date