[SCM] FFmpeg packaging branch, master, updated. debian/0.5.2-1-11-gfb5f2c1

[lool at users.alioth.debian.org]

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

    Pass -marmv7-a for the NEON flavor if needed
    
    Pass -marmv7-a for the NEON flavor if needed, don't check for v6t2.

diff --git a/debian/confflags b/debian/confflags
index 5d5ba04..26a9ed3 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -33,8 +33,8 @@ 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))
+    v7_asm := dmb
+    has_v7 := $(call check_asm, $(v7_asm))
 
     # only build a VFP flavour if the toolchain doesn't enable VFP by default
     ifneq ($(has_vfp),1)
@@ -167,8 +167,8 @@ 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)
+# so pass armv7-a if it's not already enabled
+ifneq ($(has_v7),1)
 neon_build_confflags += --extra-cflags="-marmv7-a"
 endif
 neon_build_confflags += --extra-cflags="-mfpu=neon -mfloat-abi=softfp -fPIC -DPIC"

-- 
FFmpeg packaging