Pārlūkot izejas kodu

MVK: update libvlc to fetch contrib from v.o

Felix Paul Kühne 9 gadi atpakaļ
vecāks
revīzija
17cea34038

+ 3 - 3
MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch

@@ -1,7 +1,7 @@
-From b76716c32dc2df53e9185a7a3c143ca8745b7cfd Mon Sep 17 00:00:00 2001
+From b115047f43924953508e6b8ccc75018cf35f59d1 Mon Sep 17 00:00:00 2001
 From: David Geldreich <david.geldreich@free.fr>
 Date: Fri, 20 Apr 2012 16:41:19 +0200
-Subject: [PATCH 01/15] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/17] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-2.8.3
+2.8.4
 

+ 3 - 3
MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,7 +1,7 @@
-From 332ad4c74502cd5573a87a688f50249f2088c64b Mon Sep 17 00:00:00 2001
+From 9205e3696a148f2efc973fbbdf3a93fe8d98c100 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 10 Aug 2012 16:02:07 +0200
-Subject: [PATCH 02/15] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 02/17] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-2.8.3
+2.8.4
 

+ 4 - 4
MobileVLCKit/patches/0003-lib-media-player-inherit-deinterlace-variable-to-ach.patch

@@ -1,7 +1,7 @@
-From 986ead6eb5458cceb8ee40050d14a89fa8142638 Mon Sep 17 00:00:00 2001
+From 8d7762b175e6b8fba5fdfa2cbaea9b4e25d57f33 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 9 Dec 2014 22:14:55 +0100
-Subject: [PATCH 03/15] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 03/17] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 03/15] lib/media player: inherit deinterlace variable to
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index a0860da..b2ac614 100644
+index 69d3523..f2e9d03 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -640,7 +640,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -22,5 +22,5 @@ index a0860da..b2ac614 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-2.8.3
+2.8.4
 

+ 3 - 3
MobileVLCKit/patches/0004-arm_neon-work-around-libtool-issue.patch

@@ -1,7 +1,7 @@
-From d3a03e01b6b94dd4b57d501a838ad599885134cb Mon Sep 17 00:00:00 2001
+From 9c2fed58f7b66616ebe1cfd3ccea4763c88f6a40 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 18 Dec 2014 22:14:55 +0100
-Subject: [PATCH 04/15] arm_neon: work-around libtool issue
+Subject: [PATCH 04/17] arm_neon: work-around libtool issue
 
 ---
  modules/arm_neon/Makefile.am | 2 ++
@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
  
  libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
-2.8.3
+2.8.4
 

+ 3 - 3
MobileVLCKit/patches/0005-arm_neon-fix-iOS-linking.patch

@@ -1,7 +1,7 @@
-From ef584fba4a0b187c3bd84c4549e9b0f1d7bb6e14 Mon Sep 17 00:00:00 2001
+From e43228090efbf90f9ac10839fbabeb5bc4d39a62 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
-Subject: [PATCH 05/15] arm_neon: fix iOS linking
+Subject: [PATCH 05/17] arm_neon: fix iOS linking
 
 ---
  modules/arm_neon/amplify.S              |  7 ++---
@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
  	pop {r4,pc}
 +endfunc
 -- 
-2.8.3
+2.8.4
 

+ 3 - 3
MobileVLCKit/patches/0006-disable-neon-volume-plugin.patch

@@ -1,7 +1,7 @@
-From 95f5d222a633fd9db3efb73c949e6dec9cf96dd2 Mon Sep 17 00:00:00 2001
+From 704989dd38efbcf4938e8fd1fcc29785f874b1e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
-Subject: [PATCH 06/15] disable neon volume plugin
+Subject: [PATCH 06/17] disable neon volume plugin
 
 ---
  modules/arm_neon/Makefile.am | 1 -
@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
  	libyuv_rgb_neon_plugin.la
  endif
 -- 
-2.8.3
+2.8.4
 

+ 3 - 3
MobileVLCKit/patches/0007-src-misc-fix-compilation-for-OS-without-fork.patch

@@ -1,7 +1,7 @@
-From f2a2a78cef26c6ee36dfe76441315f622d79b890 Mon Sep 17 00:00:00 2001
+From 6a20f23f2780d5c04edbba7fa388abdb8805c095 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 10 Sep 2015 19:58:40 +0200
-Subject: [PATCH 07/15] src/misc: fix compilation for OS without fork()
+Subject: [PATCH 07/17] src/misc: fix compilation for OS without fork()
 
 ---
  src/misc/cpu.c | 2 +-
