Bladeren bron

Update patches for latest libVLC

Jean-Baptiste Kempf 8 jaren geleden
bovenliggende
commit
e3a2bc65d5

+ 1 - 1
Resources/MobileVLCKit/patches/0009-contrib-avcodec-enforce-use-of-FFmpeg.patch

@@ -19,7 +19,7 @@ index 2b4778c826..842a61b9d7 100644
 +USE_FFMPEG ?= 1
  
  ifdef USE_FFMPEG
--FFMPEG_HASH=46998d037f8bfebee7bb6578df24a5a3b8f41299
+-FFMPEG_HASH=0768aaec1d683226e613e692080a588359c31334
 +FFMPEG_HASH=911417f0b34e611bf084319c5b5a4e4e630da940
  FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
  FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git

+ 0 - 90
Resources/MobileVLCKit/patches/0016-temporary-add-missing-static.patch

@@ -1,91 +0,0 @@
-From fb5494ff9e0f528655fd712608c8927a71348866 Mon Sep 17 00:00:00 2001
-From: Thomas Guillem <thomas@gllm.fr>
-Date: Tue, 11 Apr 2017 15:13:51 +0200
-Subject: [PATCH 16/17] temporary: add missing static
-
----
- modules/codec/mft.c           | 4 ++--
- modules/control/motion.c      | 4 ++--
- modules/video_filter/puzzle.c | 8 ++++----
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/modules/codec/mft.c b/modules/codec/mft.c
-index fbd85d4bdc..84cbb65829 100644
---- a/modules/codec/mft.c
-+++ b/modules/codec/mft.c
-@@ -1107,7 +1107,7 @@ static int LoadMFTLibrary(MFHandle *mf)
-     return VLC_SUCCESS;
- }
- 
--int Open(vlc_object_t *p_this)
-+static int Open(vlc_object_t *p_this)
- {
-     decoder_t *p_dec = (decoder_t *)p_this;
-     decoder_sys_t *p_sys;
-@@ -1148,7 +1148,7 @@ error:
-     return VLC_EGENERIC;
- }
- 
--void Close(vlc_object_t *p_this)
-+static void Close(vlc_object_t *p_this)
- {
-     decoder_t *p_dec = (decoder_t *)p_this;
-     decoder_sys_t *p_sys = p_dec->p_sys;
-diff --git a/modules/control/motion.c b/modules/control/motion.c
-index 6c2144b5c9..7491cadb9c 100644
---- a/modules/control/motion.c
-+++ b/modules/control/motion.c
-@@ -80,7 +80,7 @@ vlc_module_end ()
- /*****************************************************************************
-  * OpenIntf: initialise interface
-  *****************************************************************************/
--int Open ( vlc_object_t *p_this )
-+static int Open ( vlc_object_t *p_this )
- {
-     intf_thread_t *p_intf = (intf_thread_t *)p_this;
-     intf_sys_t *p_sys = malloc( sizeof( *p_sys ) );
-@@ -109,7 +109,7 @@ error:
- /*****************************************************************************
-  * CloseIntf: destroy interface
-  *****************************************************************************/
--void Close ( vlc_object_t *p_this )
-+static void Close ( vlc_object_t *p_this )
- {
-     intf_thread_t *p_intf = (intf_thread_t *)p_this;
-     intf_sys_t *p_sys = p_intf->p_sys;
-diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
-index c5cf98678a..2a041986b1 100644
---- a/modules/video_filter/puzzle.c
-+++ b/modules/video_filter/puzzle.c
-@@ -78,8 +78,8 @@ const char *const ppsz_rotation_descriptions[] = { N_("0"), N_("0/180"), N_("0/9
- 
- #define CFG_PREFIX "puzzle-"
- 
--int  Open ( vlc_object_t * );
--void Close( vlc_object_t * );
-+static int  Open ( vlc_object_t * );
-+static void Close( vlc_object_t * );
- 
- vlc_module_begin()
-     set_description( N_("Puzzle interactive game video filter") )
-@@ -125,7 +125,7 @@ const char *const ppsz_filter_options[] = {
- /**
-  * Open the filter
-  */
--int Open( vlc_object_t *p_this )
-+static int Open( vlc_object_t *p_this )
- {
-     filter_t *p_filter = (filter_t *)p_this;
-     filter_sys_t *p_sys;
-@@ -212,7 +212,7 @@ int Open( vlc_object_t *p_this )
- /**
-  * Close the filter
-  */
--void Close( vlc_object_t *p_this ) {
-+static void Close( vlc_object_t *p_this ) {
-     filter_t *p_filter = (filter_t *)p_this;
-     filter_sys_t *p_sys = p_filter->p_sys;
- 
-2.11.0
-

+ 1 - 1
buildMobileVLCKit.sh

@@ -21,7 +21,7 @@ OSVERSIONMINCFLAG=miphoneos-version-min
 OSVERSIONMINLDFLAG=ios_version_min
 ROOT_DIR=empty
 
-TESTEDHASH=8268fe0
+TESTEDHASH=37b7af7
 
 CORE_COUNT=`sysctl -n machdep.cpu.core_count`
 let MAKE_JOBS=$CORE_COUNT+1