[SCM] FFmpeg packaging branch, ubuntu.lucid, updated. debian/0.5+svn20090706-2ubuntu5.ppa2-2-g6e9624b

[lool at users.alioth.debian.org]

The following commit has been merged in the ubuntu.lucid branch:
commit 6e9624b2c4386aa744282b511a0b37a19f5ab7a0
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Jan 13 11:52:36 2010 +0100

    Drop --cpu on armel as the default is correct
    
    Drop --cpu on armel as the default is the toolchain configuration which
    is always correct on karmic/lucid/sid; internally, cpu will be set to
    "generic" but -march=generic or -mcpu=generic will NOT be added to the
    build flags.

diff --git a/debian/confflags b/debian/confflags
index 1640848..610c4b2 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -16,9 +16,7 @@ SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN")
 # the other flavors always build dynamic versions
 # Also, disable architecture-specific optimizations for default shared build
 ifeq      ($(DEB_HOST_ARCH),armel)
-# Ubuntu karmic and later assume v6 + VFP; just override CPU since it defaults
-# to uname -m
-nooptflags += --extra-cflags="-mfpu=vfpv3-d16 -mfloat-abi=softfp"
+# Ubuntu's toolchain default to vfp anyway
 #FLAVORS += vfp
 FLAVORS += neon
 else ifeq ($(DEB_HOST_ARCH),arm)
@@ -77,8 +75,6 @@ ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
 # plenty of incompatible assembly
 confflags += --extra-cflags="-marm -fPIC -DPIC"
-# Ubuntu lucid and above require v7 for Thumb 2
-confflags += --cpu=armv7-a
 endif
 confflags += $(extra_common_confflags)
 

-- 
FFmpeg packaging