- up to 2.2.5.1

diff --git a/atomic.patch b/atomic.patch
deleted file mode 100644 (file)
index 2b500bb..0000000
--- a/atomic.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Steve Lhomme <robux4@videolabs.io>
-Date: Thu, 9 Jun 2016 16:53:20 +0000 (+0200)
-Subject: vlc_atomic: atomic_compare_exchange_weak_explicit takes 5 parameters
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=ea4edfb6aec493a8268b55d843729e5f0be52e04
-
-vlc_atomic: atomic_compare_exchange_weak_explicit takes 5 parameters
-
-Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
----
-
-diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
-index ef0a1ee..e003f6d 100644
---- a/include/vlc_atomic.h
-+++ b/include/vlc_atomic.h
-@@ -144,7 +144,7 @@ typedef         uintmax_t atomic_uintmax_t;
- #  define atomic_compare_exchange_weak(object,expected,desired) \
-     atomic_compare_exchange(object, expected, desired)
- 
--#  define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \
-+#  define atomic_compare_exchange_weak_explicit(object,expected,desired,order_equal,order_different) \
-     atomic_compare_exchange_weak(object, expected, desired)
- 
- #  define atomic_fetch_add(object,operand) \
-From 54bda02c8340298b0d6956cf4ad0423c09fc046e Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcvlcdev@free.fr>
-Date: Fri, 22 Jul 2016 13:03:10 +0200
-Subject: [PATCH] vlc_atomic: atomic_compare_exchange_strong_explicit takes 5
- parameters
-
----
- include/vlc_atomic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
-index e003f6d..39e3347 100644
---- a/include/vlc_atomic.h
-+++ b/include/vlc_atomic.h
-@@ -138,7 +138,7 @@ typedef         uintmax_t atomic_uintmax_t;
- #  define atomic_compare_exchange_strong(object,expected,desired) \
-     atomic_compare_exchange(object, expected, desired)
- 
--#  define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \
-+#  define atomic_compare_exchange_strong_explicit(object,expected,desired,order,order_different) \
-     atomic_compare_exchange_strong(object, expected, desired)
- 
- #  define atomic_compare_exchange_weak(object,expected,desired) \
--- 
-2.1.4
-

diff --git a/vlc.spec b/vlc.spec
index cef00038cfa85fc0da7b0a41633408e7c7b6e9a6..7af4ac54ca65157a1164744497c0ebb5529a5174 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -64,19 +64,18 @@
 Summary:       VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
-Version:       2.2.4
-Release:       6
+Version:       2.2.5.1
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 55666c9898f658c7fcca12725bf7dd1b
+# Source0-md5: 7ab63964ffec4c92a54deb018f23318b
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-tremor.patch
 Patch2:                %{name}-system-minizip.patch
 Patch3:                xmas-sucks.patch
 Patch4:                ffmpeg3.patch
 Patch5:                no-cache.patch
-Patch6:                atomic.patch
 URL:           http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
@@ -345,7 +344,6 @@ Akcje klienta VLC dla Solid.
 %endif
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 sed -i -e 's#Qt5#WANT_QT4#g' configure.ac