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

[lool at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 07fc4e3bed9779decaa5d15ccbe4226b4e8cd46c
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 17:47:03 2009 +0200

    Add neon and vfp flavors to armel disabled for now
    
    Add neon and vfp flavors to armel; disabled for now as glibc hwcaps
    support needs to be merged first.

diff --git a/debian/confflags b/debian/confflags
index 0d79471..43fc4b6 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -15,7 +15,10 @@ 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
-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
@@ -96,6 +99,23 @@ endif
 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 += --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