[SCM] FFmpeg packaging branch, ubuntu.karmic, updated. debian/0.5+svn20090706-1ubuntu3-28-g19547ea

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Oct 13 21:39:33 UTC 2009


The following commit has been merged in the ubuntu.karmic branch:
commit 1b21462f47aff06d94ea29120a6e8438b97b3168
Author: Loïc Minier <lool at dooz.org>
Date:   Thu Oct 8 16:09:25 2009 +0200

    Update config for karmic's armel toolchain
    
    karmic's armel toolchain assumes v6 + VFP so drop now useless VFP
    flavour and enable v6 and VFP ffmpeg configure flags.

diff --git a/debian/confflags b/debian/confflags
index aae49ff..5e763eb 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -16,11 +16,12 @@ 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
+# Ubuntu karmic and later assume v6 + VFP
+nooptflags += --enable-armv6 --disable-armv6t2
+nooptflags += --enable-armvfp --disable-neon
+#FLAVORS += vfp
 # disabled for now as NEON support deadlocks the Babbage
 #FLAVORS += neon
-FLAVORS += vfp
 else ifeq ($(DEB_HOST_ARCH),arm)
 nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2
 nooptflags += --disable-armvfp --disable-neon

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list