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

patches: add 2 more depending on to-be-reviewed patch

Felix Paul Kühne пре 11 година
родитељ
комит
e433d28516

+ 39 - 0
patches/0020-contrib-png-fix-compilation-for-arm64-which-is-unkno.patch

@@ -0,0 +1,39 @@
+From bd0ca136089eecbc0ca73db8c7f5c7cb4c041729 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:38:25 +0200
+Subject: [PATCH 1/2] contrib/png: fix compilation for arm64 which is unknown
+ to the libpng developers
+
+---
+ contrib/src/png/rules.mak | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
+index 701e3a8..d76206e 100644
+--- a/contrib/src/png/rules.mak
++++ b/contrib/src/png/rules.mak
+@@ -7,6 +7,13 @@ ifeq ($(call need_pkg,"libpng"),)
+ PKGS_FOUND += png
+ endif
+ 
++PNGCONF =
++ifdef HAVE_IOS
++ifeq ($(ARCH),arm64)
++PNGCONF = --enable-arm-neon=no
++endif
++endif
++
+ $(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
+ 	$(call download,$(PNG_URL))
+ 
+@@ -26,6 +33,6 @@ DEPS_png = zlib $(DEPS_zlib)
+ 
+ .png: png
+ 	$(RECONF)
+-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
++	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(PNGCONF)
+ 	cd $< && $(MAKE) install
+ 	touch $@
+-- 
+1.8.3.4 (Apple Git-47)
+

+ 28 - 0
patches/0021-contrib-speex-fix-compilation-for-arm64.patch

@@ -0,0 +1,28 @@
+From 44fdb4bf7908d73ff641ec2c062f08a9f513db78 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Thu, 3 Oct 2013 19:30:01 +0200
+Subject: [PATCH 2/2] contrib/speex: fix compilation for arm64
+
+---
+ contrib/src/speex/rules.mak | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
+index fb96a6b..3418b13 100644
+--- a/contrib/src/speex/rules.mak
++++ b/contrib/src/speex/rules.mak
+@@ -35,6 +35,11 @@ ifeq ($(ARCH),arm)
+ SPEEX_CONF += --enable-arm5e-asm
+ endif
+ endif
++ifdef HAVE_IOS
++ifeq ($(ARCH),arm64)
++SPEEX_CONF += --disable-neon
++endif
++endif
+ 
+ .speex: speex
+ 	$(RECONF)
+-- 
+1.8.3.4 (Apple Git-47)
+