Browse Source

MVK: update hash and patches

Felix Paul Kühne 10 years ago
parent
commit
7621cbaac0
21 changed files with 52 additions and 52 deletions
  1. 2 2
      MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
  2. 2 2
      MobileVLCKit/patches/0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch
  3. 2 2
      MobileVLCKit/patches/0003-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
  4. 2 2
      MobileVLCKit/patches/0004-contrib-ebml-mkv-compile-with-hidden-symbols-on-iOS.patch
  5. 3 3
      MobileVLCKit/patches/0005-libass-fix-text-rendering-on-iOS-by-providing-a-font.patch
  6. 2 2
      MobileVLCKit/patches/0006-contrib-png-fix-ARM-assembly-for-iOS.patch
  7. 3 3
      MobileVLCKit/patches/0007-contrib-speex-fix-compilation-for-non-ARMv7-iOS-targ.patch
  8. 2 2
      MobileVLCKit/patches/0008-contrib-flac-fix-compilation-with-clang-5.0.patch
  9. 4 4
      MobileVLCKit/patches/0009-lib-media_player-inherit-deinterlace-and-vbi-variabl.patch
  10. 2 2
      MobileVLCKit/patches/0010-contrib-avcodec-deploy-libav.patch
  11. 2 2
      MobileVLCKit/patches/0011-contrib-opus-disable-asm-on-arm.patch
  12. 2 2
      MobileVLCKit/patches/0012-contrib-gcrypt-disable-asm-on-iOS.patch
  13. 2 2
      MobileVLCKit/patches/0013-fix-libtool.patch
  14. 2 2
      MobileVLCKit/patches/0014-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch
  15. 3 3
      MobileVLCKit/patches/0015-contrib-speexdsp-disable-neon-for-AArch64.patch
  16. 2 2
      MobileVLCKit/patches/0016-contrib-add-arch-option-for-platforms-where-the-arch.patch
  17. 2 2
      MobileVLCKit/patches/0017-extras-deploy-arch-option-for-iOS.patch
  18. 2 2
      MobileVLCKit/patches/0018-contrib-harfbuzz-work-around-build-system-stupidity-.patch
  19. 4 4
      MobileVLCKit/patches/0019-contrib-gcrypt-use-git-version-on-iOS.patch
  20. 6 6
      MobileVLCKit/patches/0020-libvlc-add-preliminary-code-path-to-modify-quartztex.patch
  21. 1 1
      buildMobileVLCKit.sh

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

@@ -1,7 +1,7 @@
-From 6ee37b416c7a01c48d8f72c30e646c51a985f157 Mon Sep 17 00:00:00 2001
+From 163cb672466104790934e6d7f0bdb3dc464081b4 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/20] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/22] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---

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

@@ -1,7 +1,7 @@
-From 270e918982a41c5f9448709c0cb3d9442ae31d04 Mon Sep 17 00:00:00 2001
+From 8cc4d936b91669377bd221e1489b552d60dafb3d 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:01:49 +0200
-Subject: [PATCH 02/20] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/22] arm_neon: use a macro to fix compilation for iOS
 
 ---
  modules/arm_neon/amplify.S              |  9 +++---

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

@@ -1,7 +1,7 @@
-From f693f9b8fcbb0d26f0b4c2ca0ce32e8b0ca8d95d Mon Sep 17 00:00:00 2001
+From 74fa33cce3bc0c4e52f3d60707aecaffacae5469 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 03/20] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/22] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---

+ 2 - 2
MobileVLCKit/patches/0004-contrib-ebml-mkv-compile-with-hidden-symbols-on-iOS.patch

@@ -1,7 +1,7 @@
-From cddc2ba0abafc5364f3970acc42a7a38eba5059e Mon Sep 17 00:00:00 2001
+From 53fb375f324267116c8160f0556d060f3bad6879 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 11 Aug 2012 13:29:25 +0200
-Subject: [PATCH 04/20] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/22] contrib/ebml+mkv: compile with hidden symbols on iOS
 
 ---
  contrib/src/ebml/rules.mak     | 7 +++++--

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