@@ -21,5 +21,5 @@ index 28f127a..bacf842 100644
  {
      pid_t pid = fork();
 -- 
-2.8.3
+2.8.4
 

+ 4 - 4
MobileVLCKit/patches/0008-libvlc-hack-to-disable-daemon-mode.patch

@@ -1,14 +1,14 @@
-From dc4265966a0da0cd723bd5276507ce442208e718 Mon Sep 17 00:00:00 2001
+From e89650262ad199701c9b71ff7b3f2d5490e21377 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 11 Sep 2015 18:34:26 +0200
-Subject: [PATCH 08/15] libvlc: hack to disable daemon mode
+Subject: [PATCH 08/17] libvlc: hack to disable daemon mode
 
 ---
  src/libvlc.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/src/libvlc.c b/src/libvlc.c
-index 3ccdede..d5abe35 100644
+index 48c2b8c..3c9f879 100644
 --- a/src/libvlc.c
 +++ b/src/libvlc.c
 @@ -200,6 +200,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
@@ -23,5 +23,5 @@ index 3ccdede..d5abe35 100644
      /* Check for daemon mode */
      if( var_InheritBool( p_libvlc, "daemon" ) )
 -- 
-2.8.3
+2.8.4
 

+ 4 - 4
MobileVLCKit/patches/0009-contrib-harfbuzz-fix-iOS-compilation-when-CoreText-i.patch

@@ -1,7 +1,7 @@
-From dff50f2f4e487f5064fd86ce6b8f534435c1a11e Mon Sep 17 00:00:00 2001
+From 4cfa54bc26797762c7a02ea5e7aba4c9a7a5283a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 23 Nov 2015 16:46:27 +0100
-Subject: [PATCH 09/15] contrib/harfbuzz: fix iOS compilation when CoreText is
+Subject: [PATCH 09/17] contrib/harfbuzz: fix iOS compilation when CoreText is
  enabled
 
 ---
@@ -49,7 +49,7 @@ index 0000000..555e851
 + 			AC_SUBST(CORETEXT_LIBS)
 + 		fi
 diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
-index f21917c..2058b4a 100644
+index 36bcb31..4c9bcf2 100644
 --- a/contrib/src/harfbuzz/rules.mak
 +++ b/contrib/src/harfbuzz/rules.mak
 @@ -23,6 +23,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
@@ -61,5 +61,5 @@ index f21917c..2058b4a 100644
  
  DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 -- 
-2.8.3
+2.8.4
 

+ 4 - 4
MobileVLCKit/patches/0010-libvlc-expose-a-base-set-of-freetype-options-to-over.patch

@@ -1,7 +1,7 @@
-From 704f77ecc4af8569b67168cf265645ea050c3ade Mon Sep 17 00:00:00 2001
+From 93d87326edb419cdc342632ed139adcc960259f7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 23 Nov 2015 16:09:24 +0100
-Subject: [PATCH 10/15] libvlc: expose a base set of freetype options to
+Subject: [PATCH 10/17] libvlc: expose a base set of freetype options to
  overwrite the default font
 
 ---
@@ -75,7 +75,7 @@ index 733a4dd..f297970 100644
  libvlc_video_take_snapshot
  libvlc_vlm_add_broadcast
 diff --git a/lib/media_player.c b/lib/media_player.c
-index b2ac614..0c54b63 100644
+index f2e9d03..8d54c93 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -670,6 +670,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -312,5 +312,5 @@ index 44b2731..7f1abec 100644
  
  /**
 -- 
-2.8.3
+2.8.4
 

+ 4 - 4
MobileVLCKit/patches/0011-Add-AC-3-pass-through.patch

@@ -1,7 +1,7 @@
-From e8a1f2adbedbe5ccf874cd76568e3ab1617b0eee Mon Sep 17 00:00:00 2001
+From bdfe645381ce49e16113d32023ab0890e7e16c0c Mon Sep 17 00:00:00 2001
 From: Aman Gupta <aman@tmm1.net>
 Date: Tue, 1 Mar 2016 16:31:13 +0100
-Subject: [PATCH 11/15] Add AC-3 pass-through
+Subject: [PATCH 11/17] Add AC-3 pass-through
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -77,7 +77,7 @@ index 7901c64..3877311 100644
   *****************************************************************************/
  int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi )
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 0c54b63..9e2f137 100644
+index 8d54c93..d047874 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -640,6 +640,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -163,5 +163,5 @@ index 044905b..355f14f 100644
      return OpenCommon( p_this, false );
  }
 -- 
