Преглед изворни кода

MVK: update tested hash and patches

Felix Paul Kühne пре 11 година
родитељ
комит
5b4f892cf3
20 измењених фајлова са 76 додато и 89 уклоњено
  1. 3 3
      MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
  2. 3 3
      MobileVLCKit/patches/0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch
  3. 3 3
      MobileVLCKit/patches/0003-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
  4. 3 3
      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. 3 3
      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. 3 3
      MobileVLCKit/patches/0008-contrib-flac-fix-compilation-with-clang-5.0.patch
  9. 4 4
      MobileVLCKit/patches/0010-lib-media_player-inherit-deinterlace-and-vbi-variabl.patch
  10. 3 3
      MobileVLCKit/patches/0011-contrib-avcodec-deploy-libav.patch
  11. 3 3
      MobileVLCKit/patches/0012-contrib-opus-disable-asm-on-arm.patch
  12. 6 6
      MobileVLCKit/patches/0013-contrib-gcrypt-disable-asm-on-iOS.patch
  13. 3 3
      MobileVLCKit/patches/0014-fix-libtool.patch
  14. 4 4
      MobileVLCKit/patches/0015-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch
  15. 3 3
      MobileVLCKit/patches/0016-contrib-speexdsp-disable-neon-for-AArch64.patch
  16. 5 5
      MobileVLCKit/patches/0017-contrib-add-arch-option-for-platforms-where-the-arch.patch
  17. 5 5
      MobileVLCKit/patches/0018-extras-deploy-arch-option-for-iOS.patch
  18. 2 2
      MobileVLCKit/patches/0020-contrib-harfbuzz-work-around-build-system-stupidity-.patch
  19. 13 26
      MobileVLCKit/patches/0009-contrib-gcrypt-use-git-version-on-iOS.patch
  20. 1 1
      buildMobileVLCKit.sh

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

@@ -1,7 +1,7 @@
-From 4e9b88ca430112cc5b7803b926b53a7c0de2212e Mon Sep 17 00:00:00 2001
+From 0bd4648b799ec260d869a21efd2479bb52b3b070 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/18] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/19] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From 9c78976ce69af54cb4c8c2fe729a6cde711ca637 Mon Sep 17 00:00:00 2001
+From 579359b0caf2038311ae473d61af4c9fe38d5db0 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/18] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/19] arm_neon: use a macro to fix compilation for iOS
 
 ---
  modules/arm_neon/amplify.S              |  9 +++---
@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
  	pop {r4,pc}
 +endfunc
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From 9a5009bc2f0298b348d9d76fec608226a191e021 Mon Sep 17 00:00:00 2001
+From a2c3775e11e6c5b4ce5fe2c3d362988f01006072 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/18] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/19] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From 609d580b57eb98d6e78089da40829a4268fcb6d7 Mon Sep 17 00:00:00 2001
+From fabb2a0b94fea17af77db88ae89ce9352bf77ea9 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/18] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/19] contrib/ebml+mkv: compile with hidden symbols on iOS
 
 ---
  contrib/src/ebml/rules.mak     | 7 +++++--
@@ -48,5 +48,5 @@ index 336e001..40dfb1e 100644
  	cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
  	$(RANLIB) "$(PREFIX)/lib/libmatroska.a"
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From 8432ac45ae89156b24ddc5eb7f408e0327475cde Mon Sep 17 00:00:00 2001
+From ac60c779d14dc25e09d5603a39be9106293a2246 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/18] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 05/19] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---
@@ -62,5 +62,5 @@ index aa38f1b..38961bc 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 */
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From 317804ff239acee2310b0d4b74a3faa31e207eb9 Mon Sep 17 00:00:00 2001
+From 6da6091c3ed606a90ccfe99e2423e74492f45c0e 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/18] contrib/png: fix ARM assembly for iOS
+Subject: [PATCH 06/19] contrib/png: fix ARM assembly for iOS
 
 ---
  contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