@@ -1,7 +1,7 @@
-From 128207f7b3390d14663fb9e02727ac336f8f54ff Mon Sep 17 00:00:00 2001
+From 88d7e53382f4d6e057948635475cddde900e26bf 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 05/20] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 05/22] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 05/20] libass: fix text rendering on iOS by providing a font
  1 file changed, 35 insertions(+)
 
 diff --git a/modules/codec/libass.c b/modules/codec/libass.c
-index aa38f1b..38961bc 100644
+index 5590df1..fff51db 100644
 --- a/modules/codec/libass.c
 +++ b/modules/codec/libass.c
 @@ -29,6 +29,13 @@

+ 2 - 2
MobileVLCKit/patches/0006-contrib-png-fix-ARM-assembly-for-iOS.patch

@@ -1,7 +1,7 @@
-From 81ed342e9c98072eb596e624a0717ef1a1f2e248 Mon Sep 17 00:00:00 2001
+From ffc4345f54f82f6eaf73e7739a820acfb8a8241b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
 Date: Sat, 20 Jul 2013 23:35:05 +0200
-Subject: [PATCH 06/20] contrib/png: fix ARM assembly for iOS
+Subject: [PATCH 06/22] contrib/png: fix ARM assembly for iOS
 
 ---
  contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++

+ 3 - 3
MobileVLCKit/patches/0007-contrib-speex-fix-compilation-for-non-ARMv7-iOS-targ.patch

@@ -1,7 +1,7 @@
-From 337dd3659bb709b818b9111de83f15f0dcac62b3 Mon Sep 17 00:00:00 2001
+From 783351fb3038cb5b339175884a6f74a35712d8c0 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:37:59 +0100
-Subject: [PATCH 07/20] contrib/speex: fix compilation for non-ARMv7 iOS
+Subject: [PATCH 07/22] contrib/speex: fix compilation for non-ARMv7 iOS
  targets
 
 the neon code included in speex doesn't do ARMv8 yet
@@ -10,7 +10,7 @@ the neon code included in speex doesn't do ARMv8 yet
  1 file changed, 5 insertions(+)
 
 diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
-index 7d7cce9..e356bbc 100644
+index f9ff8d9..cd1794a 100644
 --- a/contrib/src/speex/rules.mak
 +++ b/contrib/src/speex/rules.mak
 @@ -34,6 +34,11 @@ ifeq ($(ARCH),arm)

+ 2 - 2
MobileVLCKit/patches/0008-contrib-flac-fix-compilation-with-clang-5.0.patch

@@ -1,7 +1,7 @@
-From 193eb63cd14e09f5801375075bfdf4b9d0a87954 Mon Sep 17 00:00:00 2001
+From 8ad992247929f0b6d44337925f6c86319133d1be Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 7 Oct 2013 17:05:21 +0200
-Subject: [PATCH 08/20] contrib/flac: fix compilation with clang 5.0
+Subject: [PATCH 08/22] contrib/flac: fix compilation with clang 5.0
 
 ---
  contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++

+ 4 - 4
MobileVLCKit/patches/0009-lib-media_player-inherit-deinterlace-and-vbi-variabl.patch

@@ -1,7 +1,7 @@
-From 098fee6373745962b8fa55215613648e0b9ee69f Mon Sep 17 00:00:00 2001
+From 3c46223d98f79860ec33edc3d55c8da6337b91e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 21 Nov 2013 16:26:40 +0100
-Subject: [PATCH 09/20] lib/media_player: inherit deinterlace and vbi variables
+Subject: [PATCH 09/22] lib/media_player: inherit deinterlace and vbi variables
  to fix correct variables values on first use
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 09/20] lib/media_player: inherit deinterlace and vbi variables
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 1a72207..867df26 100644
+index b75006a..5691345 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -435,10 +435,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -436,10 +436,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_SetFloat (mp, "scale", 1.);
      var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
      var_Create (mp, "crop", VLC_VAR_STRING);

+ 2 - 2
MobileVLCKit/patches/0010-contrib-avcodec-deploy-libav.patch

