[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-1-6-g26f492d

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f2c43661a3628029bcc3c98a03af1c9970ddab0b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 5 22:24:53 2009 +0200

    set nooptflags only for relevant architectures
    
    This makes the --configure line a bit shorter. This has a visible effect
    on the 'ffmpeg' binary. It encodes the complete configure line in the
    binary.

diff --git a/debian/confflags b/debian/confflags
index 676554b..bd7b70a 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -15,15 +15,23 @@ export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 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)
+nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2
+nooptflags += --disable-armvfp --disable-neon
 # disabled for now as we need hwcaps support in glibc first
 #FLAVORS += neon vfp
+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)
 FLAVORS += altivec
+nooptflags += --disable-altivec
 else ifeq ($(DEB_HOST_ARCH),sparc)
 FLAVORS += vis
+nooptflags += --disable-vis
 endif
 
 define cond_enable
@@ -79,11 +87,6 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   confflags += --disable-mmx
 endif
 
-# Disable architecture-specific optimizations for default shared build
-nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2 --disable-armvfp --disable-neon
-nooptflags += --disable-altivec
-nooptflags += --disable-vis
-
 # Configuration flags for the static libraries
 static_build_confflags += $(confflags)
 static_build_confflags += --disable-ffmpeg

-- 
FFmpeg packaging