[SCM] mplayer/master: Enable runtime cpu detection in hurd-i386.

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

The following commit has been merged in the master branch:
commit 0c67af3d47879f934a834ea593a2d8ba2f8704bd
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Mon Jul 27 02:35:05 2015 -0400

    Enable runtime cpu detection in hurd-i386.
    
    This avoids using -march=native.
    Closes: #735371

diff --git a/debian/rules b/debian/rules
index 774f792..e981e71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,24 +27,17 @@ CONFIGURE_FLAGS = \
 	--extra-ldflags="${LDFLAGS}" \
 	$(archconf)
 
+# Runtime detections is available for i386, amd64 and ppc.
+ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 powerpc))
+  CONFIGURE_FLAGS += --enable-runtime-cpudetection
+endif
+
 ifeq ($(DEB_HOST_ARCH),i386)
 #configure optimizes for the cpu detected at ./configure time
 #in order to build a generic binary, avoid non-standard opcodes through gcc
   archconf += --target=i586-linux
-  CONFIGURE_FLAGS += --enable-runtime-cpudetection
-endif
-ifeq ($(DEB_HOST_ARCH),amd64)
-  CONFIGURE_FLAGS += --enable-runtime-cpudetection
-endif
-ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
-  CONFIGURE_FLAGS += --enable-runtime-cpudetection
-endif
-ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
-  CONFIGURE_FLAGS += --enable-runtime-cpudetection
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
-  CONFIGURE_FLAGS += --enable-runtime-cpudetection
 endif
+
 # when run on a sparc64 kernel, configure will normally select v9 asm.
 # this is hidden when running on buildds with 32bit kernel personality.
 # because of #644856, this will currently lead to a FTBFS
@@ -52,13 +45,14 @@ endif
 ifeq ($(DEB_HOST_ARCH),sparc)
   archconf += --target=generic
 endif
+
 ifeq ($(DEB_HOST_ARCH),alpha)
 #Avoid high optimization through gcc.
 # see http://permalink.gmane.org/gmane.linux.debian.ports.alpha/7295
   archconf += --target=alpha_ev5-linux
 endif
 
-ifeq (linux,$(DEB_HOST_ARCH_OS))
+ifeq ($(DEB_HOST_ARCH_OS),linux)
     CONFIGURE_FLAGS += --enable-joystick --enable-radio --enable-radio-capture
     sound_backend := alsa
 else

-- 
mplayer packaging