Commit ed3d1ac7 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

patches: enable and fix gcrypt (close #9174)

Review on vlc-devel pending
parent d8038df6
......@@ -10,6 +10,7 @@
* Added support for multi-touch gestures based upon the VLC Gestures haxie
* Added support for media broadcasted with the Session Announcement Protocol
(SAP) information on the local network (#9429)
* Added support for HTTP Live Streaming (HLS) (#9174)
* Opening network streams no longer leads to a collapsed file system hierachy
on the remote system. After playback, you can continue where you left off.
* UPnP stability improvements
......
From 9ac6ada49d2f38ae1dde6fcee552a46e252058c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 30 Oct 2013 20:03:42 +0100
Subject: [PATCH 1/2] contrib/gcrypt: fix compilation for iOS
---
contrib/src/gcrypt/rules.mak | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 31b930e..7d2688e 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -37,6 +37,10 @@ endif
.gcrypt: libgcrypt
#$(RECONF)
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GCRYPT_CONF)
+ifdef HAVE_IOS
+ cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -fheinous-gnu-extensions" ./configure $(HOSTCONF) $(GCRYPT_CONF)
+else
+ cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -fheinous-gnu-extensions" ./configure $(HOSTCONF) $(GCRYPT_CONF)
+endif
cd $< && $(MAKE) install
touch $@
--
1.8.3.4 (Apple Git-47)
From d5a4a989c90fe715589af16d3ef6d15123467114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 30 Oct 2013 20:04:22 +0100
Subject: [PATCH 2/2] extras/ios: enable gcrypt as we need it for HLS playback
---
extras/package/ios/build.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 131a025..ff8b9a9 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -198,7 +198,6 @@ fi
--disable-sidplay2 \
--disable-samplerate \
--disable-goom \
- --disable-gcrypt \
--disable-vncserver \
--disable-gnutls \
--disable-orc \
@@ -212,7 +211,6 @@ fi
--enable-ass \
--disable-fontconfig \
--disable-gpg-error \
- --disable-gcrypt \
--disable-lua \
--disable-taglib > ${out}
@@ -275,7 +273,6 @@ ${VLCROOT}/configure \
--enable-fribidi \
--disable-macosx-audio \
--disable-qt --disable-skins2 \
- --disable-libgcrypt \
--disable-vcd \
--disable-vlc \
--disable-vlm \
--
1.8.3.4 (Apple Git-47)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment