[scummvm] 01/02: Add disable-arm-asm.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository scummvm.

commit 78ee8c2d5fb965bd52d206989f98726902c48bf9
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Feb 28 18:46:31 2015 +0100

    Add disable-arm-asm.patch
    
    Closes: #779029
    Thanks: Konstantinos Margaritis <markos at freevec.org> for the report and patch
    and Vagrant Cascadian for further testing.
---
 debian/patches/disable-arm-asm.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/disable-arm-asm.patch b/debian/patches/disable-arm-asm.patch
new file mode 100644
index 0000000..a2b06b9
--- /dev/null
+++ b/debian/patches/disable-arm-asm.patch
@@ -0,0 +1,32 @@
+From: Konstantinos Margaritis <markos at freevec.org>
+Date: Sat, 28 Feb 2015 18:46:02 +0100
+Subject: disable arm asm
+
+Disable asm optimizatons for ARM sytems to prevent a crash and
+segmentation fault when running ScummVM on these platforms.
+
+Forwarded: http://sourceforge.net/p/scummvm/bugs/6810/
+Bug-Debian: https://bugs.debian.org/779029
+---
+ configure | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 0635907..d3391e7 100755
+--- a/configure
++++ b/configure
+@@ -2027,10 +2027,10 @@ echo_n "Checking host CPU architecture... "
+ case $_host_cpu in
+ 	arm*)
+ 		echo "ARM"
+-		define_in_config_if_yes yes 'USE_ARM_SCALER_ASM'
+-		define_in_config_if_yes yes 'USE_ARM_SOUND_ASM'
+-		define_in_config_if_yes yes 'USE_ARM_SMUSH_ASM'
+-		define_in_config_if_yes yes 'USE_ARM_GFX_ASM'
++		# define_in_config_if_yes yes 'USE_ARM_SCALER_ASM'
++		# define_in_config_if_yes yes 'USE_ARM_SOUND_ASM'
++		# define_in_config_if_yes yes 'USE_ARM_SMUSH_ASM'
++		# define_in_config_if_yes yes 'USE_ARM_GFX_ASM'
+ 		# FIXME: The following feature exhibits a bug during the intro scene of Indy 4
+ 		# (on Pandora and iPhone at least)
+ 		#define_in_config_if_yes yes 'USE_ARM_COSTUME_ASM'
diff --git a/debian/patches/series b/debian/patches/series
index 9af93bb..ea130ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 drop1test.patch
+disable-arm-asm.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git