[SCM] rubberband/master: Fix armel build 2nd attempt

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c0bd52de423efc88bbdeca170d31fe7c594486a6
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Jun 5 14:28:36 2013 +0200

    Fix armel build 2nd attempt

diff --git a/debian/patches/03-fix_build_on_armel.patch b/debian/patches/03-fix_build_on_armel.patch
index 45f6bc6..203c8ee 100644
--- a/debian/patches/03-fix_build_on_armel.patch
+++ b/debian/patches/03-fix_build_on_armel.patch
@@ -4,18 +4,25 @@ Forwarded: no
 
 Index: rubberband/src/system/sysutils.cpp
 ===================================================================
---- rubberband.orig/src/system/sysutils.cpp	2012-12-10 04:09:09.987302198 +0100
-+++ rubberband/src/system/sysutils.cpp	2013-06-05 01:38:34.742177042 +0200
-@@ -224,10 +224,10 @@
-     static const unsigned int y = 0x03000000;
-     int r;
-     asm volatile (
+--- rubberband.orig/src/system/sysutils.cpp	2013-06-05 14:18:50.718456311 +0200
++++ rubberband/src/system/sysutils.cpp	2013-06-05 14:22:36.759577185 +0200
+@@ -219,19 +219,6 @@
+     fesetenv(FE_DFL_DISABLE_SSE_DENORMS_ENV);
+ #endif
+ #endif
+-#if defined __ARMEL__
+-    static const unsigned int x = 0x04086060;
+-    static const unsigned int y = 0x03000000;
+-    int r;
+-    asm volatile (
 -        "fmrx	%0, fpscr   \n\t"
-+        "vmrs	%0, fpscr   \n\t"
-         "and	%0, %0, %1  \n\t"
-         "orr	%0, %0, %2  \n\t"
+-        "and	%0, %0, %1  \n\t"
+-        "orr	%0, %0, %2  \n\t"
 -        "fmxr	fpscr, %0   \n\t"
-+        "vmsr	fpscr, %0   \n\t"
-         : "=r"(r)
-         : "r"(x), "r"(y)
- 	);
+-        : "=r"(r)
+-        : "r"(x), "r"(y)
+-	);
+-#endif
+ }
+ 
+ void system_specific_application_initialise()

-- 
rubberband packaging