[SCM] ffmpeg/master: compile with "-marm -fPIC -DPIC" on armel

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6d3e17980121e27bcfd113f2e0561d93aca1a5be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 17:25:51 2011 +0100

    compile with "-marm -fPIC -DPIC" on armel
    
    this originally comes from Ubuntu, but I'm happy to here any qualified
    suggestion from arm porters.

diff --git a/debian/confflags b/debian/confflags
index 6056e1f..6d14723 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -111,7 +111,11 @@ confflags += --enable-zlib
 confflags += --enable-libvpx
 confflags += --disable-stripping
 confflags += --enable-runtime-cpudetect
-
+ifeq      ($(DEB_HOST_ARCH),armel)
+# this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
+# plenty of incompatible assembly; not sure how to detect that properly
+confflags += --extra-cflags="-marm -fPIC -DPIC"
+endif
 
 ifeq      ($(DEB_HOST_ARCH),powerpc)
 confflags += --enable-pic

-- 
Libav/FFmpeg packaging