[SCM] mpg123/master: Improve ARM CPUs optimizations.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c706783790e11a5707f2739a3536d565355bdd90
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Mar 29 14:11:32 2012 +0200

    Improve ARM CPUs optimizations.

diff --git a/debian/rules b/debian/rules
index 4073861..dc6fa69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 PACKAGE:=mpg123
 
-ARCH:=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 OS:=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 CPU:=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -16,7 +16,13 @@ endif
 CONF_COMMON:=--enable-static=no --enable-shared --enable-lfs-alias
 
 CONF_i486:=--with-cpu=x86_dither
-CONF_arm:=--with-cpu=generic_nofpu
+ifeq ($(ARCH),armel)
+CONF_arm:=--with-cpu=arm_nofpu
+else
+ifeq ($(ARCH),armhf)
+CONF_arm:=--with-cpu=neon
+endif
+endif
 
 SOVERSION:=0
 LIB_PKG:=libmpg123-$(SOVERSION)
@@ -46,7 +52,7 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CONF_COMMON) $(CONF_$(ARCH))
+	dh_auto_configure -- $(CONF_COMMON) $(CONF_$(CPU))
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
mpg123 packaging