[SCM] ffmpeg/master-0.6: Pass --arch to configure

[siretart at users.alioth.debian.org]

The following commit has been merged in the master-0.6 branch:
commit 46566a108db0fccf115e62817d398bfee746e413
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 17 22:33:18 2011 +0200

    Pass --arch to configure
    
    This helps compilation on systems that run 64bit kernels on 32bit
    userland. Upstream considers such configurations as "cross
    compiling". While on most architectures the configure script gets it
    right nevertheless, on architectures such as mips, it is not able to
    find out the 'native' build architecture due to various abis. This
    change is supposed ti assist the configuration process.
    (cherry picked from commit 27301ced78552bd4a95a9502cb67acd58b3fd297)

diff --git a/debian/confflags b/debian/confflags
index 6d14723..5e1e23b 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -96,6 +96,7 @@ gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
 
 # Common configuration flags
 confflags += --extra-version='$(DEB_VERSION)'
+confflags += --arch='$(DEB_HOST_ARCH_CPU)'
 confflags += --prefix=/usr
 confflags += --enable-avfilter
 confflags += --enable-avfilter-lavf

-- 
Libav/FFmpeg packaging