Browse Source

MVK: update libvlc

Felix Paul Kühne 9 years ago
parent
commit
ec2f1a9108

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

@@ -1,7 +1,7 @@
-From 443e46780fd75f27b77fe543ab86b7825951fffa Mon Sep 17 00:00:00 2001
+From b47ac179b55ebfea3101ac291ff3cb980c8bd663 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/14] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-2.5.1
+2.6.0
 

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

@@ -1,7 +1,7 @@
-From 2f028284356f4356af2d3b2379790ba743dc6820 Mon Sep 17 00:00:00 2001
+From a67fa298de4471d6490a7d1c2dbde481b38560d1 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/14] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-2.5.1
+2.6.0
 

+ 4 - 4
MobileVLCKit/patches/0003-libass-fix-text-rendering-on-iOS-by-providing-a-font.patch

@@ -1,7 +1,7 @@
-From 22361aabcf781fc3c1fd3dcae666ffc46624c492 Mon Sep 17 00:00:00 2001
+From 2832892893d2124a1559d6be538f4c3c948de922 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 29 May 2013 13:25:54 +0200
-Subject: [PATCH 03/15] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 03/14] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 03/15] libass: fix text rendering on iOS by providing a font
  1 file changed, 38 insertions(+)
 
 diff --git a/modules/codec/libass.c b/modules/codec/libass.c
-index 067ef6b..8460dad 100644
+index 5cd48bc..40f45ac 100644
 --- a/modules/codec/libass.c
 +++ b/modules/codec/libass.c
 @@ -29,6 +29,13 @@
@@ -65,5 +65,5 @@ index 067ef6b..8460dad 100644
      const char *psz_font = NULL; /* We don't ship a default font with VLC */
      const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
 -- 
-2.5.1
+2.6.0
 

+ 3 - 3
MobileVLCKit/patches/0004-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch

@@ -1,7 +1,7 @@
-From 20c1756e1540b3adbd37fee06847744c8e947133 Mon Sep 17 00:00:00 2001
+From 0f9caf58c96ae4027eb0fcb395ccaab7f212dbf4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 13:55:16 +0100
-Subject: [PATCH 04/15] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 04/14] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---
@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
  #endif
  
 -- 
-2.5.1
+2.6.0
 

+ 3 - 3
MobileVLCKit/patches/0005-lib-media-player-inherit-deinterlace-variable-to-ach.patch

@@ -1,7 +1,7 @@
-From fff28568b0c8fdf3109498df16cb3a7aa5c3f3b3 Mon Sep 17 00:00:00 2001
+From 9ff2994e5399414687b2bea3717b5d7cce3d285f 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 05/15] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 05/14] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---
@@ -22,5 +22,5 @@ index 2136ab8..fc5a82f 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-2.5.1
+2.6.0
 

+ 4 - 4
MobileVLCKit/patches/0006-arm_neon-work-around-libtool-issue.patch

@@ -1,7 +1,7 @@
-From 22895aabc53ff871ff9162ed7ae5f92fbd147fdb Mon Sep 17 00:00:00 2001
+From af4ed742f7c2084f0b78647bbbd7442e391182f1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Wed, 18 Feb 2015 21:35:16 +0100
-Subject: [PATCH 06/15] arm_neon: work-around libtool issue
+Date: Thu, 18 Dec 2014 22:14:55 +0100
+Subject: [PATCH 06/14] 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.5.1
+2.6.0
 

+ 4 - 4
MobileVLCKit/patches/0007-libvlc-media-re-parse-if-flags-changed.patch

@@ -1,7 +1,7 @@
-From 9b6692ef5b02ce9a3b01e8e69b8f67faf22e18c7 Mon Sep 17 00:00:00 2001
+From f83d7ed601d02bfe25afbe591473ec072df157aa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Fri, 19 Jun 2015 15:26:06 +0200
-Subject: [PATCH 07/15] libvlc/media: re-parse if flags changed
+Date: Fri, 19 Dec 2014 22:14:55 +0100
+Subject: [PATCH 07/14] libvlc/media: re-parse if flags changed
 
 ---
  lib/media.c          | 6 ++++++
@@ -38,5 +38,5 @@ index 35f06a4..d28297e 100644
  
  /* Media Descriptor */
 -- 