@@ -1,7 +1,7 @@
-From db3069eed9e1a5ba61e231dbe0c99d12c280f3be Mon Sep 17 00:00:00 2001
+From db442828e536371a34093f73263087ef3a42ebb9 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:43:11 +0100
-Subject: [PATCH 10/20] contrib/avcodec: deploy libav
+Subject: [PATCH 10/22] contrib/avcodec: deploy libav
 
 ---
  contrib/src/ffmpeg/rules.mak | 2 +-

+ 2 - 2
MobileVLCKit/patches/0011-contrib-opus-disable-asm-on-arm.patch

@@ -1,7 +1,7 @@
-From 9333f06f32861c992bfe3680d17b04a3bb28ba46 Mon Sep 17 00:00:00 2001
+From 3d3d4b8d36679fc6ef7be4d5ed1827f5ec57ca81 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 15 Jan 2014 15:26:46 +0100
-Subject: [PATCH 11/20] contrib/opus disable asm on arm
+Subject: [PATCH 11/22] contrib/opus disable asm on arm
 
 ---
  contrib/src/opus/rules.mak | 3 +++

+ 2 - 2
MobileVLCKit/patches/0012-contrib-gcrypt-disable-asm-on-iOS.patch

@@ -1,7 +1,7 @@
-From 4ed922433141fd14b989151b793c3d824ab58dcd Mon Sep 17 00:00:00 2001
+From 9dd5342a6b3c611a98d52ccb9e07be03c30540db Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 09:56:23 +0100
-Subject: [PATCH 12/20] contrib/gcrypt: disable asm on iOS
+Subject: [PATCH 12/22] contrib/gcrypt: disable asm on iOS
 
 ---
  contrib/src/gcrypt/rules.mak | 3 +++

+ 2 - 2
MobileVLCKit/patches/0013-fix-libtool.patch

@@ -1,7 +1,7 @@
-From d70317a96c6335d5e4e77758c336e91bced9be5c Mon Sep 17 00:00:00 2001
+From 619d9269d3e6d4a09ea03d9d5f1647fc991e3a42 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:33 +0200
-Subject: [PATCH 13/20] fix libtool
+Subject: [PATCH 13/22] fix libtool
 
 ---
  modules/arm_neon/Makefile.am    | 4 ++++

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

@@ -1,7 +1,7 @@
-From 803994c91e4be81987334acea89535550ccf0af3 Mon Sep 17 00:00:00 2001
+From 039dc1023de906189857c02ebe6e9e9b4a75390b 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 14/20] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 14/22] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---

+ 3 - 3
MobileVLCKit/patches/0015-contrib-speexdsp-disable-neon-for-AArch64.patch

@@ -1,14 +1,14 @@
-From e740c0309e6682026a19ec9d1260b4e40f0995ac Mon Sep 17 00:00:00 2001
+From 50119ae3f356845697ae9474d5426a5aff4d2111 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 15:19:43 +0100
-Subject: [PATCH 15/20] contrib/speexdsp: disable neon for AArch64
+Subject: [PATCH 15/22] contrib/speexdsp: disable neon for AArch64
 
 ---
  contrib/src/speexdsp/rules.mak | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
-index 7a2bc80..396af52 100644
+index 9b58675..050cb24 100644
 --- a/contrib/src/speexdsp/rules.mak
 +++ b/contrib/src/speexdsp/rules.mak
 @@ -29,6 +29,11 @@ ifeq ($(ARCH),arm)

+ 2 - 2
MobileVLCKit/patches/0016-contrib-add-arch-option-for-platforms-where-the-arch.patch

@@ -1,7 +1,7 @@
-From b4f5f62a309c7dafe7cece1d769aa1f99f931b63 Mon Sep 17 00:00:00 2001
+From e6d166e232bce2648098c5edb36f6c4ffa310326 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:27:43 +0200
-Subject: [PATCH 16/20] contrib: add arch option for platforms where the arch
+Subject: [PATCH 16/22] contrib: add arch option for platforms where the arch
  triplet would be ambigous
 
 ---

