[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-3-13-gefaa869
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Jan 15 20:41:09 UTC 2010
The following commit has been merged in the master branch:
commit efaa86975774665c2b180617203c0aa328226cc1
Merge: a3662f6806d2020491cda2587a806074997f9947 5a8466d1451d378560dfba675a5cdaed093b1436
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Jan 15 21:39:56 2010 +0100
Merge branch 'ubuntu'
Conflicts:
debian/changelog
diff --combined debian/changelog
index f386d20,d69e38a..d1bb593
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,89 +1,66 @@@
-ffmpeg (4:0.5+svn20090706-2ubuntu5) lucid; urgency=low
+ffmpeg (4:0.5+svn20090706-4) experimental; urgency=low
- * prepare new upload
+ * Use default toolchain setup on ARM flavors for noopt and only add FPU
+ CFLAGS in the VFP and NEON flavors; this is ok since internally, cpu will
+ be set to "generic" but -march=generic or -mcpu=generic will NOT be added
+ to the build flags.
+ * Build all armel flavours with -marm since ffmpeg has a lot of hand crafted
+ assembly which doesn't build in the new lucid default mode (Thumb 2);
+ LP: #488267
+ * Build all armel flavours with -fPIC -DPIC instead of just the neon flavour
+ as the new flags/toolchain require this in Ubuntu lucid.
+ * Build some assembly test code -- just like configure -- to decide whether
+ the *default* toolchain uses vfp or neon to decided whether to build the
+ vfp and neon flavors.
+ * Drop --disable/--enable opt flags such as --disable-neon or
+ --enable-armvfp on ARM since the upstream configure script will do the
+ right thing when the proper flags are set.
- -- Reinhard Tartler <siretart at tauware.de> Fri, 08 Jan 2010 19:51:19 +0100
+ -- Loïc Minier <lool at dooz.org> Wed, 13 Jan 2010 12:57:32 +0100
-ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa2) lucid; urgency=low
+ffmpeg (4:0.5+svn20090706-3) experimental; urgency=low
- * export *all* symbols of libswscale, fixes FTBFS in mplayer
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 23:37:21 +0100
-
-ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa1) lucid; urgency=low
-
- * Imported Debian patch 0.5+svn20090706-2ubuntu4
- * revert gbp.conf to point to lucid branch
- * enable symbol versioning
- * bump shlibs version
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 15:03:09 +0100
-
-ffmpeg (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
-
- * add build dependency on 'yasm', since it is now moved to main.
-
- -- Reinhard Tartler <siretart at tauware.de> Mon, 21 Dec 2009 23:57:34 +0100
-
-ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
-
- * security backports from ffmpeg trunk (Closes: #550442)
- - libavcodec/mpegaudiodec
- - libavcodec/vorbis_dec
- - libavcodec/ffv1
- - libavcodec/vp3
- - libavcodec/h264
- - libavformat/mov
- - libavformat/oggdec
- - libavformat/oggparsevorbis
+ [ Loïc Minier ]
+ * Disable more autodetecter ARM arch features
+ * Enable neon flavour
+ * Update NEON confflags to assume v7 and VFP
+ * Add backported NEON patches from ffmpeg trunk
+ * Pass proper --cpu and --extra-flags on armel
+ * Pass -fPIC -DPIC to neon pass
- -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Nov 2009 20:31:29 +0100
+ [ Fabian Greffrath ]
+ * Initialize the FLAVORS variable to static instead of appending to
+ it. Also, we do not support the internalencoders variable anymore.
-ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
+ [ Andres Mejia ]
+ * Remove unused patches from packaging.
+ * Update Vcs-* entries to new location.
+ * Bump Standards-Version to 3.8.3.
[ Reinhard Tartler ]
- * Make arguments of av_set_pts_info() unsigned.
- * update debian/changelog
- * use patch for issue1245 from git.ffmpeg.org
+ * change shlibs file to make applications depend on the -extra- packages
+ * loosen dependencies further, so that the -dev packages remain
+ installable even if ffmpeg-extra is 'out-of-date'
+ * add patch for issue1245: Make arguments of av_set_pts_info() unsigned.
* Support constant-quant encoding for libtheora, LP: #356322
* increase swscale compile time width (VOF/VOFW), LP: #443264
+ * Backports of various security patches, Closes: #550442, including:
+ - backport fixes for vorbis_dec
+ - backport oggparsevorbis fix
+ - backport vp3 fixes
+ - backport ffv1 fix
+ - libavcodec/mpegaudiodec.c backports
+ - h264 security backports
+ - backported libavformat/mov.c security fixes
+ - backported libavformat/oggdec.c security fixes
+ - backport svn r18016 aka 'MOV-Support-stz2-Compact-Sample-Size-Box'
+ to fix FTBFS
+ * enable symbol versioning
+ * bump shlibs version
+ * add README.source describing how this source package manages patches
+ * make sure the ${misc:Depends} substvar is used for each binary package
- [ Loïc Minier ]
- * Update config for karmic's armel toolchain.
- * Enable neon flavour; LP: #383240.
- * Update NEON confflags to assume v7 and VFP.
- * Add backported NEON patches from ffmpeg trunk; see debian/patches/neon/.
- * Pass proper --cpu and --extra-flags on armel.
- * Pass -fPIC -DPIC to neon pass.
-
- -- Loïc Minier <loic.minier at ubuntu.com> Tue, 13 Oct 2009 23:56:04 +0200
-
-ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
-
- * merge from debian. Remaining changes:
- - disabled output decoders: faad, openjpeg, dirac (all not in main)
- - build arm vfp variant
- - don't build depend on yasm.
- * fix dependencies on -extra packages: LP: #418705, #416348
- * no need to remove mpeg encoders in the ubuntu package, unless we hear
- otherwise from some patent owner. This brings back the mpeg2video
- encoder is available. cf. formats.txt.gz LP: #416585
-
- -- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 11:20:03 +0200
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jan 2010 16:27:40 +0100
ffmpeg (4:0.5+svn20090706-2) unstable; urgency=low
@@@ -63,6 -100,30 +77,6 @@@
-- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 09:12:49 +0200
-ffmpeg (4:0.5+svn20090706-1ubuntu3) karmic; urgency=low
-
- * update the dependencies of the -dev packages for the
- unstripped -> extra renaming
-
- -- Reinhard Tartler <siretart at tauware.de> Tue, 25 Aug 2009 16:37:23 +0200
-
-ffmpeg (4:0.5+svn20090706-1ubuntu2) karmic; urgency=low
-
- * really drop libopenjpeg from build depends.
-
- -- Reinhard Tartler <siretart at tauware.de> Tue, 25 Aug 2009 08:17:17 +0200
-
-ffmpeg (4:0.5+svn20090706-1ubuntu1) karmic; urgency=low
-
- * merge from debian. Remaining changes:
- - don't build-depend on libfaad-dev, disabling faad decoder.
- - build arm vfp variant
- - don't build libopenjpeg support (not in main)
- * change shlibs file to make applications depend on the -extra- packages.
- * don't build depend on yasm.
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Aug 2009 18:18:23 +0200
-
ffmpeg (4:0.5+svn20090706-1) unstable; urgency=low
* preparing new upstream version, 0.5 release branch, rev 19352
@@@ -123,6 -184,31 +137,6 @@@ ffmpeg-debian (4:0.5+svn20090609-2) uns
-- Reinhard Tartler <siretart at tauware.de> Thu, 13 Aug 2009 12:46:46 +0200
-ffmpeg-debian (4:0.5+svn20090609-1ubuntu3) karmic; urgency=low
-
- * do not forcefully enable objenjpeg, it is not avaiable in this build
- anyway
- * don't build against faac in any case, it is deemed non-free
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 25 Jul 2009 09:15:12 +0200
-
-ffmpeg-debian (4:0.5+svn20090609-1ubuntu2) karmic; urgency=low
-
- * remove libopenjpeg-dev from build depends (fixes FTBFS)
- * remove duplicate libxvmc-dev build-dependency
-
- -- Reinhard Tartler <siretart at tauware.de> Fri, 24 Jul 2009 21:53:47 +0200
-
-ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low
-
- * merge from debian. Remaining changes:
- - don't build-depend on libfaad-dev, disabling faad decoder.
- - build arm vfp variant
- * update gbp.conf
- * move gbp.conf to debian/
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 18 Jul 2009 10:55:24 +0200
-
ffmpeg-debian (4:0.5+svn20090609-1) unstable; urgency=low
[ Andres Mejia ]
@@@ -237,6 -323,49 +251,6 @@@ ffmpeg-debian (4:0.5+svn20090420-1) uns
-- Reinhard Tartler <siretart at tauware.de> Sat, 02 May 2009 09:09:54 +0200
-ffmpeg-debian (3:0.svn20090303-1ubuntu6) jaunty; urgency=low
-
- * vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp".
-
- -- Loic Minier <lool at dooz.org> Fri, 10 Apr 2009 21:34:29 +0200
-
-ffmpeg-debian (3:0.svn20090303-1ubuntu5) jaunty; urgency=low
-
- * Disable more autodetected ARM arch features.
- * Add neon and vfp flavors to armel disabled for now.
- * Enable vfp pass on armel; leave the neon disabled.
-
- -- Loïc Minier <lool at dooz.org> Fri, 10 Apr 2009 17:58:52 +0200
-
-ffmpeg-debian (3:0.svn20090303-1ubuntu4) jaunty; urgency=low
-
- * brown paperbag upload. Actually include the patch intended for the
- last upload.
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Mar 2009 14:55:46 +0100
-
-ffmpeg-debian (3:0.svn20090303-1ubuntu3) jaunty; urgency=low
-
- * don't disable ffserver in specialised flavors. Fixes LP: #345370
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Mar 2009 14:52:25 +0100
-
-ffmpeg-debian (3:0.svn20090303-1ubuntu2) jaunty; urgency=low
-
- * No-change rebuild to fix lpia shared library dependencies.
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 19 Mar 2009 17:26:36 +0000
-
-ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low
-
- * FFE granted in LP: #340303.
-
- * merge from debian/unstable.
- * remaining changes to debian:
- - don't build-depend on libfaad-dev, disabling faad decoder.
-
- -- Reinhard Tartler <siretart at tauware.de> Fri, 13 Mar 2009 08:54:33 +0100
-
ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
* New Upstream Version (svn revision 17737 libswscale revision 28799)
@@@ -275,6 -404,13 +289,6 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
-- Reinhard Tartler <siretart at tauware.de> Sun, 22 Feb 2009 09:32:49 +0100
-ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
-
- * merge from debian. Remaining changes:
- - don't build depend on libfaad-dev
-
- -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Feb 2009 21:22:01 +0100
-
ffmpeg-debian (3:0.svn20090204-2) experimental; urgency=low
* add libxvmc-dev to build-depends in the 'ffmpeg' variant
@@@ -325,6 -461,13 +339,6 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 19:54:27 +0100
-ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
-
- * merge from debian. LP: #318501
- * new version fixes CVE-2008-3230, LP: #253767
-
- -- Reinhard Tartler <siretart at tauware.de> Tue, 20 Jan 2009 09:20:53 +0100
-
ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
* New Upstream Version (svn revision 16681 libswscale revision 28341)
@@@ -355,6 -498,16 +369,6 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jan 2009 20:55:48 +0100
-ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
-
- * merge from debian.
- * keep myself in the maintainer field. If you are touching this or the
- 'ffmpeg' package in multiverse, please get in touch with me. Both
- source packages come from the same packaging branch.
- * drop dependency on faad.
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:44:29 +0100
-
ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
* new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
@@@ -364,6 -517,31 +378,6 @@@
-- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 21:37:16 +0100
-ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
-
- * really disable faad support completely.
-
- -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:58:01 +0100
-
-ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
-
- * drop the patch to dlopen faad at runtime for now. it needs more
- polishing, and we can have that functionality easier with the 'ffmpeg'
- source package that will appear in multiverse.
-
- -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:31:47 +0100
-
-ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
-
- * merge from debian.
- * keep myself in the maintainer field. If you are touching this or the
- 'ffmpeg' package in multiverse, please get in touch with me. Both
- source packages come from the same packaging branch.
- * drop dependency on faad.
- * import patches from old packaging to dlopen libfaad at runtime.
-
- -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 07:31:16 +0100
-
ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
* upstream svn snapshot (svn revision 15786, libswscale revision 27900).
diff --combined debian/confflags
index f538514,e5d745e..a79bd13
--- a/debian/confflags
+++ b/debian/confflags
@@@ -1,8 -1,8 +1,8 @@@
# -*- mode: makefile -*-
# vim:syntax=make
-#
+
# build a static version on every architecture in the 'debian' ffmpeg package
-FLAVORS += static
+FLAVORS := static
# shared is generic, i.e. without arch specific opcodes
FLAVORS += shared
@@@ -13,27 -13,46 +13,46 @@@ export DEB_HOST_ARCH ?= $(shell dp
SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN")
+ # this is only used for the check_asm macro
+ ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ CC := gcc
+ else
+ CC := $(DEB_HOST_GNU_TYPE)-gcc
+ endif
+
+ # this outputs 0 or 1 depending on whether a piece of assembly can be compiled
+ # with the *default* gcc flags; this is used to test the toolchain *default*
+ # configuration
+ check_asm = $(shell echo 'void foo(void) { __asm__ volatile("$(1)"); }' | $(CC) -x c -c - -o /dev/null 2>/dev/null && echo 1 || echo 0)
+
# 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; 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)
- nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2
- nooptflags += --disable-armvfp --disable-neon
+ ifeq ($(DEB_HOST_ARCH),armel)
+ # whether the toolchain *default* configuration includes vfp and neon
+ vfp_asm := fadds s0, s0, s0
+ has_vfp := $(call check_asm, $(vfp_asm))
+ neon_asm := vadd.i16 q0, q0, q0
+ has_neon := $(call check_asm, $(neon_asm))
+
+ # only build
+ ifneq ($(has_vfp),1)
+ FLAVORS += vfp
+ endif
+ ifneq ($(has_neon),1)
+ FLAVORS += neon
+ endif
else ifeq ($(DEB_HOST_ARCH),i386)
- FLAVORS += cmov
+ FLAVORS += cmov
else ifeq ($(DEB_HOST_ARCH),powerpc)
- FLAVORS += altivec
- nooptflags += --disable-altivec
+ FLAVORS += altivec
+ nooptflags += --disable-altivec
else ifeq ($(DEB_HOST_ARCH),sparc)
- FLAVORS += vis
- nooptflags += --disable-vis
+ FLAVORS += vis
+ nooptflags += --disable-vis
endif
+ $(info Building FLAVORS=$(FLAVORS))
+
define cond_enable
$(shell test -r $(1) && echo --enable-$(2) )
endef
@@@ -52,17 -71,10 +71,17 @@@ gpl_confflags += --enable-x11gra
# there is no libfaad in ubuntu/main, on in ubuntu/multiverse
gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
-# don't disable encoders if internalencoders is set in DEB_BUILD_OPTIONS
-ifeq (,$(filter internalencoders,$(DEB_BUILD_OPTIONS)))
+# "forbidden" encoders, see README.Debian for details
+disable_encoders += --disable-encoder=h263
+disable_encoders += --disable-encoder=h263p
+disable_encoders += --disable-encoder=mpeg2video
+disable_encoders += --disable-encoder=mpeg4
+disable_encoders += --disable-encoder=msmpeg4v1
+disable_encoders += --disable-encoder=msmpeg4v2
+disable_encoders += --disable-encoder=msmpeg4v3
+
+# Comment out the following line to *not* disable the above encoders
confflags += $(disable_encoders)
-endif
# Common configuration flags
confflags += --extra-version='$(DEB_VERSION)'
@@@ -71,9 -83,7 +90,9 @@@ confflags += --enable-avfilte
confflags += --enable-avfilter-lavf
confflags += --enable-vdpau
confflags += --enable-bzlib
+confflags += --enable-libdirac
confflags += --enable-libgsm
+confflags += --enable-libopenjpeg
confflags += --enable-libschroedinger
confflags += --enable-libspeex
confflags += --enable-libtheora
@@@ -82,6 -92,11 +101,11 @@@ confflags += --enable-pthread
confflags += --enable-zlib
confflags += --disable-stripping
confflags += --disable-vhook
+ ifeq ($(DEB_HOST_ARCH),armel)
+ # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
+ # plenty of incompatible assembly; not sure how to detect that properly
+ confflags += --extra-cflags="-marm -fPIC -DPIC"
+ endif
confflags += $(extra_common_confflags)
# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
@@@ -105,6 -120,9 +129,6 @@@ ifneq (,$(findstring linux,$(DEB_HOST_G
lib1394-dev += libraw1394-dev, libdc1394-22-dev
endif
-# We add vdpau headers ourselves so ffmpeg can stay in main
-confflags += --extra-cflags="-I$(CURDIR)/debian/include"
-
# XXX this probably needs fixing
CFLAGS :=
@@@ -131,7 -149,6 +155,6 @@@ shared_build_confflags += --disable-sta
# 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"
@@@ -140,7 -157,6 +163,6 @@@ vfp_build_confflags += --disable-ffpla
# 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 += --cpu=armv7-a
neon_build_confflags += --extra-cflags="-mfpu=neon -mfloat-abi=softfp -fPIC -DPIC"
neon_build_confflags += --enable-shared
neon_build_confflags += --disable-static
@@@ -165,6 -181,7 +187,6 @@@ altivec_build_confflags += --shlibdir=/
altivec_build_confflags += --cpu='g4'
altivec_build_confflags += --enable-shared
altivec_build_confflags += --disable-static
-altivec_build_confflags += --extra-cflags="-fPIC -DPIC"
altivec_build_confflags += --enable-altivec
altivec_build_confflags += --disable-ffmpeg
altivec_build_confflags += --disable-ffplay
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list