ソースを参照

MVK: rebase libvlc

Felix Paul Kühne 9 年 前
コミット
09751ff580

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

@@ -1,4 +1,4 @@
-From 2ac321f1d70bd14d04524c34f3c5efcf8a2ba66b Mon Sep 17 00:00:00 2001
+From 1db5e83895244c54c38312c8171589f84f45e7d2 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/13] arm_neon: added function macro to handle the underscore
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-2.7.1
+2.7.2
 

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

@@ -1,4 +1,4 @@
-From 40db75171a1cce6043b4835c639a86d3a76a11ef Mon Sep 17 00:00:00 2001
+From 4a6fbabaf021c2efa29191977928d73824e54c20 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/13] deinterlace/merge: use a macro to fix compilation for
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-2.7.1
+2.7.2
 

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

@@ -1,4 +1,4 @@
-From 62d6e583f2cc089bded2909b4e47ff210b1ec4e9 Mon Sep 17 00:00:00 2001
+From 42f5f5c13120ee4327f6923b2bda9d2ec2a74398 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/13] lib/media player: inherit deinterlace variable to
@@ -22,5 +22,5 @@ index b278c6f..a2b02f4 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-2.7.1
+2.7.2
 

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

@@ -1,4 +1,4 @@
-From 8852ba3fc9babc9841600ad996bdcf538f991ab6 Mon Sep 17 00:00:00 2001
+From 388c9bea1b8ba4e5f9d664a8cd756d2f829df748 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/13] arm_neon: work-around libtool issue
@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
  
  libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
-2.7.1
+2.7.2
 

+ 2 - 2
MobileVLCKit/patches/0005-libvlc-media-re-parse-if-flags-changed.patch

@@ -1,4 +1,4 @@
-From 88f997f1151ade930d7049608107a6e9567df2e6 Mon Sep 17 00:00:00 2001
+From 5089d149996d1e7008880ffb7a2f9fb9da4392ef Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 19 Dec 2014 22:14:55 +0100
 Subject: [PATCH 05/13] libvlc/media: re-parse if flags changed
@@ -38,5 +38,5 @@ index 35f06a4..d28297e 100644
  
  /* Media Descriptor */
 -- 
-2.7.1
+2.7.2
 

+ 2 - 2
MobileVLCKit/patches/0006-arm_neon-fix-iOS-linking.patch

@@ -1,4 +1,4 @@
-From 87846c20cabea9c5e13cfb82668098f3f414255b Mon Sep 17 00:00:00 2001
+From f0a09e17047f878075db61a05ed7171fbd19bec0 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/13] arm_neon: fix iOS linking
@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
  	pop {r4,pc}
 +endfunc
 -- 
-2.7.1
+2.7.2
 

+ 2 - 2
MobileVLCKit/patches/0007-disable-neon-volume-plugin.patch

@@ -1,4 +1,4 @@
-From 2c7a9e8a7ec7528cdb2a2566128c65cf681ab81a Mon Sep 17 00:00:00 2001
+From 7d5310320edeac6432d1d589171a1b77fdb0876e 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 07/13] disable neon volume plugin
@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
  	libyuv_rgb_neon_plugin.la
  endif
 -- 
-2.7.1
+2.7.2
 

+ 2 - 2
MobileVLCKit/patches/0008-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,4 +1,4 @@
-From 2e1ead93b2fe7b9e924177ff169b7b69b8f9926a Mon Sep 17 00:00:00 2001
+From b98e79b16f38acb632df183ffbcc424ee96b333b 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 08/13] contrib/gcrypt: work-around a libtool limitation
@@ -53,5 +53,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.7.1
+2.7.2
 

+ 2 - 2
MobileVLCKit/patches/0009-src-misc-fix-compilation-for-OS-without-fork.patch

@@ -1,4 +1,4 @@
-From 12d4c9c3554333374746ac6d9e58c0ea0a60775c Mon Sep 17 00:00:00 2001
+From dc6a4462c8a2046badfd3c1cbb34fbda4961e60e 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 09/13] src/misc: fix compilation for OS without fork()
@@ -21,5 +21,5 @@ index 4a5f2a0..79b28e4 100644
  {
      pid_t pid = fork();
 -- 
-2.7.1
+2.7.2
 

+ 2 - 2
MobileVLCKit/patches/0010-libvlc-hack-to-disable-daemon-mode.patch

@@ -1,4 +1,4 @@
-From f9cafaf2daf28658eec5de98f6608a2edf9e6b35 Mon Sep 17 00:00:00 2001
+From 22729ff391d2e444b7afbdc9948a1c3797c055ec 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 10/13] libvlc: hack to disable daemon mode
@@ -23,5 +23,5 @@ index 3468e0e..2d870bd 100644
      /* Check for daemon mode */
      if( var_InheritBool( p_libvlc, "daemon" ) )
 -- 
-2.7.1
+2.7.2
 

+ 2 - 2
MobileVLCKit/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,4 +1,4 @@
-From 7b4975d2f69c28a91cb395ba5a6107d5a01520fb Mon Sep 17 00:00:00 2001
+From 9dbd2d7745a3490c82ee2331a7346000af1bcb02 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 11/13] contrib/gcrypt: fix tvOS compilation
@@ -56,5 +56,5 @@ index 0471522..ac20d02 100644
  GCRYPT_CONF += --disable-aesni-support
  else
 -- 
-2.7.1
+2.7.2
 

+ 2 - 2
MobileVLCKit/patches/0012-contrib-harfbuzz-fix-iOS-compilation-when-CoreText-i.patch

@@ -1,4 +1,4 @@
-From c05e4df144dc201bd855065af7046ad27aad71cf Mon Sep 17 00:00:00 2001
+From f57ba9a78968ed079b6f6c3c353d7a2e7d0d6565 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 12/13] contrib/harfbuzz: fix iOS compilation when CoreText is
@@ -61,5 +61,5 @@ index f21917c..2058b4a 100644
  
  DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 -- 
-2.7.1
+2.7.2
 

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

@@ -1,4 +1,4 @@
-From 4ae3026527842a4f7b113115e44cc1396fc7c7ef Mon Sep 17 00:00:00 2001
+From 2174e335e3474005c3de33b17888c1f7ee39aac8 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 13/13] libvlc: expose a base set of freetype options to
@@ -312,5 +312,5 @@ index 44b2731..7f1abec 100644
  
  /**
 -- 
-2.7.1
+2.7.2
 

+ 1 - 1
buildMobileVLCKit.sh

@@ -17,7 +17,7 @@ SCARY=yes
 TVOS=no
 BITCODE=no
 
-TESTEDHASH=c932d32d
+TESTEDHASH=21d8776f
 
 usage()
 {