[SCM] FFmpeg packaging branch, master, updated. debian/0.5.2-1-8-g6f4a84a

[lool at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6f4a84a379cb1fdff31ed2ffe433732f928b3e2b
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Aug 27 01:20:34 2010 +0200

    confflags: detect armv6t2 support; closes: #594093
    
    debian/confflags: detect whether the toolchain supports armv6t2 ("ubfx")
    by default as that's now needed for the NEON pass; if it's not enabled by
    default, pass -marmv7-a in extra-cflags for the NEON pass since NEON
    implies ARMv7; closes: #594093.

diff --git a/debian/confflags b/debian/confflags
index 6e5b644..5d5ba04 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -33,11 +33,14 @@ ifeq ($(DEB_HOST_ARCH),armel)
     has_vfp := $(call check_asm, $(vfp_asm))
     neon_asm := vadd.i16 q0, q0, q0
     has_neon := $(call check_asm, $(neon_asm))
+    v6t2_asm := ubfx r0, r0, 0, 1
+    has_v6t2 := $(call check_asm, $(v6t2_asm))
 
-    # only build 
+    # only build a VFP flavour if the toolchain doesn't enable VFP by default
     ifneq ($(has_vfp),1)
     FLAVORS += vfp
     endif
+    # only build a NEON flavour if the toolchain doesn't enable NEON by default
     ifneq ($(has_neon),1)
     FLAVORS += neon
     endif
@@ -162,6 +165,12 @@ vfp_build_confflags += --disable-ffplay
 # NB: NEON always implies v7+ and ffmpeg's NEON implementation requires VFP
 neon_build_confflags += $(confflags)
 neon_build_confflags += --shlibdir=/usr/lib/neon/vfp
+# the NEON pass now requires ubfx which was introduced in armv6t2; we need to
+# enable at least armv6t2 for the NEON pass to build, but NEON implies armv7-a
+# so pass armv7-a
+ifneq ($(has_v6t2),1)
+neon_build_confflags += --extra-cflags="-marmv7-a"
+endif
 neon_build_confflags += --extra-cflags="-mfpu=neon -mfloat-abi=softfp -fPIC -DPIC"
 neon_build_confflags += --enable-shared
 neon_build_confflags += --disable-static

-- 
FFmpeg packaging