[SCM] FFmpeg packaging branch, ubuntu.karmic, updated. debian/0.5+svn20090706-1ubuntu2-2-g48d1a40
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Aug 25 14:46:10 UTC 2009
The following commit has been merged in the ubuntu.karmic branch:
commit ada0e33246f98adcc03f68da2747ee0645cff17f
Merge: 31fac7e231646de1e79537fdcec278800ccef419 cd842cb7cb542c03a071fbd69b4d7cc190a387b2
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Aug 15 18:17:29 2009 +0200
Merge branch 'master' into ubuntu.karmic
note: this merge renames the source package back to 'ffmpeg'
diff --combined debian/changelog
index 9c1a6fe,c515e34..f34dc88
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,23 +1,23 @@@
+ ffmpeg (4:0.5+svn20090706-1) unstable; urgency=low
+
+ * preparing new upstream version, 0.5 release branch, rev 19352
+ - this version is capable of compiling swscale in LGPL mode
+ * rename source package back
+ - The replacement package with the 'missing bits' will be called
+ 'ffmpeg-extra'
+ - simplify README.upstream-upgrade
+ - rename the source package from 'ffmpeg-debian' -> 'ffmpeg'
+ * fix aac playback regression, thanks to Matthew Wakeling for reporting
+ (Closes: #540729)
+ * fix seeking in DIF (DV) movies
+ Thanks to Dan Dennedy for identifying the patch! (Closes: #540424)
+ * debian/rules:
+ - merge cond_enable_nf macro from master.extra branch
+ - don't disable ffserver in various optimized variants
+ - don't disable building of statically linked helper binaries
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 13 Aug 2009 12:48:27 +0200
+
ffmpeg-debian (4:0.5+svn20090609-2) unstable; urgency=low
[ Fabian Greffrath ]
@@@ -34,33 -54,8 +54,33 @@@
* remove section numbering from README.Debian
* add note about the lintian override
- -- Andres Mejia <mcitadel at gmail.com> Mon, 06 Jul 2009 13:04:17 -0400
+ -- 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 ]
@@@ -175,49 -170,6 +195,49 @@@ 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)
@@@ -256,13 -208,6 +276,13 @@@ 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
@@@ -313,13 -258,6 +333,13 @@@ 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)
@@@ -350,16 -288,6 +370,16 @@@ 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)
@@@ -369,31 -297,6 +389,31 @@@
-- 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 2f4af82,7de3377..85d91d4
--- a/debian/confflags
+++ b/debian/confflags
@@@ -22,9 -22,8 +22,9 @@@ SVNREVISION=$(shell cat .svnrevision 2>
ifeq ($(DEB_HOST_ARCH),armel)
nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2
nooptflags += --disable-armvfp --disable-neon
-# disabled for now as we need hwcaps support in glibc first
-#FLAVORS += neon 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
@@@ -42,6 -41,11 +42,11 @@@ define cond_enabl
$(shell test -r $(1) && echo --enable-$(2) )
endef
+ # variant that also require --enable-nonfree
+ define cond_enable_nf
+ $(shell test -r $(1) && echo --enable-$(2) --enable-nonfree )
+ endef
+
# Configuration flags causing the libs to be GPL tainted
gpl_confflags += --enable-gpl
gpl_confflags += --enable-postproc
@@@ -74,6 -78,7 +79,6 @@@ confflags += --enable-vdpa
confflags += --enable-bzlib
# confflags += --enable-libdirac # Waiting for libdirac to enter Debian
confflags += --enable-libgsm
-confflags += --enable-libopenjpeg
confflags += --enable-libschroedinger
confflags += --enable-libspeex
confflags += --enable-libtheora
@@@ -86,9 -91,15 +91,16 @@@ confflags += $(extra_common_confflags
# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
+confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
+ confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
+ confflags += $(call cond_enable_nf,/usr/include/amrnb/sp_dec.h,libamr-nb)
+ confflags += $(call cond_enable_nf,/usr/include/amrwb/dec.h,libamr-wb)
+
+ # AAC is considered non-free upstream
+ confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
+
# comment out following line for LGPL versions of the libraries
confflags += $(gpl_confflags)
@@@ -113,9 -124,6 +125,6 @@@ endi
# Configuration flags for the static libraries
static_build_confflags += $(confflags)
- static_build_confflags += --disable-ffmpeg
- static_build_confflags += --disable-ffserver
- static_build_confflags += --disable-ffplay
# Configuration flags for the non-optimized shared libraries
shared_build_confflags += $(confflags)
diff --combined debian/control
index b6bc4c0,296afcd..58dd7af
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
- Source: ffmpeg-debian
+ Source: ffmpeg
Section: libs
Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
Loic Minier <lool at dooz.org>,
Reinhard Tartler <siretart at tauware.de>,
@@@ -18,6 -17,7 +18,6 @@@ Build-Depends: debhelper (>= 7)
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libbz2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libfaad-dev | libfaad2-dev,
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list