commit 3f831c15fb595595964a0a2480d98a5c9721853f
Author: Jan Rękorajski <[email protected]>
Date: Sat Mar 11 21:27:33 2017 +0100
- fix atomic ops on gcc6
- disable projectM (broken headers on gcc6)
- rel 5
atomic.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
vlc.spec | 6 ++++--
2 files changed, 53 insertions(+), 2 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index cab31fe..85c0607 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -37,7 +37,7 @@
%bcond_without notify # libnotify notification plugin
%bcond_without opencv # OpenCV video filter [needs vlc API update]
%bcond_with oss4 # OSSv4
-%bcond_without projectM # projectm visualization plugin
+%bcond_with projectM # projectm visualization plugin
%bcond_without sftp # SFTP file transfer via libssh2
%bcond_without shout # shout access output plugin
%bcond_without smb # SMB access plugin
@@ -65,7 +65,7 @@ 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: 4
+Release: 5
License: GPL v2+
Group: X11/Applications/Multimedia
Source0:
http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
@@ -76,6 +76,7 @@ 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
@@ -344,6 +345,7 @@ Akcje klienta VLC dla Solid.
%endif
%patch4 -p1
%patch5 -p1
+%patch6 -p1
sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
diff --git a/atomic.patch b/atomic.patch
new file mode 100644
index 0000000..2b500bb
--- /dev/null
+++ b/atomic.patch
@@ -0,0 +1,49 @@
+From: Steve Lhomme <[email protected]>
+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 <[email protected]>
+---
+
+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 <[email protected]>
+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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vlc.git/commitdiff/3f831c15fb595595964a0a2480d98a5c9721853f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