+ 2 - 2
MobileVLCKit/patches/0017-extras-deploy-arch-option-for-iOS.patch

@@ -1,7 +1,7 @@
-From 755c5b223fbe2df5c23a7c1fa1988394b1c59873 Mon Sep 17 00:00:00 2001
+From 91cc195bcaea7768a8b56da6bb38828ae360fd96 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:28:26 +0200
-Subject: [PATCH 17/20] extras: deploy arch option for iOS
+Subject: [PATCH 17/22] extras: deploy arch option for iOS
 
 ---
  extras/package/ios/build.sh | 2 +-

+ 2 - 2
MobileVLCKit/patches/0018-contrib-harfbuzz-work-around-build-system-stupidity-.patch

@@ -1,7 +1,7 @@
-From 1502957483c58fc9d72d3d67dd88b9607a4e20fe Mon Sep 17 00:00:00 2001
+From ea6c59004630f42b354cd9be9933bc6b582987d7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 12 Mar 2014 14:48:12 +0100
-Subject: [PATCH 18/20] contrib/harfbuzz: work-around build system stupidity
+Subject: [PATCH 18/22] contrib/harfbuzz: work-around build system stupidity
  breaking clang compilation
 
 ---

+ 4 - 4
MobileVLCKit/patches/0019-contrib-gcrypt-use-git-version-on-iOS.patch

@@ -1,7 +1,7 @@
-From 8d8c9533b789a544c30caab05c8c6907cf52e824 Mon Sep 17 00:00:00 2001
+From 83178c7ed3cc9561d33fdbac7e78ac63e503f31b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 31 Oct 2013 20:42:59 +0100
-Subject: [PATCH 19/20] contrib/gcrypt: use git version on iOS
+Subject: [PATCH 19/22] contrib/gcrypt: use git version on iOS
 
 ---
  contrib/src/gcrypt/disable-doc-compilation.patch   | 43 ++++++++++++++++++++++
@@ -61,7 +61,7 @@ index 0000000..e63224e
 +1.8.3.4 (Apple Git-47)
 +
 diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
-index 0cc1222..d635039 100644
+index 7e67319..8773aa1 100644
 --- a/contrib/src/gcrypt/rules.mak
 +++ b/contrib/src/gcrypt/rules.mak
 @@ -1,6 +1,7 @@
@@ -95,7 +95,7 @@ index 0cc1222..d635039 100644
  
  DEPS_gcrypt = gpg-error
  
-@@ -44,6 +56,6 @@ endif
+@@ -47,6 +59,6 @@ endif
  
  .gcrypt: libgcrypt
  	$(RECONF)

+ 6 - 6
MobileVLCKit/patches/0020-libvlc-add-preliminary-code-path-to-modify-quartztex.patch

@@ -1,7 +1,7 @@
-From c0b4e5efa0f9d57bdfe81f4cf5b94877b22098e4 Mon Sep 17 00:00:00 2001
+From 37606de74ed865ea3a3d9818a87759cf46fc7144 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 20/20] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 20/22] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---
@@ -67,10 +67,10 @@ index c0c66dd..7810ed7 100644
  libvlc_video_take_snapshot
  libvlc_vlm_add_broadcast
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 867df26..8401b45 100644
+index 5691345..3ca1e10 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -464,6 +464,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -465,6 +465,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
  
@@ -84,10 +84,10 @@ index 867df26..8401b45 100644
      var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
      var_Create (mp, "mute", VLC_VAR_BOOL);
 diff --git a/lib/video.c b/lib/video.c
-index c8b3711..cda3c35 100644
+index 19065fb..8988069 100644
 --- a/lib/video.c
 +++ b/lib/video.c
-@@ -903,3 +903,50 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -934,3 +934,50 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  {
      return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
  }

+ 1 - 1
buildMobileVLCKit.sh

@@ -14,7 +14,7 @@ CONFIGURATION="Release"
 NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 
-TESTEDHASH=465acb4a4
+TESTEDHASH=246889732
 
 usage()
 {