[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 b42bddf599fc0b146e57caf1ad8d9ded9203c9c1
Author: Loïc Minier <lool at dooz.org>
Date:   Sat Oct 10 22:52:50 2009 +0200

    Pass proper --cpu and --extra-flags on armel
    
    Instead of passing a long list of --enable/--disable, actually pass
    proper --cpu=armv6 --extra-cflags="-mfpu=vfp -mfloat-abi=softfp" and
    --cpu=armv7-a --extra-cflags="-mfpu=neon -mfloat-abi=softfp" flags to
    configure for nooptflags and neon flags; configure will detect the
    proper features.

diff --git a/debian/confflags b/debian/confflags
index a65d00f..c5fdf83 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -16,9 +16,9 @@ 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)
-# Ubuntu karmic and later assume v6 + VFP
-nooptflags += --enable-armv6 --disable-armv6t2
-nooptflags += --enable-armvfp --disable-neon
+# Ubuntu karmic and later assume v6 + VFP; just override CPU since it defaults
+# to uname -m
+nooptflags += --cpu=armv6 --extra-cflags="-mfpu=vfp -mfloat-abi=softfp"
 #FLAVORS += vfp
 FLAVORS += neon
 else ifeq ($(DEB_HOST_ARCH),arm)
@@ -134,10 +134,9 @@ vfp_build_confflags += --disable-ffplay
 # NB: NEON always implies v7+ and ffmpeg's NEON implementation requires VFP
 neon_build_confflags += $(confflags)
 neon_build_confflags += --shlibdir=/usr/lib/neon/vfp
-neon_build_confflags += --enable-neon
-neon_build_confflags += --enable-armvfp
-neon_build_confflags += --enable-shared
+neon_build_confflags += --cpu=armv7-a
 neon_build_confflags += --extra-cflags="-mfpu=neon -mfloat-abi=softfp"
+neon_build_confflags += --enable-shared
 neon_build_confflags += --disable-static
 neon_build_confflags += --disable-ffmpeg
 neon_build_confflags += --disable-ffplay

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list