-2.5.1
+2.6.0
 

+ 3 - 3
MobileVLCKit/patches/0008-libvlc-add-preliminary-code-path-to-modify-quartztex.patch

@@ -1,7 +1,7 @@
-From 5f3f20000ed18d6be01f298c287cbe73dac9eece Mon Sep 17 00:00:00 2001
+From 862c7965ff53e8e99554965dfc03cbe445092f88 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 31 Mar 2014 17:54:01 +0200
-Subject: [PATCH 08/15] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 08/14] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---
@@ -267,5 +267,5 @@ index 8142155..1d05dcd 100644
 +    return VLC_SUCCESS;
 +}
 -- 
-2.5.1
+2.6.0
 

+ 4 - 4
MobileVLCKit/patches/0009-arm_neon-fix-iOS-linking.patch

@@ -1,7 +1,7 @@
-From 5f74d6cc2035652c9cd76b45d89339a34d667609 Mon Sep 17 00:00:00 2001
+From 51bb789836a81edff3b4f2a9dcc77dd621fc29f2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Thu, 10 Sep 2015 14:04:52 +0200
-Subject: [PATCH 09/15] arm_neon: fix iOS linking
+Date: Mon, 10 Mar 2014 17:54:01 +0200
+Subject: [PATCH 09/14] arm_neon: fix iOS linking
 
 ---
  modules/arm_neon/amplify.S              |  7 ++---
@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
  	pop {r4,pc}
 +endfunc
 -- 
-2.5.1
+2.6.0
 

+ 4 - 4
MobileVLCKit/patches/0010-disable-neon-volume-plugin.patch

@@ -1,7 +1,7 @@
-From 3ea9a8cea0e0cfed075b85e7a9d5cec187cdfdc5 Mon Sep 17 00:00:00 2001
+From 25d2cd4c8d4074c53de8a843f33802ff9bafd67b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Fri, 10 Jul 2015 19:57:18 +0200
-Subject: [PATCH 10/15] disable neon volume plugin
+Date: Mon, 10 Mar 2014 17:54:01 +0200
+Subject: [PATCH 10/14] 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.5.1
+2.6.0
 

+ 3 - 3
MobileVLCKit/patches/0011-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,7 +1,7 @@
-From 0e7acc766d4128549291691ad33446a0dba41ca5 Mon Sep 17 00:00:00 2001
+From 62d9bc8078db9b97a335ed838d540d164f690e07 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 11/15] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 11/14] contrib/gcrypt: work-around a libtool limitation
 
 ---
  contrib/src/gcrypt/rules.mak                       |  1 +
@@ -53,5 +53,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.5.1
+2.6.0
 

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

@@ -1,7 +1,7 @@
-From 40a2ff454d77db45b9ea8ecb09cf49fd95a96b1b Mon Sep 17 00:00:00 2001
+From e68fc29a7335edd9948171bd55a84a459bdb7e50 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 12/15] src/misc: fix compilation for OS without fork()
+Subject: [PATCH 12/14] src/misc: fix compilation for OS without fork()
 
 ---
  src/misc/cpu.c | 2 +-
@@ -21,5 +21,5 @@ index 4a5f2a0..79b28e4 100644
  {
      pid_t pid = fork();
 -- 
-2.5.1
+2.6.0
 

+ 3 - 3
MobileVLCKit/patches/0013-libvlc-hack-to-disable-daemon-mode.patch

@@ -1,7 +1,7 @@
-From 2510feb5f1c792ad5f00d067437e170ef1102f08 Mon Sep 17 00:00:00 2001
+From 8dbcb912c9c4a2012f546f596cf4f62b3ff01ba8 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 13/15] libvlc: hack to disable daemon mode
+Subject: [PATCH 13/14] libvlc: hack to disable daemon mode
 
 ---
  src/libvlc.c | 4 ++++
@@ -23,5 +23,5 @@ index 34824da..6bad336 100644
      /* Check for daemon mode */
      if( var_InheritBool( p_libvlc, "daemon" ) )
 -- 
-2.5.1
+2.6.0
 

+ 0 - 79
MobileVLCKit/patches/0014-Revert-decoder-restart-module-if-fmt_in-is-changed-b.patch