@@ -119,5 +119,5 @@ index 468dd14..24b0b5f 100644
  	cd $< && $(MAKE) install
  	touch $@
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From f60c084fa4590e1339e28be48acf603fd2c93020 Mon Sep 17 00:00:00 2001
+From 0fb1dfd76b31caa8d2b74692ac15c944636815c6 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/18] contrib/speex: fix compilation for non-ARMv7 iOS
+Subject: [PATCH 07/19] contrib/speex: fix compilation for non-ARMv7 iOS
  targets
 
 the neon code included in speex doesn't do ARMv8 yet
@@ -26,5 +26,5 @@ index 99c5a1b..0396531 100644
  .speex: speex
  	mkdir -p $</m4 && $(RECONF)
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From 116f54f1e6a14a3ff683ede43d30912da609b27d Mon Sep 17 00:00:00 2001
+From 209801da12c6fcd1f2a7d44779576290473aec21 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/18] contrib/flac: fix compilation with clang 5.0
+Subject: [PATCH 08/19] contrib/flac: fix compilation with clang 5.0
 
 ---
  contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
@@ -47,5 +47,5 @@ index bf72caf..ee6c2b5 100644
  endif
  ifdef HAVE_ANDROID
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From ea9d3b886060712a0c0f30792d13bb19a11470ec Mon Sep 17 00:00:00 2001
+From af6842a474a848529d872fab98e66869263293d6 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 10/18] lib/media_player: inherit deinterlace and vbi variables
+Subject: [PATCH 09/19] lib/media_player: inherit deinterlace and vbi variables
  to fix correct variables values on first use
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 10/18] 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 868aefe..942e66a 100644
+index 8eee79c..7027bf4 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -435,10 +435,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -26,5 +26,5 @@ index 868aefe..942e66a 100644
      var_Create (mp, "marq-marquee", VLC_VAR_STRING);
      var_Create (mp, "marq-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

+ 3 - 3
MobileVLCKit/patches/0011-contrib-avcodec-deploy-libav.patch

@@ -1,7 +1,7 @@
-From 4bc8ffe1d61a44372b90371de8e05249b216f47d Mon Sep 17 00:00:00 2001
+From ae6958130609926dd267d3315dea15504e7eba56 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 11/18] contrib/avcodec: deploy libav
+Subject: [PATCH 10/19] contrib/avcodec: deploy libav
 
 ---
  contrib/src/ffmpeg/rules.mak | 2 +-
@@ -21,5 +21,5 @@ index 5f73239..1b3fdad 100644
  
  ifdef USE_FFMPEG
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

+ 3 - 3
MobileVLCKit/patches/0012-contrib-opus-disable-asm-on-arm.patch

@@ -1,7 +1,7 @@
-From 371926f1e783f42994d6beb27b070844da099518 Mon Sep 17 00:00:00 2001
+From 4a32373acb892bfddaa603291218fb428b67b143 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 12/18] contrib/opus disable asm on arm
+Subject: [PATCH 11/19] contrib/opus disable asm on arm
 
 ---
  contrib/src/opus/rules.mak | 3 +++
@@ -22,5 +22,5 @@ index d783648..f09a112 100644
  .opus: opus
  	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

+ 6 - 6
MobileVLCKit/patches/0013-contrib-gcrypt-disable-asm-on-iOS.patch

@@ -1,19 +1,19 @@
-From 8644fde58f1f99fcc0f60f58590ca9e745c7d37e Mon Sep 17 00:00:00 2001
+From e81fbbd1ef1c932153be175de7f8a946b1ab7c7d 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 13/18] contrib/gcrypt: disable asm on iOS
+Subject: [PATCH 12/19] contrib/gcrypt: disable asm on iOS
 
 ---
  contrib/src/gcrypt/rules.mak | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
-index 44dfcab..4fa1be0 100644
+index 75a9639..0a4d7d5 100644
 --- a/contrib/src/gcrypt/rules.mak
 +++ b/contrib/src/gcrypt/rules.mak
-@@ -36,6 +36,9 @@ GCRYPT_CONF += --disable-asm
+@@ -31,6 +31,9 @@ GCRYPT_EXTRA_CFLAGS =
  endif
- ifdef HAVE_DARWIN_OS
+ ifdef HAVE_MACOSX
  GCRYPT_CONF += --disable-aesni-support
 +ifdef HAVE_IOS
 +GCRYPT_CONF += --disable-asm
