[SCM] vlc/master: Apply patches to fix atomic issues with GCC 6

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cf72a4ec828bd9d612bd6e5d1c2f23d068ad9699
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jul 24 12:49:51 2016 +0200

    Apply patches to fix atomic issues with GCC 6

diff --git a/debian/patches/series b/debian/patches/series
index 2877bd4..23e3225 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 fix-translation.patch
 drop-check-qt-check.patch
 generated-mimetypes.patch
+vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
+vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
diff --git a/debian/patches/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch b/debian/patches/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
new file mode 100644
index 0000000..5ba1a83
--- /dev/null
+++ b/debian/patches/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
@@ -0,0 +1,27 @@
+From ec34ff174f04d1e81c939ed0325a0073c6f68fce Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie <fcvlcdev at free.fr>
+Date: Fri, 22 Jul 2016 13:37:15 +0200
+Subject: [PATCH 2/2] vlc_atomic: atomic_compare_exchange_strong_explicit takes
+ 5 parameters
+
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ 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 01e0f85..15ccf8c 100644
+--- a/include/vlc_atomic.h
++++ b/include/vlc_atomic.h
+@@ -152,7 +152,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.8.1
+
diff --git a/debian/patches/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch b/debian/patches/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
new file mode 100644
index 0000000..2c07fc7
--- /dev/null
+++ b/debian/patches/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
@@ -0,0 +1,31 @@
+From ce8cc916ab43e12b85abd6a1b850f1ccf43319c8 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at videolabs.io>
+Date: Fri, 22 Jul 2016 13:37:14 +0200
+Subject: [PATCH 1/2] vlc_atomic: atomic_compare_exchange_weak_explicit takes 5
+ parameters
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ 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 af88eab..01e0f85 100644
+--- a/include/vlc_atomic.h
++++ b/include/vlc_atomic.h
+@@ -158,7 +158,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) \
+-- 
+2.8.1
+

-- 
VLC media player packaging