@@ -1,80 +0,0 @@
-From 953b373cbf149cdd28618cdabbdf97317517df14 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Tue, 15 Sep 2015 15:51:14 +0200
-Subject: [PATCH 14/15] Revert "decoder: restart module if fmt_in is changed by
- the packetizer"
-
-This reverts commit 6e89372e4bfb3e2b0d5c55c3f31caddf42da1043.
----
- src/input/decoder.c | 46 ++++++++++++++++++++--------------------------
- 1 file changed, 20 insertions(+), 26 deletions(-)
-
-diff --git a/src/input/decoder.c b/src/input/decoder.c
-index 4d9809e..38b025c 100644
---- a/src/input/decoder.c
-+++ b/src/input/decoder.c
-@@ -1031,20 +1031,24 @@ static void DecoderProcessVideo( decoder_t *p_dec, block_t *p_block, bool b_flus
-         while( (p_packetized_block =
-                 p_packetizer->pf_packetize( p_packetizer, p_block ? &p_block : NULL )) )
-         {
--            if( !es_format_IsSimilar( &p_dec->fmt_in, &p_packetizer->fmt_out ) )
-+            if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
-             {
--                msg_Dbg( p_dec, "restarting module due to input format change");
--
--                /* Drain the decoder module */
--                DecoderDecodeVideo( p_dec, NULL );
--                /* Restart the decoder module */
--                UnloadDecoder( p_dec );
--                if( LoadDecoder( p_dec, false, &p_packetizer->fmt_out ) )
--                {
--                    p_dec->b_error = true;
--                    block_ChainRelease( p_packetized_block );
--                    return;
--                }
-+                es_format_Clean( &p_dec->fmt_in );
-+                es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
-+            }
-+
-+            /* If the packetizer provides aspect ratio information, pass it
-+             * to the decoder as a hint if the decoder itself can't provide
-+             * it. Copy it regardless of the current value of the decoder input
-+             * format aspect ratio, to properly propagate changes in aspect
-+             * ratio. */
-+            if( p_packetizer->fmt_out.video.i_sar_num > 0 &&
-+                    p_packetizer->fmt_out.video.i_sar_den > 0)
-+            {
-+                p_dec->fmt_in.video.i_sar_num =
-+                    p_packetizer->fmt_out.video.i_sar_num;
-+                p_dec->fmt_in.video.i_sar_den=
-+                    p_packetizer->fmt_out.video.i_sar_den;
-             }
- 
-             if( p_packetizer->pf_get_cc )
-@@ -1207,20 +1211,10 @@ static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block, bool b_flus
-         while( (p_packetized_block =
-                 p_packetizer->pf_packetize( p_packetizer, p_block ? &p_block : NULL )) )
-         {
--            if( !es_format_IsSimilar( &p_dec->fmt_in, &p_packetizer->fmt_out ) )
-+            if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
-             {
--                msg_Dbg( p_dec, "restarting module due to input format change");
--
--                /* Drain the decoder module */
--                DecoderDecodeAudio( p_dec, NULL );
--                /* Restart the decoder module */
--                UnloadDecoder( p_dec );
--                if( LoadDecoder( p_dec, false, &p_packetizer->fmt_out ) )
--                {
--                    p_dec->b_error = true;
--                    block_ChainRelease( p_packetized_block );
--                    return;
--                }
-+                es_format_Clean( &p_dec->fmt_in );
-+                es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
-             }
- 
-             while( p_packetized_block )
-2.5.1
-

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

@@ -1,7 +1,7 @@
-From 3d785cf7aa3cf6e6f9d43fdf584997829907b8fa Mon Sep 17 00:00:00 2001
+From a97ba7e78370b7130299773761b6b218c5a6291c 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 14/14] contrib/gcrypt: fix tvOS compilation
 
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
@@ -56,5 +56,5 @@ index 5000488..6de232b 100644
  GCRYPT_CONF += --disable-aesni-support
  else
 -- 
-2.5.1
+2.6.0
 

+ 1 - 1
buildMobileVLCKit.sh

@@ -16,7 +16,7 @@ SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 TVOS=no
 
-TESTEDHASH=7ce48b0d
+TESTEDHASH=601832ac
 
 usage()
 {