Ver código fonte

MobileVLCKit/patches: add 2 patches waiting for upstream review

Felix Paul Kühne 11 anos atrás
pai
commit
3f61eca321

+ 27 - 0
MobileVLCKit/patches/0019-contrib-gnutls-don-t-reconf-on-iOS-so-we-don-t-have-.patch

@@ -0,0 +1,27 @@
+From db1877bdb5fb0999916a678da12fec618caebea5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Tue, 19 Nov 2013 16:56:24 +0100
+Subject: [PATCH 2/3] contrib/gnutls: don't reconf on iOS so we don't have to
+ compile gettext
+
+---
+ contrib/src/gnutls/rules.mak | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
+index b587686..7d997d8 100644
+--- a/contrib/src/gnutls/rules.mak
++++ b/contrib/src/gnutls/rules.mak
+@@ -48,7 +48,9 @@ GNUTLS_CONF := \
+ DEPS_gnutls = nettle $(DEPS_nettle)
+ 
+ .gnutls: gnutls
++ifndef HAVE_IOS
+ 	$(RECONF)
++endif
+ ifdef HAVE_ANDROID
+ 	cd $< && $(HOSTVARS) gl_cv_header_working_stdint_h=yes ./configure $(GNUTLS_CONF)
+ else
+-- 
+1.8.3.4 (Apple Git-47)
+

+ 31 - 0
MobileVLCKit/patches/0020-contrib-gmp-compile-without-pic-on-iOS.patch

@@ -0,0 +1,31 @@
+From cb2dcd865ebe6a7106ae6651e077151565961581 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Tue, 19 Nov 2013 17:16:28 +0100
+Subject: [PATCH 3/3] contrib/gmp: compile without pic on iOS
+
+---
+ contrib/src/gmp/rules.mak | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
+index 5f60fb0..818d541 100644
+--- a/contrib/src/gmp/rules.mak
++++ b/contrib/src/gmp/rules.mak
+@@ -18,8 +18,13 @@ gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
+ 	$(APPLY) $(SRC)/gmp/ansi2knr.diff
+ 	$(MOVE)
+ 
++GMP_CONF := $(HOSTCONF)
++ifdef HAVE_IOS
++GMP_CONF += --without-pic
++endif
++
+ .gmp: gmp
+ 	$(RECONF)
+-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
++	cd $< && $(HOSTVARS) ./configure $(GMP_CONF)
+ 	cd $< && $(MAKE) install
+ 	touch $@
+-- 
+1.8.3.4 (Apple Git-47)
+