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

[lool at users.alioth.debian.org]

The following commit has been merged in the ubuntu.lucid branch:
commit 720e8058363c27cb3a6f1ad10cba11886cd3c769
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Jan 13 12:54:13 2010 +0100

    Drop --disable/--enable opt flags on ARM
    
    Drop --disable/--enable opt flags such as --disable-neon or
    --enable-armvfp on ARM since the upstream configure script will do the
    right thing when the proper flags are set.

diff --git a/debian/confflags b/debian/confflags
index 8b3107a..e5d745e 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -41,9 +41,6 @@ ifeq ($(DEB_HOST_ARCH),armel)
     ifneq ($(has_neon),1)
     FLAVORS += neon
     endif
-else ifeq ($(DEB_HOST_ARCH),arm)
-    nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2
-    nooptflags += --disable-armvfp --disable-neon
 else ifeq ($(DEB_HOST_ARCH),i386)
     FLAVORS += cmov
 else ifeq ($(DEB_HOST_ARCH),powerpc)
@@ -97,7 +94,7 @@ confflags += --disable-stripping
 confflags += --disable-vhook
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
-# plenty of incompatible assembly
+# plenty of incompatible assembly; not sure how to detect that properly
 confflags += --extra-cflags="-marm -fPIC -DPIC"
 endif
 confflags += $(extra_common_confflags)
@@ -152,7 +149,6 @@ shared_build_confflags += --disable-static
 # Configuration flags for the optimised shared libraries
 vfp_build_confflags += $(confflags)
 vfp_build_confflags += --shlibdir=/usr/lib/vfp
-vfp_build_confflags += --enable-armvfp
 vfp_build_confflags += --enable-shared
 vfp_build_confflags += --disable-static
 vfp_build_confflags += --extra-cflags="-mfpu=vfp -mfloat-abi=softfp"

-- 
FFmpeg packaging