diff --git a/0001-no-return-in-non-void.patch b/0001-no-return-in-non-void.patch deleted file mode 100644 index 0e9725f..0000000 --- a/0001-no-return-in-non-void.patch +++ /dev/null @@ -1,104 +0,0 @@ -Index: vlc-2.2.6/modules/access/v4l2/demux.c -=================================================================== ---- vlc-2.2.6.orig/modules/access/v4l2/demux.c -+++ vlc-2.2.6/modules/access/v4l2/demux.c -@@ -634,6 +634,7 @@ static void *MmapThread (void *data) - } - - assert (0); -+ return NULL; /* dead code, but the compiler can't know */ - } - - static void *ReadThread (void *data) -@@ -696,6 +697,7 @@ static void *ReadThread (void *data) - #endif - } - assert (0); -+ return NULL; /* dead code, but the compiler can't know */ - } - - static int DemuxControl( demux_t *demux, int query, va_list args ) -Index: vlc-2.2.6/modules/control/dbus/dbus.c -=================================================================== ---- vlc-2.2.6.orig/modules/control/dbus/dbus.c -+++ vlc-2.2.6/modules/control/dbus/dbus.c -@@ -891,6 +891,7 @@ static void *Run( void *data ) - vlc_restorecancel( canc ); - } - assert(0); -+ return NULL; /* dead code, but the compiler can't know */ - } - - static void wakeup_main_loop( void *p_data ) -Index: vlc-2.2.6/modules/control/motion.c -=================================================================== ---- vlc-2.2.6.orig/modules/control/motion.c -+++ vlc-2.2.6/modules/control/motion.c -@@ -188,6 +188,7 @@ static void *RunIntf( void *data ) - vlc_restorecancel( canc ); - } - assert(0); -+ return NULL; /* dead code, but the compiler can't know */ - } - #undef LOW_THRESHOLD - #undef HIGH_THRESHOLD -Index: vlc-2.2.6/modules/control/motionlib.c -=================================================================== ---- vlc-2.2.6.orig/modules/control/motionlib.c -+++ vlc-2.2.6/modules/control/motionlib.c -@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensor - default: - assert( 0 ); - } -+ return 0; /* dead code, but the compiler can't know */ - } - - /***************************************************************************** -Index: vlc-2.2.6/modules/stream_out/rtp.c -=================================================================== ---- vlc-2.2.6.orig/modules/stream_out/rtp.c -+++ vlc-2.2.6/modules/stream_out/rtp.c -@@ -1499,6 +1499,7 @@ static void *rtp_listen_thread( void *da - } - - assert( 0 ); -+ return NULL; /* dead code, but the compiler can't know */ - } - - -Index: vlc-2.2.6/modules/visualization/visual/visual.c -=================================================================== ---- vlc-2.2.6.orig/modules/visualization/visual/visual.c -+++ vlc-2.2.6/modules/visualization/visual/visual.c -@@ -382,6 +382,7 @@ static void *Thread( void *data ) - vlc_restorecancel( canc ); - } - assert(0); -+ return NULL; - } - - static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf ) -Index: vlc-2.2.6/src/misc/events.c -=================================================================== ---- vlc-2.2.6.orig/src/misc/events.c -+++ vlc-2.2.6/src/misc/events.c -@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_ - FOREACH_END() - /* Unknown event = BUG */ - assert( 0 ); -+ return 0; - } - - /** -Index: vlc-2.2.6/modules/demux/mp4/mp4.c -=================================================================== ---- vlc-2.2.6.orig/modules/demux/mp4/mp4.c -+++ vlc-2.2.6/modules/demux/mp4/mp4.c -@@ -386,6 +386,7 @@ static void CreateTracksFromSmooBox( dem - p_track->p_es = es_out_Add( p_demux->out, &p_track->fmt ); - } - } -+ return 0; - } - - /***************************************************************************** diff --git a/vlc-2.2.0-fix_deinterlace_mmx.patch b/vlc-2.2.0-fix_deinterlace_mmx.patch deleted file mode 100644 index 587a549..0000000 --- a/vlc-2.2.0-fix_deinterlace_mmx.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- modules/video_filter/deinterlace/merge.c.orig 2015-03-04 07:55:02.021482260 +0100 -+++ modules/video_filter/deinterlace/merge.c 2015-03-04 07:56:33.975885612 +0100 -@@ -68,116 +68,6 @@ - *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; - } - --#if defined(CAN_COMPILE_MMXEXT) --VLC_MMX --void MergeMMXEXT( void *_p_dest, const void *_p_s1, const void *_p_s2, -- size_t i_bytes ) --{ -- uint8_t *p_dest = _p_dest; -- const uint8_t *p_s1 = _p_s1; -- const uint8_t *p_s2 = _p_s2; -- -- for( ; i_bytes >= 8; i_bytes -= 8 ) -- { -- __asm__ __volatile__( "movq %2,%%mm1;" -- "pavgb %1, %%mm1;" -- "movq %%mm1, %0" :"=m" (*p_dest): -- "m" (*p_s1), -- "m" (*p_s2) : "mm1" ); -- p_dest += 8; -- p_s1 += 8; -- p_s2 += 8; -- } -- -- for( ; i_bytes > 0; i_bytes-- ) -- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; --} --#endif -- --#if defined(CAN_COMPILE_3DNOW) --VLC_MMX --void Merge3DNow( void *_p_dest, const void *_p_s1, const void *_p_s2, -- size_t i_bytes ) --{ -- uint8_t *p_dest = _p_dest; -- const uint8_t *p_s1 = _p_s1; -- const uint8_t *p_s2 = _p_s2; -- -- for( ; i_bytes >= 8; i_bytes -= 8 ) -- { -- __asm__ __volatile__( "movq %2,%%mm1;" -- "pavgusb %1, %%mm1;" -- "movq %%mm1, %0" :"=m" (*p_dest): -- "m" (*p_s1), -- "m" (*p_s2) : "mm1" ); -- p_dest += 8; -- p_s1 += 8; -- p_s2 += 8; -- } -- -- for( ; i_bytes > 0; i_bytes-- ) -- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; --} --#endif -- --#if defined(CAN_COMPILE_SSE) --VLC_SSE --void Merge8BitSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2, -- size_t i_bytes ) --{ -- uint8_t *p_dest = _p_dest; -- const uint8_t *p_s1 = _p_s1; -- const uint8_t *p_s2 = _p_s2; -- -- for( ; i_bytes > 0 && ((uintptr_t)p_s1 & 15); i_bytes-- ) -- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; -- -- for( ; i_bytes >= 16; i_bytes -= 16 ) -- { -- __asm__ __volatile__( "movdqu %2,%%xmm1;" -- "pavgb %1, %%xmm1;" -- "movdqu %%xmm1, %0" :"=m" (*p_dest): -- "m" (*p_s1), -- "m" (*p_s2) : "xmm1" ); -- p_dest += 16; -- p_s1 += 16; -- p_s2 += 16; -- } -- -- for( ; i_bytes > 0; i_bytes-- ) -- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; --} -- --VLC_SSE --void Merge16BitSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2, -- size_t i_bytes ) --{ -- uint16_t *p_dest = _p_dest; -- const uint16_t *p_s1 = _p_s1; -- const uint16_t *p_s2 = _p_s2; -- -- size_t i_words = i_bytes / 2; -- for( ; i_words > 0 && ((uintptr_t)p_s1 & 15); i_words-- ) -- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; -- -- for( ; i_words >= 8; i_words -= 8 ) -- { -- __asm__ __volatile__( "movdqu %2,%%xmm1;" -- "pavgw %1, %%xmm1;" -- "movdqu %%xmm1, %0" :"=m" (*p_dest): -- "m" (*p_s1), -- "m" (*p_s2) : "xmm1" ); -- p_dest += 8; -- p_s1 += 8; -- p_s2 += 8; -- } -- -- for( ; i_words > 0; i_words-- ) -- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; --} -- --#endif -- - #ifdef CAN_COMPILE_C_ALTIVEC - void MergeAltivec( void *_p_dest, const void *_p_s1, - const void *_p_s2, size_t i_bytes ) diff --git a/vlc-2.2.8.tar.xz b/vlc-2.2.8.tar.xz deleted file mode 100644 index cfc5e46..0000000 --- a/vlc-2.2.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec -size 22137276 diff --git a/vlc-3.0.0.tar.xz b/vlc-3.0.0.tar.xz new file mode 100644 index 0000000..ba69a0e --- /dev/null +++ b/vlc-3.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68d587999f50d58df5ca3d69998bba910bdb5a82e5a1a39247179932fae0c19c +size 25191148 diff --git a/vlc-gcc6-buildfixes.patch b/vlc-gcc6-buildfixes.patch deleted file mode 100644 index fe1608c..0000000 --- a/vlc-gcc6-buildfixes.patch +++ /dev/null @@ -1,388 +0,0 @@ -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-projectM-qt5.patch b/vlc-projectM-qt5.patch index f97295f..d3a4ded 100644 --- a/vlc-projectM-qt5.patch +++ b/vlc-projectM-qt5.patch @@ -1,8 +1,8 @@ -Index: vlc-2.2.6/configure.ac +Index: vlc-3.0.0/configure.ac =================================================================== ---- vlc-2.2.6.orig/configure.ac -+++ vlc-2.2.6/configure.ac -@@ -3965,12 +3965,12 @@ AC_ARG_ENABLE(projectm, +--- vlc-3.0.0.orig/configure.ac ++++ vlc-3.0.0/configure.ac +@@ -3950,12 +3950,12 @@ AC_ARG_ENABLE(projectm, [ --enable-projectm projectM visualization plugin (default enabled)]) AS_IF([test "${enable_projectm}" != "no"], [ @@ -19,16 +19,16 @@ Index: vlc-2.2.6/configure.ac ]) ],[ AC_MSG_WARN([${PROJECTM_PKG_ERRORS}.]) -Index: vlc-2.2.6/modules/visualization/projectm.cpp +Index: vlc-3.0.0/modules/visualization/projectm.cpp =================================================================== ---- vlc-2.2.6.orig/modules/visualization/projectm.cpp -+++ vlc-2.2.6/modules/visualization/projectm.cpp -@@ -44,7 +44,7 @@ +--- vlc-3.0.0.orig/modules/visualization/projectm.cpp ++++ vlc-3.0.0/modules/visualization/projectm.cpp +@@ -34,7 +34,7 @@ #include #include -#include +#include - /***************************************************************************** - * Module descriptor + #ifndef _WIN32 + # include diff --git a/vlc-support-qt5.5.patch b/vlc-support-qt5.5.patch deleted file mode 100644 index 6efddf6..0000000 --- a/vlc-support-qt5.5.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 64dccb0fdd71075e37e03c4b52a0c9f5bb749d3f Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf -Date: Mon, 16 Nov 2015 14:54:35 +0100 -Subject: [PATCH 1/1] Configure: Refuse Qt 5.5.0 and 5.5.1 - -If you are a packager, I'm sorry for you, but you MUST patch Qt5.5 with -https://codereview.qt-project.org/#/c/139066/1 -and then revert this commit. -You can also lobby for a Qt5.5.2 ---- - configure.ac | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 63a0577..d90097c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3735,6 +3735,11 @@ AS_IF([test "${enable_qt}" != "no"], [ - ],[ - AC_MSG_WARN([Not building Qt Interface with X11 helpers.]) - ]) -+ -+ PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [ -+ AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"]) -+ ]) -+ - QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)" - QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)" - AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) --- -1.7.10.4 - - diff --git a/vlc.a52.patch b/vlc.a52.patch index 706a12b..1767eef 100644 --- a/vlc.a52.patch +++ b/vlc.a52.patch @@ -1,11 +1,13 @@ ---- a/modules/audio_filter/converter/a52tofloat32.c -+++ b/modules/audio_filter/converter/a52tofloat32.c -@@ -209,7 +209,7 @@ static int Open( vlc_object_t *p_this, f +Index: vlc-3.0.0/modules/codec/a52.c +=================================================================== +--- vlc-3.0.0.orig/modules/codec/a52.c ++++ vlc-3.0.0/modules/codec/a52.c +@@ -302,7 +302,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_flags |= A52_ADJUST_LEVEL; /* Initialize liba52 */ - p_sys->p_liba52 = a52_init( 0 ); -+ p_sys->p_liba52 = a52_init(); ++ p_sys->p_liba52 = a52_init (); if( p_sys->p_liba52 == NULL ) { msg_Err( p_this, "unable to initialize liba52" ); diff --git a/vlc.appdata.xml b/vlc.appdata.xml deleted file mode 100644 index 35a4cc4..0000000 --- a/vlc.appdata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - vlc.desktop - CC0-1.0 - VLC Media player - GPL-2.0+ and LGPL-2.1+ - Read, capture, broadcast your multimedia streams - http://www.videolan.org - -