@@ -22,5 +22,5 @@ index 44dfcab..4fa1be0 100644
  ifdef HAVE_BSD
  GCRYPT_CONF += --disable-asm --disable-aesni-support
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

+ 3 - 3
MobileVLCKit/patches/0014-fix-libtool.patch

@@ -1,7 +1,7 @@
-From a2a2a8ab16e65fe390f791b80109047267620522 Mon Sep 17 00:00:00 2001
+From 02f8208d4ea55bf21804d0ee15ae8ef2b38824a8 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 14/18] fix libtool
+Subject: [PATCH 13/19] fix libtool
 
 ---
  modules/arm_neon/Makefile.am    | 4 ++++
@@ -33,5 +33,5 @@ index 9e329c8..72c7279 100644
  SOURCES_transform = transform.c
  SOURCES_invert = invert.c
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,8 +1,8 @@
-From 25ff904732470d9feb9b563c319df1b65d3401d5 Mon Sep 17 00:00:00 2001
+From e7bd84b67abaeb81f98a039c03b200627a57eab0 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 15/18] freetype: added a fake font lookup mechanism for iOS to use
- the packaged demo fonts
+Subject: [PATCH 14/19] freetype: added a fake font lookup mechanism for iOS to
+ use the packaged demo fonts
 
 ---
  modules/text_renderer/freetype.c       |  2 ++
@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
  #endif
  
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From c465462809d024bdfd6fca0ccf46c9ddc734d344 Mon Sep 17 00:00:00 2001
+From b7fcf17da304c886e8dec0580dd4c23781814bd2 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 16/18] contrib/speexdsp: disable neon for AArch64
+Subject: [PATCH 15/19] contrib/speexdsp: disable neon for AArch64
 
 ---
  contrib/src/speexdsp/rules.mak | 5 +++++
@@ -24,5 +24,5 @@ index 2244813..84ce8a9 100644
  .speexdsp: speexdsp
  	mkdir -p $</m4 && $(RECONF)
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

+ 5 - 5
MobileVLCKit/patches/0017-contrib-add-arch-option-for-platforms-where-the-arch.patch

@@ -1,7 +1,7 @@
-From 200cff45e8f93956f860effc02a25ef44bbd8aa6 Mon Sep 17 00:00:00 2001
+From e5b65fa0b688413a5f067f8f27143381e886000a 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 17/18] contrib: add arch option for platforms where the arch
+Subject: [PATCH 16/19] contrib: add arch option for platforms where the arch
  triplet would be ambigous
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 17/18] contrib: add arch option for platforms where the arch
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/contrib/bootstrap b/contrib/bootstrap
-index 24e5779..748323d 100755
+index 2c755df..b46f536 100755
 --- a/contrib/bootstrap
 +++ b/contrib/bootstrap
 @@ -31,6 +31,7 @@ usage()
@@ -65,7 +65,7 @@ index 24e5779..748323d 100755
  		;;
  	*bsd*)
 diff --git a/contrib/src/main.mak b/contrib/src/main.mak
-index b6b70c1..ce5816e 100644
+index 45ba470..372c8d4 100644
 --- a/contrib/src/main.mak
 +++ b/contrib/src/main.mak
 @@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
@@ -79,5 +79,5 @@ index b6b70c1..ce5816e 100644
  ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
  HAVE_WIN64 := 1
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

+ 5 - 5
MobileVLCKit/patches/0018-extras-deploy-arch-option-for-iOS.patch

@@ -1,17 +1,17 @@
-From cf42fdb428ab875e81f289b5a805491688f98502 Mon Sep 17 00:00:00 2001
+From 725076cb2b8ca12eb7ab4c4791a1aa3c07e24289 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 18/18] extras: deploy arch option for iOS
+Subject: [PATCH 17/19] extras: deploy arch option for iOS
 
 ---
  extras/package/ios/build.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
-index 81b2a17..cc1aee6 100755
+index c3aec25..d82d636 100755
 --- a/extras/package/ios/build.sh
 +++ b/extras/package/ios/build.sh
-@@ -187,7 +187,7 @@ else
+@@ -188,7 +188,7 @@ else
      export ASCPP="xcrun as"
  fi
  
