Bläddra i källkod

MVK: rebase libvlc

Felix Paul Kühne 9 år sedan
förälder
incheckning
3ea125332d

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

@@ -1,4 +1,4 @@
-From c3e5ec62269961f01cdbc975bc922020c2dadb90 Mon Sep 17 00:00:00 2001
+From 12cc643dde0d4853cc913dffc8edb2d7e7d3c666 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

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

@@ -1,4 +1,4 @@
-From a83850b196d346b22b17a41e99a068577b6ee138 Mon Sep 17 00:00:00 2001
+From 1eb1cb1fc345b471c3efeb0ba6139876d73cd8a5 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

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

@@ -1,4 +1,4 @@
-From 2f8c305e1b89171bd4859835e5638869c42d11a7 Mon Sep 17 00:00:00 2001
+From e2e7f96af3ef34512c444a13c69a8deb22124944 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

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

@@ -1,4 +1,4 @@
-From fa1c5b2b06676ee69edb03f25061ba7a26c3cf55 Mon Sep 17 00:00:00 2001
+From 167c49670700a84dfa6bb126d86e8998586b17e4 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

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

@@ -1,4 +1,4 @@
-From f324c5455e5f56afd08ce607a6918d1175b6a83a Mon Sep 17 00:00:00 2001
+From b27d6414005031bbb09b493100cc955cf227abf6 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/13] arm_neon: fix iOS linking

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

@@ -1,4 +1,4 @@
-From 5f4fe3e4381f2d46f8c233c1749354a964f2b0f2 Mon Sep 17 00:00:00 2001
+From 93d647a61f6eb5e66eb83349a1862654cc26d741 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] disable neon volume plugin

+ 1 - 1
MobileVLCKit/patches/0007-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,4 +1,4 @@
-From c426b35f9ee23bf114b480d58a62fa12dfea1ee5 Mon Sep 17 00:00:00 2001
+From 1239f5a55e099e83446bff8c5a85303c7f4931bc 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 07/13] contrib/gcrypt: work-around a libtool limitation

+ 1 - 1
MobileVLCKit/patches/0008-src-misc-fix-compilation-for-OS-without-fork.patch

@@ -1,4 +1,4 @@
-From f5e55af7030fc36492a79056ea46de0763df469b Mon Sep 17 00:00:00 2001
+From afe7675da0f9faa938ce101629666ac573ec5fab 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 08/13] src/misc: fix compilation for OS without fork()

+ 1 - 1
MobileVLCKit/patches/0009-libvlc-hack-to-disable-daemon-mode.patch

@@ -1,4 +1,4 @@
-From 89d32303c85b2a25b95591c30c4f1826e84dfa19 Mon Sep 17 00:00:00 2001
+From b19ffea6f6563f7de872075d0da2cd3db27ef665 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 09/13] libvlc: hack to disable daemon mode

+ 1 - 1
MobileVLCKit/patches/0010-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,4 +1,4 @@
-From 964d8736dd288f82a04070bd76b26a8af977180b Mon Sep 17 00:00:00 2001
+From 439ca94598e8266da9f059dd97d438a713c644b9 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 10/13] contrib/gcrypt: fix tvOS compilation

+ 1 - 1
MobileVLCKit/patches/0011-contrib-harfbuzz-fix-iOS-compilation-when-CoreText-i.patch

@@ -1,4 +1,4 @@
-From e294e691d785f6e02c3b105262d1ae611e58d1ad Mon Sep 17 00:00:00 2001
+From 33d9c4eacd94796a0787ad2eee23d1e1bb19e122 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 11/13] contrib/harfbuzz: fix iOS compilation when CoreText is

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

@@ -1,4 +1,4 @@
-From 54f50cdaea744f515c8c75abb1e935f1336deb73 Mon Sep 17 00:00:00 2001
+From 732449d65e0e31ca753f5bb577159dcecf625a9d 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 12/13] libvlc: expose a base set of freetype options to
@@ -14,10 +14,10 @@ Subject: [PATCH 12/13] libvlc: expose a base set of freetype options to
  6 files changed, 163 insertions(+), 4 deletions(-)
 
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 73562b8..17b0450 100644
+index 456e99e..3a9aa85 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
-@@ -1559,6 +1559,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -1483,6 +1483,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
                                                     unsigned option, float value );
  

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

@@ -1,4 +1,4 @@
-From fb3f59d1e533f04e5f9d48dee53c7c61c4eeefda Mon Sep 17 00:00:00 2001
+From 4347f84a676c42d5678a802a77e642a4c5062aa5 Mon Sep 17 00:00:00 2001
 From: Aman Gupta <aman@tmm1.net>
 Date: Tue, 1 Mar 2016 16:31:13 +0100
 Subject: [PATCH 13/13] Add AC-3 pass-through
@@ -29,10 +29,10 @@ index 6c264bc..b0901ae 100755
  logger
  visual
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 17b0450..1099dd2 100644
+index 3a9aa85..bbc89e8 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
-@@ -1934,6 +1934,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
+@@ -1818,6 +1818,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
  LIBVLC_API int libvlc_audio_set_delay( libvlc_media_player_t *p_mi, int64_t i_delay );
  
  /**

+ 1 - 1
buildMobileVLCKit.sh

@@ -17,7 +17,7 @@ SCARY=yes
 TVOS=no
 BITCODE=no
 
-TESTEDHASH=09d306f0
+TESTEDHASH=ac4658d2
 
 usage()
 {