VLC media player is a highly portable multimedia player for various -audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) -as well as DVDs, VCDs, and various streaming protocols. -It can also be used as a server to stream in unicast or multicast -in IPv4 or IPv6 on a high-bandwidth network.

-

Features:

-
    -
  • Fast hardware decoding on most platforms.
    • -
  • Supports playback of all video and audio formats (might require additional codecs).
    • -
  • The most complete feature-set over the video, subtitle synchronisation, video and audio filters.
    • -
  • Miscellaneous: SAP/SDP announces, Bonjour protocol, Mozilla/Firefox plugin, ActiveX plugin, SVCD Menus, Localization, CD-Text, CDDB CD info, IGMPv3, IPv6, MLDv2, CPU acceleration.
    • -
- - - - http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg - Playing video - - - http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg - Add files to playlist - - - vlc-devel@videolan.org - diff --git a/vlc.changes b/vlc.changes index 291df7e..e35db44 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Mon Feb 12 10:52:18 UTC 2018 - dimstar@opensuse.org + +- Add cache regeneration post/postun scriptlets to gstreamer-codec + subpackage. + +------------------------------------------------------------------- +Thu Feb 8 12:39:26 UTC 2018 - dimstar@opensuse.org + +- Update to Version 3.0.0: + + Core: + - Support network browsing for distant filesystems (SMB, FTP, + SFTP, NFS...) and rewrite the parsing of the media files and + inputs. + - Support keystores: fetch and store passwords securely (sic!) + for common protocols (HTTP, SMB, SFTP, FTP, RTSP ...). + - Autodetect external audio tracks (ac3, m4a, aac, dts...) + similar to subtitles. + - Support HDMI passthrough for Audio HD codecs, like E-AC3, + TrueHD or DTS-HD. + - Support for 12bits codec and extended colorspaces (HDR). + - Support output renderers, like ChromeCast. + - VLC now assumes vlcrc config file is in UTF-8. + - Support portable version of Windows build (create a + "portable/" folder). + - Support wayland surface type. + - Allow to start the video paused on the first frame. + - Refactor preparsing input. + - EPG rework: table and single event updates, now using network + time. + - Refactor and fix subtitles es selection. Demuxers can now + override es category single only or multiple es behavior. + - Support for 360 video and audio, including viewpoint + modification. + - Support for ambisonic audio and more than 8 audio channels. + - Support subtitles size live adjustments. + + For a full list of changes to the various modules, see the + packaged NEWS file. +- Rebase vlc-projectM-qt5.patch and vlc.a52.patch. +- Drop obsoleted patches: 0001-no-return-in-non-void.patch, + vlc-support-qt5.5.patch, vlc-gcc6-buildfixes.patch, + vlc-2.2.0-fix_deinterlace_mmx.patch. + ------------------------------------------------------------------- Sun Dec 3 16:20:45 UTC 2017 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 712b01a..33e6837 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,7 +1,7 @@ # # spec file for package vlc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -18,24 +18,20 @@ %define libvlc 5 -%define libvlccore 8 +%define libvlccore 9 %define conflicts vlc-beta -%if 0%{?suse_version} >= 1200 -%bcond_without gstreamer -%else -%bcond_with gstreamer -%endif -%ifarch %arm +%ifarch %{arm} %bcond_without opengles %else %bcond_with opengles %endif +%bcond_without gstreamer # Fluidsynth plugin is known to cause strange crashes here and there - disable it for now (2014-10-07, DimStar) %bcond_with fluidsynth # VNC support - the module is not really usable in most cases tested so far (e.g. against qemu-kvm -vnc :xx) %bcond_with vnc Name: vlc -Version: 2.2.8 +Version: 3.0.0 Release: 0 Summary: Graphical media player License: GPL-2.0+ AND LGPL-2.1+ @@ -45,16 +41,10 @@ Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{versio # Add vlc.changes as source, so we can reproducibly extract the date from it during build Source1: %{name}.changes Source2: %{name}-rpmlintrc -Source3: %{name}.appdata.xml -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 -Patch7: vlc.a52.patch -# PATCH-FIX-OPENSUSE vlc-projectM-qt5.patch -- link to libprojectM-qt5 -Patch8: vlc-projectM-qt5.patch +# PATCH-FIX-UPSTREAM vlc.a52.patch https://trac.videolan.org/vlc/ticket/3731 dimstar@opensuse.org -- Support new version of liba52 +Patch0: vlc.a52.patch +# PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant +Patch100: vlc-projectM-qt5.patch BuildRequires: Mesa-devel BuildRequires: SDL-devel >= 1.2.10 BuildRequires: aalib-devel @@ -63,11 +53,14 @@ BuildRequires: avahi-devel >= 0.6 BuildRequires: dirac-devel BuildRequires: fdupes BuildRequires: findutils +BuildRequires: flac-devel BuildRequires: freetype2 BuildRequires: fribidi-devel +BuildRequires: gdk-pixbuf-devel BuildRequires: gettext-devel -BuildRequires: git -BuildRequires: gtk2-devel +#BuildRequires: git +BuildRequires: gtk3-devel +BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libavc1394-devel >= 0.5.3 BuildRequires: libcddb-devel >= 0.9.5 BuildRequires: libcdio-devel >= 0.78.2 @@ -78,7 +71,7 @@ BuildRequires: libidn-devel BuildRequires: libjack-devel >= 1.9.7 BuildRequires: libjpeg-devel BuildRequires: libkate-devel >= 0.3.0 -BuildRequires: libnotify-devel +BuildRequires: libmatroska-devel BuildRequires: libogg-devel >= 1.0 BuildRequires: libopus-devel >= 1.0.3 BuildRequires: libraw1394 >= 2.0.1 @@ -90,6 +83,7 @@ BuildRequires: libssh2-devel BuildRequires: libtheora-devel >= 1.0 BuildRequires: libtool BuildRequires: libudev-devel >= 142 +BuildRequires: libv4l-devel BuildRequires: libvorbis-devel >= 1.1 BuildRequires: libvpx-devel BuildRequires: libxml2-devel >= 2.5 @@ -98,65 +92,76 @@ BuildRequires: live555-devel >= 2015.01.27 BuildRequires: lua-devel >= 5.1 BuildRequires: pcre-devel BuildRequires: pkgconfig +BuildRequires: posix_cc BuildRequires: schroedinger-devel >= 1.0.10 -BuildRequires: slang-devel +#BuildRequires: slang-devel BuildRequires: speex-devel >= 1.0.5 BuildRequires: update-desktop-files BuildRequires: vcdimager-devel BuildRequires: xosd-devel -BuildRequires: xz -BuildRequires: pkgconfig(libavcodec) >= 55.26.0 +BuildRequires: pkgconfig(Qt5Core) >= 5.5.0 +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(caca) >= 0.99.beta14 +BuildRequires: pkgconfig(dbus-1) >= 1.6.0 +BuildRequires: pkgconfig(dvdnav) > 4.9.0 +BuildRequires: pkgconfig(dvdread) > 4.9.0 +BuildRequires: pkgconfig(gnutls) >= 3.2.0 +BuildRequires: pkgconfig(libarchive) >= 3.1.0 +BuildRequires: pkgconfig(libass) >= 0.9.8 +BuildRequires: pkgconfig(libavcodec) >= 57.37.100 BuildRequires: pkgconfig(libavformat) >= 53.21.0 BuildRequires: pkgconfig(libavutil) >= 52.4.0 +BuildRequires: pkgconfig(libbluray) >= 0.3.0 +BuildRequires: pkgconfig(libgme) BuildRequires: pkgconfig(libmodplug) >= 0.8.4 +BuildRequires: pkgconfig(libmtp) >= 1.0.0 +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libpulse) >= 1.0 +BuildRequires: pkgconfig(libsecret-1) >= 0.18 +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libva) +BuildRequires: pkgconfig(libva-wayland) +BuildRequires: pkgconfig(libva-x11) +BuildRequires: pkgconfig(protobuf-lite) >= 2.5.0 +BuildRequires: pkgconfig(speexdsp) +BuildRequires: pkgconfig(taglib) >= 1.9 +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(xcb) >= 1.6 +BuildRequires: pkgconfig(xcb-composite) +BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4 +BuildRequires: pkgconfig(xcb-randr) >= 1.3 +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xv) >= 1.1.90.1 +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 Requires: %{name}-noX = %{version}-%{release} Requires: %{name}-qt = %{version}-%{release} +# FIXME: use proper Requires(pre/post/preun/...) # We need the noX package first, as it contains vlc-cache-gen PreReq: %{name}-noX Conflicts: %{conflicts} Obsoletes: %{name}-gnome <= %{version} -BuildConflicts: pkgconfig(libavutil) >= 55 %if %{with gstreamer} BuildRequires: pkgconfig(gstreamer-app-1.0) %endif -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} -BuildRequires: flac-devel -%endif -%if 0%{?suse_version} >= 1310 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Widgets) %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: pkgconfig(Qt5X11Extras) # for some reason libXi-devel is explicitly needed on Leap 42.1, otherwise the build fails... BuildRequires: pkgconfig(xi) %endif -%else -BuildRequires: libqt4-devel >= 4.6.0 -%endif -%if 0%{?suse_version} > 1110 -BuildRequires: gdk-pixbuf-devel -BuildRequires: libv4l-devel -BuildRequires: pkgconfig(caca) >= 0.99.beta14 -BuildRequires: pkgconfig(speexdsp) -BuildRequires: pkgconfig(xcb) >= 1.6 -BuildRequires: pkgconfig(xcb-composite) -BuildRequires: pkgconfig(xcb-randr) >= 1.3 -BuildRequires: pkgconfig(xcb-shm) -BuildRequires: pkgconfig(xcb-xv) >= 1.1.90.1 -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xproto) -BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 -%endif -%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} BuildRequires: pkgconfig(libswscale) %endif -%if 0%{?suse_version} > 1110 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: pkgconfig(SDL_image) >= 1.2.10 BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(opencv) > 2.0 -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 %if 0%{?suse_version} > 1320 BuildRequires: pkgconfig(libprojectM-qt5) >= 2.0.0 %else @@ -164,26 +169,6 @@ BuildRequires: pkgconfig(libprojectM) >= 2.0.0 %endif %endif %endif -%endif -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} -BuildRequires: libmatroska-devel -BuildRequires: pkgconfig(dvdnav) > 4.9.0 -BuildRequires: pkgconfig(dvdread) > 4.9.0 -BuildRequires: pkgconfig(libass) >= 0.9.8 -BuildRequires: pkgconfig(libgme) -BuildRequires: pkgconfig(libmtp) >= 1.0.0 -BuildRequires: pkgconfig(libva) -BuildRequires: pkgconfig(libva-x11) -BuildRequires: pkgconfig(taglib) >= 1.9 -%endif -%if 0%{?suse_version} > 1140 -BuildRequires: pkgconfig(dbus-1) >= 1.6.0 -BuildRequires: pkgconfig(gnutls) >= 3.2.0 -BuildRequires: pkgconfig(libbluray) >= 0.3.0 -BuildRequires: pkgconfig(libpulse) >= 1.0 -BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4 -BuildRequires: pkgconfig(xinerama) -BuildRequires: pkgconfig(xpm) %if 0%{?suse_version} < 1330 && ( 0%{?sle_version} < 120200 || 0%{?is_opensuse} < 1 ) BuildRequires: pkgconfig(freerdp) >= 1.0.1 %endif @@ -196,33 +181,22 @@ BuildRequires: pkgconfig(fluidsynth) >= 1.1.2 %if 0%{?suse_version} != 1315 BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 %endif -%endif %if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(ncursesw) %endif -%if (0%{?suse_version} >= 1330) || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200) -# for TW, we favor ffmpeg2-devel. Older distros have ffmpeg 2.x intree -BuildRequires: ffmpeg2-devel -%endif # Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons. %if 0%{?BUILD_ORIG} BuildRequires: faad2-devel -# Disabled for now - VideoLAN repo needs to catch up BuildRequires: liba52-devel BuildRequires: libfaac-devel -# Disabled for now - VideoLAN repo needs to catch up BuildRequires: libmad-devel BuildRequires: libxvidcore-devel BuildRequires: pkgconfig(libdca) >= 0.0.5 BuildRequires: pkgconfig(libmpeg2) > 0.3.2 BuildRequires: pkgconfig(libpostproc) BuildRequires: pkgconfig(twolame) -BuildRequires: pkgconfig(x264) >= 0.8.6 -# Disabled for now - VideoLAN repo needs to catch up -#BuildRequires: pkgconfig(x265) -%if 0%{?suse_version} > 1140 BuildRequires: pkgconfig(vdpau) >= 0.6 -%endif +BuildRequires: pkgconfig(x264) >= 0.8.6 %endif %description @@ -289,6 +263,7 @@ installed as a dependency. # (AppStream based) can't see vlc being translated (vlc is the one listed in SC # not vlc-noX) %package lang +# FIXME: consider using %%lang_package macro Summary: Translations for package %{name} # We do not want to require vlc, which is GUI based, but only vlc-noX Group: System/Localization @@ -314,6 +289,7 @@ using GStreamer and its submodules as a backend to decode streams. %package codecs Summary: Additional codecs for the VLC media player # We require the unrestricted libavcodec - same ABI version we linked +# FIXME: Use %requires_eq macro instead Group: Productivity/Multimedia/Video/Players Requires: %{name}-noX = %{version} Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted) @@ -340,37 +316,14 @@ This subpackage provides a Qt interface for VLC and selects it by default when `vlc` is invoked from an X session. %prep -echo '********* ENTERED PREP PHASE ********' -date %setup -q -%patch3 -p1 -%if 0%{?suse_version} == 1110 -%ifarch %ix86 -%patch4 -%endif -%endif -%if 0%{?suse_version} > 1310 -# openSUSE Leap and Tumbleweed have Qt 5.5.x, but with the required patch applied -# 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 -%patch7 -p1 -%if 0%{?suse_version} > 1320 -%patch8 -p1 -%endif - -### Fix up sources for LUA 5.3 -if pkg-config --atleast-version 5.3 lua; then - sed -i 's/luaL_optint/(int)&eger/' modules/lua/libs/{net,osd,volume}.c -fi +%patch0 -p1 +%patch100 -p1 ### And LUA 5.3.1 has some more API changes if pkg-config --atleast-version 5.3.1 lua; then sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \ - modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c + modules/lua/{demux,libs/{configuration,dialog,net,osd,playlist,stream,variables,volume}}.c fi # We do not rely on contrib but make use of system libraries @@ -379,63 +332,32 @@ rm -rf contrib # Remove build time references so build-compare can do its work FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE1} '+%%H:%%M') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE1} '+%%b %%e %%Y') -sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c -sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c - -echo '********* ENDED PREP PHASE *********' -date +sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt/dialogs/help.cpp src/config/help.c +sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/config/help.c %build -echo '********* BOOTSTRAPPING *********' -date -export CFLAGS="%{optflags} -fPIE" -export CXXFLAGS="%{optflags} -fPIE" -export LDFLAGS="-pie" -%if 0%{?suse_version} > 1140 -./bootstrap -%endif %configure \ --disable-dependency-tracking \ --enable-aa \ --enable-alsa \ --enable-dvbpsi \ -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} --enable-dvdnav \ --enable-dvdread \ --enable-flac \ -%endif --enable-fast-install \ -%if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1330 && ( 0%{?sle_version} < 120200 || 0%{?is_opensuse} < 1 ) - --enable-freerdp \ -%endif --enable-freetype \ --enable-fribidi \ - --disable-gnomevfs \ -%if 0%{?suse_version} > 1140 --enable-gnutls \ -%endif - --enable-httpd \ --enable-jack \ -%if 0%{?suse_version} <= 1140 - --disable-jpeg \ -%endif --enable-kate \ -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} --enable-libass \ -%endif --enable-libcddb \ -%if 0%{?suse_version} > 1110 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} --enable-opencv \ -%endif -%endif -%if 0%{?suse_version} <= 1140 - --disable-mmx \ - --disable-sse \ %endif --enable-sftp \ --disable-svgdec \ -%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} --enable-swscale \ %else --disable-swscale \ @@ -459,52 +381,30 @@ export LDFLAGS="-pie" --enable-lirc \ --enable-live555 \ --enable-lua \ - --enable-mkv \ --enable-mod \ --enable-ogg \ --enable-optimizations \ --disable-oss \ -%if 0%{?suse_version} > 1140 --enable-pulse \ -%endif --enable-realrtsp \ --enable-sout \ --enable-speex \ -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} --enable-taglib \ -%endif --enable-theora \ --enable-v4l2 \ --enable-vcd \ - --enable-vcdx \ --enable-vorbis \ --disable-x265 \ -%if 0%{?suse_version} > 1110 --enable-xcb \ -%else - --disable-xcb \ -%endif %if %{with opengles} --enable-gles2 \ %endif - --disable-atmo \ -%if 0%{?suse_version} > 1140 && 0%{?BUILD_ORIG} +%if 0%{?BUILD_ORIG} --enable-vdpau \ -%else - --disable-vdpau \ %endif --enable-xvideo \ --with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \ --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf -echo '********* FINISHED CONFIGURE *********' -date - -# post config patches, not very nice but we don't have automake - -%if 0%{?suse_version} == 1110 -# replaces ustar patch -sed -e 's/tar cvv/tar cvv --format=ustar/' -i share/Makefile -%endif # make sure the build hostname is not embedded in the binaries -- or we'll # continuously republish packages -- seife @@ -514,9 +414,7 @@ sed -i 's/^#define.*VLC_COMPILE_HOST.*/#define VLC_COMPILE_HOST "obs-build"/' co make %{?_smp_mflags} %install -echo '********* ENTERED INSTALL PHASE *********' -date -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install mkdir -p %{buildroot}/%{_datadir}/pixmaps # We need a full copy, as the pixmap icon goes to the -noX package cp %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png @@ -536,97 +434,73 @@ for i in ?vlc; do popd done -# don't ship hevc-related modules even if probably overkill for legal purposes -%if ! 0%{?BUILD_ORIG} -rm %{buildroot}/%{_libdir}/vlc/plugins/demux/libhevc_plugin.so -rm %{buildroot}/%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so -%endif - # clean up some lang issues... for lang in ach an cgg co ff tet ks_IN; do rm -rf %{buildroot}%{_datadir}/locale/$lang done %find_lang vlc -#Install appdata file -install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml - %post -%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins +%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins %post -n %{name}-noX /sbin/ldconfig -%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins +%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins %postun -n %{name}-noX -p /sbin/ldconfig - %post -n libvlc%{libvlc} -p /sbin/ldconfig %postun -n libvlc%{libvlc} -p /sbin/ldconfig - %post -n libvlccore%{libvlccore} -p /sbin/ldconfig %postun -n libvlccore%{libvlccore} -p /sbin/ldconfig - %post -n %{name}-qt -%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins +%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins + +%if %{with gstreamer} +%post codec-gstreamer +%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins + +%postun codec-gstreamer +%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins +%endif %if 0%{?BUILD_ORIG} %post -n %{name}-codecs -%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins +%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins %endif %files -%defattr(-,root,root) # The presence of the .desktop file is what gives AppStream the # hint of which package to add in the appstore... 'vlc' is the place to be %{_datadir}/applications/vlc.desktop -%dir %{_datadir}/appdata -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.appdata.xml # The icon is the one referenced by the .desktop file %{_datadir}/pixmaps/vlc.png -%{_bindir}/svlc %{_datadir}/icons/hicolor/*/apps/vlc* %dir %{_datadir}/kde4 %dir %{_datadir}/kde4/apps %{_datadir}/kde4/apps/solid %{_datadir}/solid +%{_libdir}/vlc/libvlc_xcb_events.so +%{_libdir}/vlc/libvlc_xcb_events.so.0 +%{_libdir}/vlc/libvlc_xcb_events.so.0.0.0 +%{_libdir}/vlc/plugins/gui/libskins2_plugin.so %exclude %{_libdir}/vlc/libcompat.a -%{_mandir}/man1/svlc* -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/codec/liblibass_plugin.so -%endif -%if 0%{?suse_version} > 1110 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so %endif -%endif -%{_libdir}/vlc/plugins/notify/libnotify_plugin.so -%{_libdir}/vlc/plugins/video_filter/libremoteosd_plugin.so %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_splitter/libpanoramix_plugin.so -%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so -%endif %if %{with opengles} %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so %endif -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so -%endif %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so %{_libdir}/vlc/plugins/video_output/libaa_plugin.so -%if 0%{?suse_version} > 1110 -%ifarch %ix86 x86_64 -%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} -%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so -%endif -%endif -%endif %files lang -f vlc.lang -%defattr(-,root,root) %files noX -%defattr(-,root,root) %doc %{_datadir}/doc/vlc/ %doc NEWS AUTHORS COPYING THANKS README %{_bindir}/cvlc @@ -635,14 +509,19 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_mandir}/man1/nvlc* %endif %{_bindir}/rvlc +%{_bindir}/svlc %{_bindir}/vlc %{_bindir}/vlc-wrapper %{_datadir}/vlc/ %{_mandir}/man1/cvlc* +%{_mandir}/man1/svlc.1%{ext_man} %{_mandir}/man1/rvlc* %{_mandir}/man1/vlc* # Own the file.. but it's an auto-generated file, so ghost it. %ghost %{_libdir}/vlc/plugins/plugins.dat +%{_libdir}/vlc/libvlc_pulse.so +%{_libdir}/vlc/libvlc_pulse.so.0 +%{_libdir}/vlc/libvlc_pulse.so.0.0.0 %dir %{_libdir}/vlc %dir %{_libdir}/vlc/lua %dir %{_libdir}/vlc/lua/extensions @@ -650,7 +529,6 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %dir %{_libdir}/vlc/lua/intf/modules %dir %{_libdir}/vlc/lua/meta %dir %{_libdir}/vlc/lua/meta/art -%dir %{_libdir}/vlc/lua/meta/fetcher %dir %{_libdir}/vlc/lua/meta/reader %dir %{_libdir}/vlc/lua/modules %dir %{_libdir}/vlc/lua/playlist @@ -665,6 +543,8 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %dir %{_libdir}/vlc/plugins/control %dir %{_libdir}/vlc/plugins/demux %dir %{_libdir}/vlc/plugins/gui +%dir %{_libdir}/vlc/plugins/keystore +%dir %{_libdir}/vlc/plugins/logger %dir %{_libdir}/vlc/plugins/lua %dir %{_libdir}/vlc/plugins/meta_engine %dir %{_libdir}/vlc/plugins/misc @@ -672,9 +552,12 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %dir %{_libdir}/vlc/plugins/notify %dir %{_libdir}/vlc/plugins/packetizer %dir %{_libdir}/vlc/plugins/services_discovery +%dir %{_libdir}/vlc/plugins/spu +%dir %{_libdir}/vlc/plugins/stream_extractor %dir %{_libdir}/vlc/plugins/stream_filter %dir %{_libdir}/vlc/plugins/stream_out %dir %{_libdir}/vlc/plugins/text_renderer +%dir %{_libdir}/vlc/plugins/vaapi %dir %{_libdir}/vlc/plugins/video_chroma %dir %{_libdir}/vlc/plugins/video_filter %dir %{_libdir}/vlc/plugins/video_output @@ -695,61 +578,103 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/lua/meta/art/01_googleimage.luac %{_libdir}/vlc/lua/meta/art/02_frenchtv.luac %{_libdir}/vlc/lua/meta/art/03_lastfm.luac -%{_libdir}/vlc/lua/meta/fetcher/tvrage.luac %{_libdir}/vlc/lua/meta/reader/filename.luac %{_libdir}/vlc/lua/modules/common.luac %{_libdir}/vlc/lua/modules/dkjson.luac %{_libdir}/vlc/lua/modules/sandbox.luac %{_libdir}/vlc/lua/modules/simplexml.luac +%{_libdir}/vlc/plugins/vaapi/libvaapi_filters_plugin.so +%{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so +%{_libdir}/vlc/plugins/video_output/libflaschen_plugin.so +%{_libdir}/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.so +%{_libdir}/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.so +%{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so +%{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so +%{_libdir}/vlc/plugins/video_output/libxdg_shell_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_10_p010_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_nv12_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libyuvp_plugin.so +%{_libdir}/vlc/plugins/video_filter/libedgedetection_plugin.so +%{_libdir}/vlc/plugins/video_filter/libfps_plugin.so +%{_libdir}/vlc/plugins/access/libaccess_concat_plugin.so +%{_libdir}/vlc/plugins/access/libaccess_imem_plugin.so +%{_libdir}/vlc/plugins/access/libhttps_plugin.so +%{_libdir}/vlc/plugins/access/libsatip_plugin.so +%{_libdir}/vlc/plugins/audio_filter/libscaletempo_pitch_plugin.so +%{_libdir}/vlc/plugins/audio_filter/libtospdif_plugin.so +%{_libdir}/vlc/plugins/codec/libmpg123_plugin.so +%{_libdir}/vlc/plugins/codec/liboggspots_plugin.so +%{_libdir}/vlc/plugins/codec/librtpvideo_plugin.so +%{_libdir}/vlc/plugins/codec/libscte18_plugin.so +%{_libdir}/vlc/plugins/codec/libspdif_plugin.so +%{_libdir}/vlc/plugins/codec/libtextst_plugin.so +%{_libdir}/vlc/plugins/codec/libttml_plugin.so +%{_libdir}/vlc/plugins/codec/libvaapi_plugin.so +%{_libdir}/vlc/plugins/codec/libwebvtt_plugin.so +%{_libdir}/vlc/plugins/demux/libadaptive_plugin.so +%{_libdir}/vlc/plugins/demux/libdirectory_demux_plugin.so +%{_libdir}/vlc/plugins/demux/libh26x_plugin.so +%{_libdir}/vlc/plugins/demux/libnoseek_plugin.so +%{_libdir}/vlc/plugins/keystore/libfile_keystore_plugin.so +%{_libdir}/vlc/plugins/keystore/libsecret_plugin.so +%{_libdir}/vlc/plugins/keystore/libkwallet_plugin.so +%{_libdir}/vlc/plugins/keystore/libmemory_keystore_plugin.so +%{_libdir}/vlc/plugins/logger/libconsole_logger_plugin.so +%{_libdir}/vlc/plugins/logger/libfile_logger_plugin.so +%{_libdir}/vlc/plugins/logger/libsyslog_plugin.so +%{_libdir}/vlc/plugins/notify/libnotify_plugin.so +%{_libdir}/vlc/plugins/packetizer/libpacketizer_a52_plugin.so +%{_libdir}/vlc/plugins/packetizer/libpacketizer_dts_plugin.so +%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so +%{_libdir}/vlc/plugins/packetizer/libpacketizer_mpegaudio_plugin.so +%{_libdir}/vlc/plugins/services_discovery/libavahi_plugin.so +%{_libdir}/vlc/plugins/spu/libaudiobargraph_v_plugin.so +%{_libdir}/vlc/plugins/spu/libdynamicoverlay_plugin.so +%{_libdir}/vlc/plugins/spu/liblogo_plugin.so +%{_libdir}/vlc/plugins/spu/libmarq_plugin.so +%{_libdir}/vlc/plugins/spu/libmosaic_plugin.so +%{_libdir}/vlc/plugins/spu/libremoteosd_plugin.so +%{_libdir}/vlc/plugins/spu/librss_plugin.so +%{_libdir}/vlc/plugins/spu/libsubsdelay_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libadf_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libcache_block_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libcache_read_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libhds_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libinflate_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libprefetch_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libskiptags_plugin.so +%{_libdir}/vlc/plugins/stream_out/libstream_out_cycle_plugin.so +%{_libdir}/vlc/lua/playlist/newgrounds.luac +%{_libdir}/vlc/lua/playlist/twitch.luac +%{_libdir}/vlc/lua/playlist/vocaroo.luac %{_libdir}/vlc/lua/playlist/anevia_streams.luac %{_libdir}/vlc/lua/playlist/anevia_xml.luac %{_libdir}/vlc/lua/playlist/appletrailers.luac %{_libdir}/vlc/lua/playlist/bbc_co_uk.luac -%{_libdir}/vlc/lua/playlist/break.luac -%{_libdir}/vlc/lua/playlist/canalplus.luac %{_libdir}/vlc/lua/playlist/cue.luac %{_libdir}/vlc/lua/playlist/dailymotion.luac -%{_libdir}/vlc/lua/playlist/extreme.luac -%{_libdir}/vlc/lua/playlist/france2.luac -%{_libdir}/vlc/lua/playlist/googlevideo.luac %{_libdir}/vlc/lua/playlist/jamendo.luac -%{_libdir}/vlc/lua/playlist/joox.luac -%{_libdir}/vlc/lua/playlist/katsomo.luac %{_libdir}/vlc/lua/playlist/koreus.luac -%{_libdir}/vlc/lua/playlist/lelombrik.luac %{_libdir}/vlc/lua/playlist/liveleak.luac -%{_libdir}/vlc/lua/playlist/metacafe.luac -%{_libdir}/vlc/lua/playlist/metachannels.luac -%{_libdir}/vlc/lua/playlist/mpora.luac -%{_libdir}/vlc/lua/playlist/pinkbike.luac -%{_libdir}/vlc/lua/playlist/pluzz.luac %{_libdir}/vlc/lua/playlist/rockbox_fm_presets.luac %{_libdir}/vlc/lua/playlist/soundcloud.luac %{_libdir}/vlc/lua/playlist/vimeo.luac %{_libdir}/vlc/lua/playlist/youtube.luac -%{_libdir}/vlc/lua/playlist/youtube_homepage.luac -%{_libdir}/vlc/lua/playlist/zapiks.luac -%{_libdir}/vlc/lua/sd/fmc.luac -%{_libdir}/vlc/lua/sd/icast.luac %{_libdir}/vlc/lua/sd/icecast.luac %{_libdir}/vlc/lua/sd/jamendo.luac %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so %{_libdir}/vlc/plugins/access/libftp_plugin.so %{_libdir}/vlc/plugins/access/libhttp_plugin.so %{_libdir}/vlc/plugins/access/libimem_plugin.so %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so %{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so -%endif %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so %{_libdir}/vlc/plugins/access/libattachment_plugin.so %{_libdir}/vlc/plugins/access/libavio_plugin.so %{_libdir}/vlc/plugins/access/libcdda_plugin.so %{_libdir}/vlc/plugins/access/libdtv_plugin.so %{_libdir}/vlc/plugins/access/libdvb_plugin.so -%{_libdir}/vlc/plugins/access/librar_plugin.so %{_libdir}/vlc/plugins/access/libsftp_plugin.so %{_libdir}/vlc/plugins/access/libsmb_plugin.so %{_libdir}/vlc/plugins/access/libtcp_plugin.so @@ -758,57 +683,42 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/access/libdc1394_plugin.so %{_libdir}/vlc/plugins/access/libdv1394_plugin.so -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/access/libdvdnav_plugin.so %{_libdir}/vlc/plugins/access/libdvdread_plugin.so -%endif %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so %{_libdir}/vlc/plugins/access/libidummy_plugin.so -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so -%endif %{_libdir}/vlc/plugins/access/liblive555_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so -%endif -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so %if 0%{?suse_version} < 1330 && ( 0%{?sle_version} < 120200 || 0%{?is_opensuse} < 1 ) %{_libdir}/vlc/plugins/access/librdp_plugin.so %endif -%endif %{_libdir}/vlc/plugins/access/librtp_plugin.so %{_libdir}/vlc/plugins/access/libsdp_plugin.so %{_libdir}/vlc/plugins/access/libshm_plugin.so %{_libdir}/vlc/plugins/access/libtimecode_plugin.so %{_libdir}/vlc/plugins/access/libv4l2_plugin.so %{_libdir}/vlc/plugins/access/libvcd_plugin.so -%{_libdir}/vlc/plugins/access/libvcdx_plugin.so - %if %{with vnc} %{_libdir}/vlc/plugins/access/libvnc_plugin.so %endif -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so -%endif -%{_libdir}/vlc/plugins/access/libzip_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_dummy_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_file_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_http_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_shout_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_udp_plugin.so -%{_libdir}/vlc/plugins/audio_filter/liba52tospdif_plugin.so %{_libdir}/vlc/plugins/audio_filter/libaudio_format_plugin.so %{_libdir}/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so %{_libdir}/vlc/plugins/audio_filter/libchorus_flanger_plugin.so %{_libdir}/vlc/plugins/audio_filter/libcompressor_plugin.so %{_libdir}/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.so -%{_libdir}/vlc/plugins/audio_filter/libdtstospdif_plugin.so %{_libdir}/vlc/plugins/audio_filter/libequalizer_plugin.so %{_libdir}/vlc/plugins/audio_filter/libgain_plugin.so %{_libdir}/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.so @@ -832,11 +742,7 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/audio_output/libamem_plugin.so %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so - -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so -%endif -%{_libdir}/vlc/plugins/codec/liba52_plugin.so %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so %{_libdir}/vlc/plugins/codec/libaes3_plugin.so %{_libdir}/vlc/plugins/codec/libaraw_plugin.so @@ -846,28 +752,17 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so %{_libdir}/vlc/plugins/codec/libddummy_plugin.so %{_libdir}/vlc/plugins/demux/libdiracsys_plugin.so -%{_libdir}/vlc/plugins/codec/libdts_plugin.so %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so %{_libdir}/vlc/plugins/codec/libedummy_plugin.so %{_libdir}/vlc/plugins/codec/libvpx_plugin.so -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/codec/libflac_plugin.so -%endif - %if %{with fluidsynth} %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so %endif - -%if 0%{?suse_version} > 1140 -%if 0%{?BUILD_ORIG} -%{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so -%endif %{_libdir}/vlc/plugins/codec/libjpeg_plugin.so -%endif %{_libdir}/vlc/plugins/codec/libg711_plugin.so %{_libdir}/vlc/plugins/codec/libkate_plugin.so %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so -%{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so %{_libdir}/vlc/plugins/codec/libopus_plugin.so %{_libdir}/vlc/plugins/codec/libpng_plugin.so %{_libdir}/vlc/plugins/codec/librawvideo_plugin.so @@ -884,25 +779,15 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/codec/libtelx_plugin.so %{_libdir}/vlc/plugins/codec/libtheora_plugin.so %{_libdir}/vlc/plugins/codec/libuleaddvaudio_plugin.so -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so -%endif -%{_libdir}/vlc/plugins/codec/libvaapi_x11_plugin.so %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/codec/libxwd_plugin.so %{_libdir}/vlc/plugins/codec/libzvbi_plugin.so -%endif - -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/control/libdbus_plugin.so -%endif %{_libdir}/vlc/plugins/control/libdummy_plugin.so %{_libdir}/vlc/plugins/control/libgestures_plugin.so %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so -%endif %{_libdir}/vlc/plugins/control/liblirc_plugin.so %{_libdir}/vlc/plugins/control/libmotion_plugin.so %{_libdir}/vlc/plugins/control/libnetsync_plugin.so @@ -918,15 +803,10 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so %{_libdir}/vlc/plugins/demux/libes_plugin.so %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/demux/libgme_plugin.so -%endif -%{_libdir}/vlc/plugins/demux/libh264_plugin.so %{_libdir}/vlc/plugins/demux/libimage_plugin.so %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/demux/libmkv_plugin.so -%endif %{_libdir}/vlc/plugins/demux/libmod_plugin.so %{_libdir}/vlc/plugins/demux/libmp4_plugin.so %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so @@ -945,41 +825,31 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/demux/libsubtitle_plugin.so %{_libdir}/vlc/plugins/demux/libts_plugin.so %{_libdir}/vlc/plugins/demux/libtta_plugin.so +%{_libdir}/vlc/plugins/demux/libdemux_chromecast_plugin.so %{_libdir}/vlc/plugins/demux/libty_plugin.so %{_libdir}/vlc/plugins/demux/libvc1_plugin.so %{_libdir}/vlc/plugins/demux/libvobsub_plugin.so %{_libdir}/vlc/plugins/demux/libvoc_plugin.so %{_libdir}/vlc/plugins/demux/libwav_plugin.so %{_libdir}/vlc/plugins/demux/libxa_plugin.so -%{_libdir}/vlc/plugins/gui/libskins2_plugin.so %{_libdir}/vlc/plugins/lua/liblua_plugin.so - %if 0%{?suse_version} >= 1320 %{_libdir}/vlc/plugins/gui/libncurses_plugin.so %endif +%{_libdir}/vlc/plugins/logger/libsd_journal_plugin.so %{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/meta_engine/libtaglib_plugin.so -%endif %{_libdir}/vlc/plugins/misc/libaddonsfsstorage_plugin.so %{_libdir}/vlc/plugins/misc/libaddonsvorepository_plugin.so %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so - -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so -%endif %{_libdir}/vlc/plugins/misc/libexport_plugin.so %{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so - -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/misc/libgnutls_plugin.so -%endif %{_libdir}/vlc/plugins/misc/liblogger_plugin.so %{_libdir}/vlc/plugins/misc/libstats_plugin.so %{_libdir}/vlc/plugins/misc/libvod_rtsp_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so -%endif %{_libdir}/vlc/plugins/misc/libxml_plugin.so %{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so %{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so @@ -1000,35 +870,23 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so -%{_libdir}/vlc/plugins/services_discovery/libbonjour_plugin.so %{_libdir}/vlc/plugins/services_discovery/libmediadirs_plugin.so -%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so -%endif %{_libdir}/vlc/plugins/services_discovery/libpodcast_plugin.so - -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so -%endif %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so -%if 0%{?suse_version} > 1110 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so %endif -%endif -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so -%endif +%{_libdir}/vlc/plugins/stream_extractor/libarchive_plugin.so +%{_libdir}/vlc/plugins/stream_out/libstream_out_chromecast_plugin.so %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so -%{_libdir}/vlc/plugins/stream_filter/libdash_plugin.so -%{_libdir}/vlc/plugins/stream_filter/libhttplive_plugin.so %{_libdir}/vlc/plugins/stream_filter/librecord_plugin.so -%{_libdir}/vlc/plugins/stream_filter/libsmooth_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so - -%if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so %endif %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so @@ -1038,9 +896,7 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/stream_out/libstream_out_duplicate_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_es_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_gather_plugin.so -%{_libdir}/vlc/plugins/stream_out/libstream_out_langfromtelx_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.so -%{_libdir}/vlc/plugins/stream_out/libstream_out_raop_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_record_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_rtp_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_setid_plugin.so @@ -1055,9 +911,7 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_i420_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_plugin.so - -%ifarch %ix86 x86_64 -%if 0%{?suse_version} > 1140 +%ifarch %{ix86} x86_64 %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so @@ -1065,7 +919,6 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.so %endif -%endif %ifarch ppc ppc64 ppc64le %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_altivec_plugin.so %endif @@ -1076,7 +929,6 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_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/libaudiobargraph_v_plugin.so %{_libdir}/vlc/plugins/video_filter/libball_plugin.so %{_libdir}/vlc/plugins/video_filter/libblend_plugin.so %{_libdir}/vlc/plugins/video_filter/libblendbench_plugin.so @@ -1087,7 +939,6 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/video_filter/libcolorthres_plugin.so %{_libdir}/vlc/plugins/video_filter/libcroppadd_plugin.so %{_libdir}/vlc/plugins/video_filter/libdeinterlace_plugin.so -%{_libdir}/vlc/plugins/video_filter/libdynamicoverlay_plugin.so %{_libdir}/vlc/plugins/video_filter/liberase_plugin.so %{_libdir}/vlc/plugins/video_filter/libextract_plugin.so %{_libdir}/vlc/plugins/video_filter/libfreeze_plugin.so @@ -1097,31 +948,24 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/video_filter/libgrain_plugin.so %{_libdir}/vlc/plugins/video_filter/libhqdn3d_plugin.so %{_libdir}/vlc/plugins/video_filter/libinvert_plugin.so -%{_libdir}/vlc/plugins/video_filter/liblogo_plugin.so %{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so %{_libdir}/vlc/plugins/video_filter/libmagnify_plugin.so -%{_libdir}/vlc/plugins/video_filter/libmarq_plugin.so %{_libdir}/vlc/plugins/video_filter/libmirror_plugin.so -%{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so -%if 0%{?suse_version} > 1110 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %endif -%endif %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so %{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so %{_libdir}/vlc/plugins/video_filter/libripple_plugin.so %{_libdir}/vlc/plugins/video_filter/librotate_plugin.so -%{_libdir}/vlc/plugins/video_filter/librss_plugin.so %{_libdir}/vlc/plugins/video_filter/libscale_plugin.so %{_libdir}/vlc/plugins/video_filter/libscene_plugin.so %{_libdir}/vlc/plugins/video_filter/libsepia_plugin.so %{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so -%{_libdir}/vlc/plugins/video_filter/libsubsdelay_plugin.so %if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so %endif @@ -1129,48 +973,37 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so %{_libdir}/vlc/plugins/video_splitter/libwall_plugin.so %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so -%{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so -%endif %{_libdir}/vlc/plugins/video_output/libfb_plugin.so +%{_libdir}/vlc/plugins/video_output/libglconv_vaapi_wl_plugin.so %{_libdir}/vlc/plugins/video_output/libgl_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_output/libglx_plugin.so -%endif %{_libdir}/vlc/plugins/video_output/libvdummy_plugin.so %{_libdir}/vlc/plugins/video_output/libvmem_plugin.so -%{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so -%endif %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so +%ifarch %ix86 x86_64 +%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so +%endif %if %{with gstreamer} %files codec-gstreamer -%defattr(-,root,root) %{_libdir}/vlc/plugins/codec/libgstdecode_plugin.so %endif %if 0%{?BUILD_ORIG} %files codecs -%defattr(-,root,root) -%{_libdir}/vlc/plugins/audio_filter/liba52tofloat32_plugin.so -%{_libdir}/vlc/plugins/audio_filter/libdtstofloat32_plugin.so -%{_libdir}/vlc/plugins/audio_filter/libmpgatofixed32_plugin.so %{_libdir}/vlc/plugins/codec/libfaad_plugin.so %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so %{_libdir}/vlc/plugins/codec/libx264_plugin.so -#{_libdir}/vlc/plugins/codec/libx265_plugin.so -%if 0%{?BUILD_ORIG} -%{_libdir}/vlc/plugins/demux/libhevc_plugin.so -%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so -%endif -%if 0%{?suse_version} > 1140 +%{_libdir}/vlc/plugins/audio_filter/libmad_plugin.so +%{_libdir}/vlc/plugins/codec/liba52_plugin.so +%{_libdir}/vlc/plugins/codec/libdca_plugin.so + %{_libdir}/vlc/libvlc_vdpau.so.0 %{_libdir}/vlc/libvlc_vdpau.so.0.0.0 %dir %{_libdir}/vlc/plugins/vdpau @@ -1180,26 +1013,22 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/vdpau/libvdpau_deinterlace_plugin.so %{_libdir}/vlc/plugins/vdpau/libvdpau_display_plugin.so %{_libdir}/vlc/plugins/vdpau/libvdpau_sharpen_plugin.so -%endif %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so +%{_libdir}/vlc/plugins/video_output/libglconv_vdpau_plugin.so %endif %files -n libvlc%{libvlc} -%defattr(-,root,root) %{_libdir}/libvlc.so.%{libvlc}* %files -n libvlccore%{libvlccore} -%defattr(-,root,root) %{_libdir}/libvlccore.so.%{libvlccore}* %files qt -%defattr(-,root,root) %{_bindir}/qvlc %{_mandir}/man1/qvlc* -%{_libdir}/vlc/plugins/gui/libqt4_plugin.so +%{_libdir}/vlc/plugins/gui/libqt_plugin.so %files devel -%defattr(-,root,root) %{_includedir}/vlc/ %{_libdir}/libvlccore.so %{_libdir}/libvlc.so @@ -1207,9 +1036,7 @@ install -Dm0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/pkgconfig/vlc-plugin.pc %{_libdir}/vlc/libcompat.a %if 0%{?BUILD_ORIG} -%if 0%{?suse_version} > 1140 %{_libdir}/vlc/libvlc_vdpau.so %endif -%endif %changelog