rpm/vlc
SHA256
1
0
Fork 0
forked from pool/vlc
Code Pull Requests Activity

Updating link to change in openSUSE:Factory/vlc revision 76.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=ec655db08847e13baba01fffe8227ce4
This commit is contained in:
OBS User buildservice-autocommit 2018-02-14 08:22:45 +00:00 committed by Git OBS Bridge
parent f92a9252a9
commit 670e9ef22b
11 changed files with 238 additions and 1044 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
0001-no-return-in-non-void.patch
View File

@ -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;
}
/*****************************************************************************

119
vlc-2.2.0-fix_deinterlace_mmx.patch
View File

@ -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 )

3
vlc-2.2.8.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec
size 22137276

3
vlc-3.0.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:68d587999f50d58df5ca3d69998bba910bdb5a82e5a1a39247179932fae0c19c
size 25191148

388
vlc-gcc6-buildfixes.patch
View File

@ -1,388 +0,0 @@
From 66842e08e177e3c458fa0e4db970deae84feb625 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
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(<stdatomic.h>)
+# define __STDC_NO_ATOMICS__ 1
+# endif
+#endif
+# ifndef __cplusplus
+# if (__STDC_VERSION__ >= 201112L) && !defined (__STDC_NO_ATOMICS__)
/*** Native C11 atomics ***/
-# include <stdatomic.h>
+# include <stdatomic.h>
-# 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 <windows.h>
-
-/*** 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 <atomic>
+# 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 <vlc_spu.h>
-
#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 <vlc_vout.h>
#include <vlc_filter.h>
+#include <vlc_spu.h>
#include <vlc_vout_osd.h>
#include <vlc_image.h>
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 <stdarg.h>
-#include <vlc_atomic.h>
#include <QMutex>
+#include <QAtomicInt>
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) )

20
vlc-projectM-qt5.patch
View File

@ -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-3.0.0.orig/configure.ac
+++ vlc-2.2.6/configure.ac +++ vlc-3.0.0/configure.ac
@@ -3965,12 +3965,12 @@ AC_ARG_ENABLE(projectm, @@ -3950,12 +3950,12 @@ AC_ARG_ENABLE(projectm,
[ --enable-projectm projectM visualization plugin (default enabled)]) [ --enable-projectm projectM visualization plugin (default enabled)])
AS_IF([test "${enable_projectm}" != "no"], AS_IF([test "${enable_projectm}" != "no"],
[ [
@ -19,16 +19,16 @@ Index: vlc-2.2.6/configure.ac
]) ])
],[ ],[
AC_MSG_WARN([${PROJECTM_PKG_ERRORS}.]) 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-3.0.0.orig/modules/visualization/projectm.cpp
+++ vlc-2.2.6/modules/visualization/projectm.cpp +++ vlc-3.0.0/modules/visualization/projectm.cpp
@@ -44,7 +44,7 @@ @@ -34,7 +34,7 @@
#include <vlc_filter.h> #include <vlc_filter.h>
#include <vlc_rand.h> #include <vlc_rand.h>
-#include <libprojectM/projectM.hpp> -#include <libprojectM/projectM.hpp>
+#include <libprojectM-qt5/projectM.hpp> +#include <libprojectM-qt5/projectM.hpp>
/***************************************************************************** #ifndef _WIN32
* Module descriptor # include <locale.h>

33
vlc-support-qt5.5.patch
View File

@ -1,33 +0,0 @@
From 64dccb0fdd71075e37e03c4b52a0c9f5bb749d3f Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
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

10
vlc.a52.patch
View File

@ -1,11 +1,13 @@
--- a/modules/audio_filter/converter/a52tofloat32.c Index: vlc-3.0.0/modules/codec/a52.c
+++ b/modules/audio_filter/converter/a52tofloat32.c ===================================================================
@@ -209,7 +209,7 @@ static int Open( vlc_object_t *p_this, f --- 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; p_sys->i_flags |= A52_ADJUST_LEVEL;
/* Initialize liba52 */ /* Initialize liba52 */
- p_sys->p_liba52 = a52_init( 0 ); - 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 ) if( p_sys->p_liba52 == NULL )
{ {
msg_Err( p_this, "unable to initialize liba52" ); msg_Err( p_this, "unable to initialize liba52" );

34
vlc.appdata.xml
View File

@ -1,34 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<component>
<id type="desktop">vlc.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<name>VLC Media player</name>
<project_license>GPL-2.0+ and LGPL-2.1+</project_license>
<summary>Read, capture, broadcast your multimedia streams</summary>
<url type="homepage">http://www.videolan.org</url>
<description>
<p>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.</p>
<p>Features:</p>
<ul>
<li>Fast hardware decoding on most platforms.</li>
<li>Supports playback of all video and audio formats (might require additional codecs).</li>
<li>The most complete feature-set over the video, subtitle synchronisation, video and audio filters.</li>
<li>Miscellaneous: SAP/SDP announces, Bonjour protocol, Mozilla/Firefox plugin, ActiveX plugin, SVCD Menus, Localization, CD-Text, CDDB CD info, IGMPv3, IPv6, MLDv2, CPU acceleration.</li>
</ul>
</description>
<screenshots>
<screenshot type="default">
<image height="686" width="1000">http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg</image>
<caption>Playing video</caption>
</screenshot>
<screenshot>
<image height="690" width="1000">http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg</image>
<caption>Add files to playlist</caption>
</screenshot>
</screenshots>
<update_contact>vlc-devel@videolan.org</update_contact>
</component>

43
vlc.changes
View File

@ -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 Sun Dec 3 16:20:45 UTC 2017 - dimstar@opensuse.org

525
vlc.spec
View File

File diff suppressed because it is too large Load Diff