Commit 8b61a964 authored by Felix Paul Kühne's avatar Felix Paul Kühne

patches: remove ARM ASM libav hack and replace it by a fixed gas-pp (close #8672)

parent 1b1cc524
From bfcce2524eace6982d93eece92e2bbfc98618043 Mon Sep 17 00:00:00 2001
From: Gleb Pinigin <gpinigin@gmail.com>
Date: Mon, 13 May 2013 21:09:24 +0700
Subject: [PATCH 8/8] contrib: disable some ARM ASM in libav until
---
contrib/src/ffmpeg/rules.mak | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 36b491c..2cabd40 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -56,6 +56,12 @@ ifeq ($(ARCH),arm)
FFMPEGCONF += --arch=arm
ifdef HAVE_NEON
FFMPEGCONF += --enable-neon
+ifdef HAVE_IOS
+FFMPEGCONF += --disable-armv5te
+FFMPEGCONF += --disable-armv6
+FFMPEGCONF += --disable-armv6t2
+FFMPEGCONF += --extra-cflags='-mfpu=neon -mfloat-abi=softfp -mvectorize-with-neon-quad'
+endif
endif
ifdef HAVE_ARMV7A
FFMPEGCONF += --cpu=cortex-a8
--
1.7.10.2 (Apple Git-33)
From 0c4c00bd78877abc3ae2ac9f817e6fecc162a393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 28 May 2013 14:22:02 +0200
Subject: [PATCH 8/8] extras/tools: use another gas-pp fork fixing mp1/2/3
decoding on iOS on ARM
---
extras/tools/packages.mak | 4 ++--
extras/tools/tools.mak | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 60ac2b5..d7e78e7 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -32,8 +32,8 @@ XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
OPENSSL_VERSION=1.0.0e
OPENSSL_URL=http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
-GAS_URL=https://github.com/mansr/gas-preprocessor/tarball/master
-GAS_VERSION=76a72f0
+GAS_URL=https://github.com/mstorsjo/gas-preprocessor/tarball/irp-if
+GAS_VERSION=c76b628
RAGEL_VERSION=6.8
RAGEL_URL=http://www.complang.org/ragel/ragel-$(RAGEL_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index c9c94a1..37df7b1 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -216,10 +216,10 @@ CLEAN_PKG += openssl
DISTCLEAN_PKG += openssl-$(OPENSSL_VERSION).tar.gz
# gas-preprocessor
-mansr-gas-preprocessor-$(GAS_VERSION).tar.gz:
+mstorsjo-gas-preprocessor-$(GAS_VERSION).tar.gz:
$(call download,$(GAS_URL))
-gas: mansr-gas-preprocessor-$(GAS_VERSION).tar.gz
+gas: mstorsjo-gas-preprocessor-$(GAS_VERSION).tar.gz
$(UNPACK)
$(MOVE)
--
1.7.12.4 (Apple Git-37)
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