diff --git a/vlc-gcc6-buildfixes.patch b/vlc-gcc6-buildfixes.patch new file mode 100644 index 0000000..fe1608c --- /dev/null +++ b/vlc-gcc6-buildfixes.patch @@ -0,0 +1,388 @@ +From 66842e08e177e3c458fa0e4db970deae84feb625 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf +Date: Tue, 26 May 2015 13:39:00 +0200 +Subject: [PATCH 01/13] Fix C++11 compilation of atomic + +Close #14569 +--- + include/vlc_atomic.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 72 insertions(+) + +Index: vlc-2.2.3/include/vlc_atomic.h +=================================================================== +--- vlc-2.2.3.orig/include/vlc_atomic.h ++++ vlc-2.2.3/include/vlc_atomic.h +@@ -26,13 +26,20 @@ + * Atomic operations do not require locking, but they are not very powerful. + */ + +-# if !defined (__cplusplus) && (__STDC_VERSION__ >= 201112L) \ +- && !defined (__STDC_NO_ATOMICS__) ++/* Clang older versions support atomics but lacks the stdatomic.h header */ ++#if defined(__clang__) ++# if !defined(__has_include) || !__has_include() ++# define __STDC_NO_ATOMICS__ 1 ++# endif ++#endif + ++# ifndef __cplusplus ++# if (__STDC_VERSION__ >= 201112L) && !defined (__STDC_NO_ATOMICS__) + /*** Native C11 atomics ***/ +-# include ++# include + +-# else ++# else ++/*** Intel/GCC atomics ***/ + + # define ATOMIC_FLAG_INIT false + +@@ -53,22 +60,6 @@ + # define atomic_is_lock_free(obj) \ + false + +-/* In principles, __sync_*() only supports int, long and long long and their +- * unsigned equivalents, i.e. 4-bytes and 8-bytes types, although GCC also +- * supports 1 and 2-bytes types. Some non-x86 architectures do not support +- * 8-byte atomic types (or not efficiently). */ +-# if defined (_MSC_VER) +-/* Some atomic operations of the Interlocked API are only +- available for desktop apps. Thus we define the atomic types to +- be at least 32 bits wide. */ +-typedef int_least32_t atomic_flag; +-typedef int_least32_t atomic_bool; +-typedef int_least32_t atomic_char; +-typedef int_least32_t atomic_schar; +-typedef uint_least32_t atomic_uchar; +-typedef int_least32_t atomic_short; +-typedef uint_least32_t atomic_ushort; +-# else + typedef bool atomic_flag; + typedef bool atomic_bool; + typedef char atomic_char; +@@ -76,7 +67,6 @@ typedef signed char atomic_schar; + typedef unsigned char atomic_uchar; + typedef short atomic_short; + typedef unsigned short atomic_ushort; +-# endif + typedef int atomic_int; + typedef unsigned int atomic_uint; + typedef long atomic_long; +@@ -109,10 +99,6 @@ typedef ptrdiff_t atomic_ptrdiff + typedef intmax_t atomic_intmax_t; + typedef uintmax_t atomic_uintmax_t; + +-# if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || (defined (__clang__) && (defined (__x86_64__) || defined (__i386__))) +- +-/*** Intel/GCC atomics ***/ +- + # define atomic_store(object,desired) \ + do { \ + *(object) = (desired); \ +@@ -203,204 +189,7 @@ typedef uintmax_t atomic_uintmax + # define atomic_flag_clear_explicit(object,order) \ + atomic_flag_clear(object) + +-# elif defined (__GNUC__) +- +-/*** No atomics ***/ +- +-# define atomic_store(object,desired) \ +- do { \ +- typeof (object) _obj = (object); \ +- typeof (*object) _des = (desired); \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- *_obj = _des; \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- } while (0) +-# define atomic_store_explicit(object,desired,order) \ +- atomic_store(object,desired) +- +-# define atomic_load(object) \ +-({ \ +- typeof (object) _obj = (object); \ +- typeof (*object) _old; \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- _old = *_obj; \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- _old; \ +-}) +-# define atomic_load_explicit(object,order) \ +- atomic_load(object) +- +-# define atomic_exchange(object,desired) \ +-({ \ +- typeof (object) _obj = (object); \ +- typeof (*object) _des = (desired); \ +- typeof (*object) _old; \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- _old = *_obj; \ +- *_obj = _des; \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- _old; \ +-}) +-# define atomic_exchange_explicit(object,desired,order) \ +- atomic_exchange(object,desired) +- +-# define atomic_compare_exchange_strong(object,expected,desired) \ +-({ \ +- typeof (object) _obj = (object); \ +- typeof (object) _exp = (expected); \ +- typeof (*object) _des = (desired); \ +- bool ret; \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- ret = *_obj == *_exp; \ +- if (ret) \ +- *_obj = _des; \ +- else \ +- *_exp = *_obj; \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- ret; \ +-}) +-# define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \ +- atomic_compare_exchange_strong(object, expected, desired) +-# define atomic_compare_exchange_weak(object,expected,desired) \ +- atomic_compare_exchange_strong(object, expected, desired) +-# define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \ +- atomic_compare_exchange_weak(object, expected, desired) +- +-# define atomic_fetch_OP(object,desired,op) \ +-({ \ +- typeof (object) _obj = (object); \ +- typeof (*object) _des = (desired); \ +- typeof (*object) _old; \ +- vlc_global_lock(VLC_ATOMIC_MUTEX); \ +- _old = *_obj; \ +- *_obj = (*_obj) op (_des); \ +- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ +- _old; \ +-}) +- +-# define atomic_fetch_add(object,operand) \ +- atomic_fetch_OP(object,operand,+) +-# define atomic_fetch_add_explicit(object,operand,order) \ +- atomic_fetch_add(object,operand) +- +-# define atomic_fetch_sub(object,operand) \ +- atomic_fetch_OP(object,operand,-) +-# define atomic_fetch_sub_explicit(object,operand,order) \ +- atomic_fetch_sub(object,operand) +- +-# define atomic_fetch_or(object,operand) \ +- atomic_fetch_OP(object,operand,|) +-# define atomic_fetch_or_explicit(object,operand,order) \ +- atomic_fetch_or(object,operand) +- +-# define atomic_fetch_xor(object,operand) \ +- atomic_fetch_OP(object,operand,^) +-# define atomic_fetch_xor_explicit(object,operand,order) \ +- atomic_fetch_sub(object,operand) +- +-# define atomic_fetch_and(object,operand) \ +- atomic_fetch_OP(object,operand,&) +-# define atomic_fetch_and_explicit(object,operand,order) \ +- atomic_fetch_and(object,operand) +- +-# define atomic_flag_test_and_set(object) \ +- atomic_exchange(object, true) +- +-# define atomic_flag_test_and_set_explicit(object,order) \ +- atomic_flag_test_and_set(object) +- +-# define atomic_flag_clear(object) \ +- atomic_store(object, false) +- +-# define atomic_flag_clear_explicit(object,order) \ +- atomic_flag_clear(object) +- +-# elif defined (_MSC_VER) +- +-# include +- +-/*** Use the Interlocked API. ***/ +- +-/* Define macros in order to dispatch to the correct function depending on the type. +- Several ranges are need because some operations are not implemented for all types. */ +-# define atomic_type_dispatch_32_64(operation, object, ...) \ +- (sizeof(*object) == 4 ? operation((LONG *)object, __VA_ARGS__) : \ +- sizeof(*object) == 8 ? operation##64((LONGLONG *)object, __VA_ARGS__) : \ +- (abort(), 0)) +- +-# define atomic_type_dispatch_16_64(operation, object, ...) \ +- (sizeof(*object) == 2 ? operation##16((short *)object, __VA_ARGS__) : \ +- atomic_type_dispatch_32_64(operation, object, __VA_ARGS__)) +- +-# define atomic_type_dispatch_8_64(operation, object, ...) \ +- (sizeof(*object) == 1 ? operation##8((char *)object, __VA_ARGS__) : \ +- atomic_type_dispatch_16_64(operation, object, __VA_ARGS__)) +- +-# define atomic_store(object,desired) \ +- atomic_type_dispatch_16_64(InterlockedExchange, object, desired) +-# define atomic_store_explicit(object,desired,order) \ +- atomic_store(object, desired) +- +-# define atomic_load(object) \ +- atomic_type_dispatch_16_64(InterlockedCompareExchange, object, 0, 0) +-# define atomic_load_explicit(object,order) \ +- atomic_load(object) +- +-# define atomic_exchange(object,desired) \ +- atomic_type_dispatch_16_64(InterlockedExchange, object, desired) +-# define atomic_exchange_explicit(object,desired,order) \ +- atomic_exchange(object, desired) +- +-# define atomic_compare_exchange_strong(object,expected,desired) \ +- atomic_type_dispatch_16_64(InterlockedCompareExchange, object, *expected, desired) == *expected +-# define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \ +- atomic_compare_exchange_strong(object, expected, desired) +-# define atomic_compare_exchange_weak(object,expected,desired) \ +- atomic_compare_exchange_strong(object, expected, desired) +-# define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \ +- atomic_compare_exchange_weak(object, expected, desired) +- +-# define atomic_fetch_add(object,operand) \ +- atomic_type_dispatch_32_64(InterlockedExchangeAdd, object, operand) +-# define atomic_fetch_add_explicit(object,operand,order) \ +- atomic_fetch_add(object, operand) +- +-# define atomic_fetch_sub(object,operand) \ +- atomic_type_dispatch_32_64(InterlockedExchangeAdd, object, -(LONGLONG)operand) +-# define atomic_fetch_sub_explicit(object,operand,order) \ +- atomic_fetch_sub(object, operand) +- +-# define atomic_fetch_or(object,operand) \ +- atomic_type_dispatch_8_64(InterlockedOr, object, operand) +-# define atomic_fetch_or_explicit(object,operand,order) \ +- atomic_fetch_or(object, operand) +- +-# define atomic_fetch_xor(object,operand) \ +- atomic_type_dispatch_8_64(InterlockedXor, object, operand) +-# define atomic_fetch_xor_explicit(object,operand,order) \ +- atomic_fetch_sub(object, operand) +- +-# define atomic_fetch_and(object,operand) \ +- atomic_type_dispatch_8_64(InterlockedAnd, object, operand) +-# define atomic_fetch_and_explicit(object,operand,order) \ +- atomic_fetch_and(object, operand) +- +-# define atomic_flag_test_and_set(object) \ +- atomic_exchange(object, true) +- +-# define atomic_flag_test_and_set_explicit(object,order) \ +- atomic_flag_test_and_set(object) +- +-# define atomic_flag_clear(object) \ +- atomic_store(object, false) +- +-# define atomic_flag_clear_explicit(object,order) \ +- atomic_flag_clear(object) +- +-# else +-# error FIXME: implement atomic operations for this compiler. +-# endif +-# endif ++# endif /* !C11 */ + + typedef atomic_uint_least32_t vlc_atomic_float; + +@@ -427,4 +216,9 @@ static inline void vlc_atomic_store_floa + atomic_store(atom, u.i); + } + ++# else /* C++ */ ++/*** Native C++11 atomics ***/ ++# include ++# endif /* C++ */ ++ + #endif +Index: vlc-2.2.3/include/vlc_spu.h +=================================================================== +--- vlc-2.2.3.orig/include/vlc_spu.h ++++ vlc-2.2.3/include/vlc_spu.h +@@ -45,9 +45,6 @@ extern "C" { + + typedef struct spu_private_t spu_private_t; + +-/* Default subpicture channel ID */ +-#define SPU_DEFAULT_CHANNEL (1) +- + /** + * Subpicture unit descriptor + */ +Index: vlc-2.2.3/include/vlc_vout_osd.h +=================================================================== +--- vlc-2.2.3.orig/include/vlc_vout_osd.h ++++ vlc-2.2.3/include/vlc_vout_osd.h +@@ -26,12 +26,13 @@ + #ifndef VLC_VOUT_OSD_H + #define VLC_VOUT_OSD_H 1 + +-#include +- + #ifdef __cplusplus + extern "C" { + #endif + ++//* Default subpicture channel ID */ ++#define SPU_DEFAULT_CHANNEL (1) ++ + /** + * OSD menu position and picture type defines + */ +Index: vlc-2.2.3/src/video_output/video_output.c +=================================================================== +--- vlc-2.2.3.orig/src/video_output/video_output.c ++++ vlc-2.2.3/src/video_output/video_output.c +@@ -43,6 +43,7 @@ + #include + + #include ++#include + #include + #include + +Index: vlc-2.2.3/modules/gui/qt4/dialogs/messages.hpp +=================================================================== +--- vlc-2.2.3.orig/modules/gui/qt4/dialogs/messages.hpp ++++ vlc-2.2.3/modules/gui/qt4/dialogs/messages.hpp +@@ -28,8 +28,8 @@ + #include "util/singleton.hpp" + #include "ui/messages_panel.h" + #include +-#include + #include ++#include + + class QTabWidget; + class QPushButton; +@@ -55,7 +55,7 @@ private: + void sinkMessage( const MsgEvent * ); + bool matchFilter( const QString& ); + +- atomic_uint verbosity; ++ QAtomicInt verbosity; + static void MsgCallback( void *, int, const vlc_log_t *, const char *, + va_list ); + +Index: vlc-2.2.3/modules/gui/qt4/dialogs/messages.cpp +=================================================================== +--- vlc-2.2.3.orig/modules/gui/qt4/dialogs/messages.cpp ++++ vlc-2.2.3/modules/gui/qt4/dialogs/messages.cpp +@@ -143,7 +143,7 @@ MessagesDialog::~MessagesDialog() + + void MessagesDialog::changeVerbosity( int i_verbosity ) + { +- atomic_store( &this->verbosity, i_verbosity ); ++ verbosity = i_verbosity; + } + + void MessagesDialog::updateConfig() +@@ -337,7 +337,7 @@ void MessagesDialog::MsgCallback( void * + { + MessagesDialog *dialog = (MessagesDialog *)self; + char *str; +- int verbosity = atomic_load( &dialog->verbosity ); ++ int verbosity = dialog->verbosity; + + if( verbosity < 0 || verbosity < (type - VLC_MSG_ERR) + || unlikely(vasprintf( &str, format, ap ) == -1) ) diff --git a/vlc.changes b/vlc.changes index 257b8e3..ae607b0 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue May 24 13:39:13 UTC 2016 - dimstar@opensuse.org + +- Add vlc-gcc6-buildfixes.patch: fix build with GCC 6. This patch + file is a collection of the backported commits from master: + + 5d26efcad8d1aa5023028e3caa5a608b5e1d81fe + + 406f697d5592752efc8a0479e48512ed20ab274b + + 569df08d1be561022b86ce9c58dece388532e818 + + 45495aa458ef6856ee9eb18860706149148bb660 + + a7a70e8163e04244d733f4745dc8cbbc7502b830 + + ada4b4748eefcfd22f1417ed223f1381c694aa60 + + 0bcb7fd2567ba494b730234609b146cd8e23483c + + 59678ec0b489d86f6f62cc987e21a82346f8da42 + + e8b683357b2ccc2bbd1ffbcb4783441a3620a6ea + + ab550d60dd8d823b8ddacd2d4759f0840a9ea352 + + f5d5cb75768b692359068e837f72c9fd7cf6bd45 + + c5f80f5bc4cb498c8eb7469650437e92ae6d085a + + 66842e08e177e3c458fa0e4db970deae84feb625 + + 98b4e987252f798213effa5ed6d19d958d6d9d42 + + d2571e643edb0f1cb217805ef8d5ac172d59a864 +- Disable atmoLight sensor: pass --disable-atmo to configure. This + module fails to build with GCC 6 and has been removed upstream + for the next version of VLC already (671304). + ------------------------------------------------------------------- Mon May 23 10:09:24 UTC 2016 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 1c2163f..ae516e0 100644 --- a/vlc.spec +++ b/vlc.spec @@ -47,6 +47,8 @@ Patch3: 0001-no-return-in-non-void.patch Patch4: vlc-2.2.0-fix_deinterlace_mmx.patch # PATCH-FIX-UPSTREAM vlc-support-qt5.5.patch dimstar@opensuse.org -- The Qt 5.5 packages in Leap and Tumbleweed are patched. Other dists don't have Qt 5.5 yet. Patch from upstream, reverse applied Patch5: vlc-support-qt5.5.patch +# PATCH-FIX-UPSTREAM vlc-gcc6-buildfixes.patch dimstar@opensuse.org -- A collection of upstream commits to fix build with gcc6 +Patch6: vlc-gcc6-buildfixes.patch BuildRequires: Mesa-devel BuildRequires: SDL-devel >= 1.2.10 BuildRequires: aalib-devel @@ -308,6 +310,9 @@ date # openSUSE 13.2 (also > 1310) comes with Qt 5.3, so is not affected, but the patch does not harm %patch5 -p1 -R %endif +if [ $(gcc -dumpversion) -ge 6 ]; then +%patch6 -p1 +fi ### Fix up sources for LUA 5.3 if pkg-config --atleast-version 5.3 lua; then @@ -437,6 +442,7 @@ export CXXFLAGS="%{optflags}" %if %{with opengles} --enable-gles2 \ %endif + --disable-atmo \ %if 0%{?suse_version} > 1140 && 0%{?BUILD_ORIG} --enable-vdpau \ %else @@ -1014,7 +1020,6 @@ done %{_libdir}/vlc/plugins/video_filter/libalphamask_plugin.so %{_libdir}/vlc/plugins/video_filter/libanaglyph_plugin.so %{_libdir}/vlc/plugins/video_filter/libantiflicker_plugin.so -%{_libdir}/vlc/plugins/video_filter/libatmo_plugin.so %{_libdir}/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so %{_libdir}/vlc/plugins/video_filter/libball_plugin.so %{_libdir}/vlc/plugins/video_filter/libblend_plugin.so