[SCM] FFmpeg packaging branch, master, updated. debian/0.svn20090303-1-15-gb2be8b7

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b2be8b7831713093b27ee635381314f0b1203986
Merge: acf4eb93de5317e539939082b987d85ea24ab03a f8b1a9fbc9bbf27971cafb57cde4c306b4e2d214
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 15:54:16 2009 +0200

    merge with Loïc's arm related changes

diff --combined debian/confflags
index 325dc09,3c4ebe0..676554b
--- a/debian/confflags
+++ b/debian/confflags
@@@ -15,7 -15,10 +15,10 @@@ export DEB_HOST_ARCH      ?= $(shell dp
  SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN")
  
  # the other flavors always build dynamic versions
- ifeq      ($(DEB_HOST_ARCH),i386)
+ ifeq      ($(DEB_HOST_ARCH),armel)
+ # disabled for now as we need hwcaps support in glibc first
+ #FLAVORS += neon vfp
+ else ifeq ($(DEB_HOST_ARCH),i386)
  FLAVORS += cmov
  else ifeq ($(DEB_HOST_ARCH),powerpc)
  FLAVORS += altivec
@@@ -37,7 -40,7 +40,7 @@@ gpl_confflags += --enable-x11gra
  gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
  
  # Common configuration flags
 -confflags += --extra-version='svn$(SVNREVISION)+$(DEB_VERSION)'
 +confflags += --extra-version='$(DEB_VERSION)'
  confflags += --prefix=/usr
  confflags += --enable-avfilter
  confflags += --enable-avfilter-lavf
@@@ -77,7 -80,7 +80,7 @@@ ifneq (,$(findstring noopt,$(DEB_BUILD_
  endif
  
  # Disable architecture-specific optimizations for default shared build
- nooptflags += --disable-armv5te --disable-armv6
+ nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2 --disable-armvfp --disable-neon
  nooptflags += --disable-altivec
  nooptflags += --disable-vis
  
@@@ -96,6 -99,24 +99,24 @@@ endi
  shared_build_confflags += --enable-shared
  shared_build_confflags += --disable-static
  
+ ## armel architecture specific
+ # 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"
+ vfp_build_confflags += --disable-ffmpeg
+ vfp_build_confflags += --disable-ffplay
+ neon_build_confflags += $(confflags)
+ neon_build_confflags += --shlibdir=/usr/lib/neon
+ neon_build_confflags += --enable-neon
+ neon_build_confflags += --enable-shared
+ neon_build_confflags += --disable-static
+ neon_build_confflags += --disable-ffmpeg
+ neon_build_confflags += --disable-ffplay
+ 
  ## i386 architecture specific
  # Configuration flags for the optimized shared libraries
  cmov_build_confflags += $(confflags)

-- 
FFmpeg packaging