[SCM] mpv/master: Drop 04_use-atomic-not-sync.patch (merged upstream)

[ghedo at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b249bce00ae3c271890fade25fe5bd6f2f00d6bf
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Wed Jan 1 22:46:08 2014 +0100

    Drop 04_use-atomic-not-sync.patch (merged upstream)

diff --git a/debian/patches/04_use-atomic-not-sync.patch b/debian/patches/04_use-atomic-not-sync.patch
deleted file mode 100644
index 62a6d23..0000000
--- a/debian/patches/04_use-atomic-not-sync.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Use __atomic* GCC built-ins when available
- Some platforms (ppc, mips) do not have __sync_add_and_fetch_8 and other atomic
- built-ins and thus FTBFS. __atomic_add_fetch on the other hand is always
- available (GCC >= 4.8) and resolves to a function in GCC's libatomic when the
- equivalent __sync is not available.
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/733632
-Forwarded: https://github.com/mpv-player/mpv/pull/434
-Author: Alessandro Ghedini <ghedo at debian.org>
-Reviewed-by: Alessandro Ghedini <ghedo at debian.org>
-Last-Update: 2013-12-30
-Applied-Upstream: 0.3.1
-
---- a/compat/atomics.h
-+++ b/compat/atomics.h
-@@ -19,5 +19,12 @@
- // At this point both gcc and clang had __sync_synchronize support for some
- // time. We only support a full memory barrier.
- 
--#define mp_memory_barrier()           __sync_synchronize()
--#define mp_atomic_add_and_fetch(a, b) __sync_add_and_fetch(a, b)
-+#include "config.h"
-+
-+#if HAVE_ATOMIC_BUILTINS
-+# define mp_memory_barrier()           __atomic_thread_fence(__ATOMIC_SEQ_CST)
-+# define mp_atomic_add_and_fetch(a, b) __atomic_add_fetch(a, b,__ATOMIC_SEQ_CST)
-+#else
-+# define mp_memory_barrier()           __sync_synchronize()
-+# define mp_atomic_add_and_fetch(a, b) __sync_add_and_fetch(a, b)
-+#endif
---- a/wscript
-+++ b/wscript
-@@ -99,6 +99,10 @@
-         'req': True,
-         'fmsg': 'Unable to find pthreads support.'
-     }, {
-+        'name': 'atomic_builtins',
-+        'desc': 'compiler support for __atomic built-ins ',
-+        'func': check_libs(['atomic'], check_statement('stdint.h', 'int64_t test = 0; test = __atomic_add_fetch(&test, 1, __ATOMIC_SEQ_CST)'))
-+    }, {
-         'name': 'librt',
-         'desc': 'linking with -lrt',
-         'deps': [ 'pthreads' ],
diff --git a/debian/patches/series b/debian/patches/series
index 9297b3d..db00e03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_desktop-path.patch
 02_fix-config-path.patch
 03_waf.patch
-04_use-atomic-not-sync.patch

-- 
mpv packaging