-2.8.3
+2.8.4
 

+ 4 - 4
MobileVLCKit/patches/0012-libvlc-create-VT-zero-copy-variable.patch

@@ -1,14 +1,14 @@
-From 07a474025b48260c578f9cbb43cf3baa8fc3959e Mon Sep 17 00:00:00 2001
+From 434c42cdcb0c57f11ffccec87b971f3f158f1e6d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 4 May 2016 16:00:40 +0200
-Subject: [PATCH 12/15] libvlc: create VT-zero-copy variable
+Subject: [PATCH 12/17] libvlc: create VT-zero-copy variable
 
 ---
  lib/media_player.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 9e2f137..a587d85 100644
+index d047874..ac30787 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -622,6 +622,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -20,5 +20,5 @@ index 9e2f137..a587d85 100644
  #ifdef __ANDROID__
      var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
 -- 
-2.8.3
+2.8.4
 

+ 3 - 3
MobileVLCKit/patches/0013-contrib-avcodec-enforce-use-of-FFmpeg.patch

@@ -1,7 +1,7 @@
-From acf26a2785e4cae308842c6abd7e689896108cd1 Mon Sep 17 00:00:00 2001
+From 9ac2f48185532fa38d941479814735600334ff1a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 9 May 2016 11:49:20 +0200
-Subject: [PATCH 13/15] contrib/avcodec: enforce use of FFmpeg
+Subject: [PATCH 13/17] contrib/avcodec: enforce use of FFmpeg
 
 ---
  contrib/src/ffmpeg/rules.mak | 4 ++--
@@ -25,5 +25,5 @@ index a266389..b103de7 100644
  FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
  else
 -- 
-2.8.3
+2.8.4
 

+ 4 - 4
MobileVLCKit/patches/0014-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,7 +1,7 @@
-From d03ab429db65fedce3528553651f2c4221efa381 Mon Sep 17 00:00:00 2001
+From c3ac6d30b294f3bd67b63316d80892d142cd52f0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sun, 7 Dec 2014 20:02:18 +0100
-Subject: [PATCH 14/15] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 14/17] contrib/gcrypt: work-around a libtool limitation
 
 ---
  contrib/src/gcrypt/rules.mak                       |  1 +
@@ -10,7 +10,7 @@ Subject: [PATCH 14/15] contrib/gcrypt: work-around a libtool limitation
  create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
 
 diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
-index 3bb2c80..26725cc 100644
+index e528e57..4d2604c 100644
 --- a/contrib/src/gcrypt/rules.mak
 +++ b/contrib/src/gcrypt/rules.mak
 @@ -15,6 +15,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
@@ -53,5 +53,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.8.3
+2.8.4
 

+ 4 - 4
MobileVLCKit/patches/0015-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,7 +1,7 @@
-From 51205f1deef3f3f12edafcdf20a871be3c264447 Mon Sep 17 00:00:00 2001
+From c7099637b60430a0c1b8db08ae453b3914924862 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 3 Oct 2015 22:45:14 +0200
-Subject: [PATCH 15/15] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 15/17] contrib/gcrypt: fix tvOS compilation
 
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
@@ -32,7 +32,7 @@ index 0000000..f1d3ccc
 +    *	%rdi: ctx, CTX
 +    *	%rsi: data (64 bytes)
 diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
-index 26725cc..ffb159e 100644
+index 4d2604c..ee4c969 100644
 --- a/contrib/src/gcrypt/rules.mak
 +++ b/contrib/src/gcrypt/rules.mak
 @@ -16,6 +16,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
@@ -56,5 +56,5 @@ index 26725cc..ffb159e 100644
  GCRYPT_CONF += --disable-aesni-support
  else
 -- 
-2.8.3
+2.8.4
 

+ 1 - 1
buildMobileVLCKit.sh

@@ -17,7 +17,7 @@ SCARY=yes
 TVOS=no
 BITCODE=no
 
-TESTEDHASH=9fab6639
+TESTEDHASH=62dfbc38
 
 usage()
 {