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

[siretart at users.alioth.debian.org]

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

    Update NEON confflags to assume v7 and VFP
    
    NEON implies ARMv7+ and Dave Martin says ffmpeg's NEON implementation
    uses VFP, so update flavs of the neon flavour to use
        --shlibdir=/usr/lib/neon/vfp --enable-armvfp -mcpu=armv7-a \
        --extra-cflags="-mfpu=neon -mfloat-abi=softfp"

diff --git a/debian/confflags b/debian/confflags
index 1382fb1..a65d00f 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -131,10 +131,13 @@ 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
+# NB: NEON always implies v7+ and ffmpeg's NEON implementation requires VFP
 neon_build_confflags += $(confflags)
-neon_build_confflags += --shlibdir=/usr/lib/neon
+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 += --extra-cflags="-mfpu=neon -mfloat-abi=softfp"
 neon_build_confflags += --disable-static
 neon_build_confflags += --disable-ffmpeg
 neon_build_confflags += --disable-ffplay

-- 
FFmpeg packaging