@@ -21,5 +21,5 @@ index 81b2a17..cc1aee6 100755
      --disable-sdl \
      --disable-SDL_image \
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

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

@@ -1,7 +1,7 @@
-From dad2f7173f30b4ac61b2dcc28104cc6b6167261b Mon Sep 17 00:00:00 2001
+From e8349d9a027375def84b7b37a493a6abf03e40da 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 20/20] contrib/harfbuzz: work-around build system stupidity
+Subject: [PATCH 18/19] contrib/harfbuzz: work-around build system stupidity
  breaking clang compilation
 
 ---

+ 13 - 26
MobileVLCKit/patches/0009-contrib-gcrypt-use-git-version-on-iOS.patch

@@ -1,13 +1,13 @@
-From 9bf8926abdc3d92fec03822ea83bbe53d55d99af Mon Sep 17 00:00:00 2001
+From b2fd1fd905972efa93759525600fd24c89958751 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 09/18] contrib/gcrypt: use git version on iOS
+Subject: [PATCH 19/19] contrib/gcrypt: use git version on iOS
 
 ---
  contrib/src/gcrypt/disable-doc-compilation.patch   | 43 ++++++++++++++++++++++
- contrib/src/gcrypt/rules.mak                       | 23 ++++++++----
+ contrib/src/gcrypt/rules.mak                       | 15 +++++++-
  .../gcrypt/work-around-libtool-limitation.patch    | 25 +++++++++++++
- 3 files changed, 83 insertions(+), 8 deletions(-)
+ 3 files changed, 82 insertions(+), 1 deletion(-)
  create mode 100644 contrib/src/gcrypt/disable-doc-compilation.patch
  create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
 
@@ -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 ae55695..44dfcab 100644
+index 0a4d7d5..71b4241 100644
 --- a/contrib/src/gcrypt/rules.mak
 +++ b/contrib/src/gcrypt/rules.mak
 @@ -1,6 +1,7 @@
@@ -72,7 +72,7 @@ index ae55695..44dfcab 100644
  
  PKGS += gcrypt
  
-@@ -9,9 +10,20 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
+@@ -9,11 +10,23 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
  
  .sum-gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
  
@@ -82,10 +82,13 @@ index ae55695..44dfcab 100644
 +ifndef HAVE_IOS
  libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
  	$(UNPACK)
+ 	$(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
+ 	$(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
  	$(MOVE)
 +else
-+libgcrypt: libgcrypt-git.tar.xz .sum-gcrypt
++libgcrypt: libgcrypt-git.tar.xz
 +	$(UNPACK)
++	$(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
 +	$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
 +	$(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
 +	$(MOVE)
@@ -93,27 +96,11 @@ index ae55695..44dfcab 100644
  
  DEPS_gcrypt = gpg-error
  
-@@ -22,12 +34,7 @@ GCRYPT_CONF = \
- ifdef HAVE_WIN64
- GCRYPT_CONF += --disable-asm
- endif
--ifdef HAVE_IOS
--GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
--else
--GCRYPT_EXTRA_CFLAGS =
--endif
--ifdef HAVE_MACOSX
-+ifdef HAVE_DARWIN_OS
- GCRYPT_CONF += --disable-aesni-support
- else
- ifdef HAVE_BSD
-@@ -41,7 +48,7 @@ endif
- endif
+@@ -47,6 +60,6 @@ endif
  
  .gcrypt: libgcrypt
--	#$(RECONF)
+ 	$(RECONF)
 -	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(GCRYPT_EXTRA_CFLAGS)" ./configure $(HOSTCONF) $(GCRYPT_CONF)
-+	$(RECONF)
 +	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GCRYPT_CONF)
  	cd $< && $(MAKE) install
  	touch $@
@@ -149,5 +136,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-1.8.3.4 (Apple Git-47)
+1.8.5.2 (Apple Git-48)
 

+ 1 - 1
buildMobileVLCKit.sh

@@ -14,7 +14,7 @@ CONFIGURATION="Release"
 NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 
-TESTEDHASH=d6b9b0cba
+TESTEDHASH=4acdfca5a
 
 usage()
 {