[SCM] ffmpeg/ubuntu: Merge from debian/experimental
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun May 1 18:36:38 UTC 2011
install doc/APIChanges and refer to them in NEWS.Debian (Closes: #623682)
add NEWS.Debian file
don't try to install non-existing documentation, fixes FTBFS on powerpc
enable yasm on architecture that have it installed
start new upload
update debian/changelog
also update the *contents* of the lintian overrides
libfaad wrapper has been removed upstream
drop avfilter confflags, it is enable by default in 0.7
remove patch disable-configuration-warning.patch
the MAINTAINERS file was removed upstream
configure flags --disable-stripping was removed upstream
bump SONAME and SHLIBS
update debian/changelog
Imported Upstream version 4:0.7~b1
Disable warning about library configuration mismatch
update upstream site to libav
Add libjack-dev to Build-Depends.
compile with "-marm -fPIC -DPIC" on armel
reenable AAC codec on ia64
exclude more cruft from libav-source tarball
syncronize configuration flags with Ubuntu
prepare new upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: bd2815f59fff8d77a4f9db0f8930371cca07bd51
X-Git-Newrev: 9467e814bd64404cafb6646dac5e991cd2a43529
The following commit has been merged in the ubuntu branch:
commit 5d35e4053cda311718ef89e06e8a06280868235f
Merge: f0b9818e6da91f217086dbb465d852a5fa9de909 f7e12b45758c6bc7811bc2dd283e5ceb95470672
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Apr 30 12:10:33 2011 +0200
Merge from debian/experimental
diff --combined debian/changelog
index a9c3b93,2f3b76f..d8ce041
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,22 +1,38 @@@
-libav (4:0.7~b1-2) UNRELEASED; urgency=low
++libav (4:0.7~b1-1ubuntu1) UNRELEASED; urgency=low
+
- * start new upload
++ * Merge from debian. Remaining changes:
++ - don't build against libfaad, libdirac, librtmp and libopenjpeg
++ (all in universe)
++ - explicitly --enable-pic on powerpc, cf. LP #654666
++ - different arm configure bits that should probably better be
++ merged into debian
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 20 Apr 2011 14:46:47 +0200
+
+ libav (4:0.7~b1-1) experimental; urgency=low
+
+ * New upstream version
+ * bump SONAME and SHLIBS
+ * configure flags --disable-stripping was removed upstream
+ * the MAINTAINERS file was removed upstream
+ * remove patch disable-configuration-warning.patch
+ * drop avfilter confflags, it is enable by default in 0.7
+ * libfaad wrapper has been removed upstream
+ * also update the *contents* of the lintian overrides
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 19 Apr 2011 15:04:55 +0200
+
+libav (4:0.6.2-1ubuntu1) natty; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+ - explicitly --enable-pic on powerpc, cf. LP #654666
+ - different arm configure bits that should probably better be
+ merged into debian
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 20 Mar 2011 12:09:31 +0100
+
libav (4:0.6.2-1) unstable; urgency=medium
[ Reinhard Tartler ]
@@@ -27,25 -35,6 +51,25 @@@
-- Reinhard Tartler <siretart at tauware.de> Sat, 19 Mar 2011 08:13:46 +0100
+ffmpeg (4:0.6.1-5ubuntu2) natty; urgency=low
+
+ * Replace cp with tar to avoid an error of
+ "/bin/cp: Argument list too long" on the ARM platform
+ (running under a QEMU chroot environment) (LP: #734331)
+ - Check on a Ubuntu "pbuilder" environment on Ubuntu 10.10/maverick x86
+ - Restore a "Doxygen" file that excidentaly got into the changeset of the bug
+
+ -- Gal Shalif <gal at shalif.com> Mon, 14 Mar 2011 13:47:24 +0200
+
+ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+ - explicitly --enable-pic on powerpc, cf. LP #654666
+ - different arm configure bits that should probably better be merged into debian
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 13 Feb 2011 20:04:06 +0100
+
ffmpeg (4:0.6.1-5) unstable; urgency=low
* don't enable vaapi support on the hurd, Closes: #613034
@@@ -74,13 -63,6 +98,13 @@@ ffmpeg (4:0.6.1-3) unstable; urgency=lo
-- Reinhard Tartler <siretart at tauware.de> Sun, 30 Jan 2011 09:22:11 +0100
+ffmpeg (4:0.6.1-2ubuntu1) natty; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 19 Nov 2010 12:05:43 +0100
+
ffmpeg (4:0.6.1-2) experimental; urgency=low
[ Jonas Smedegaard ]
@@@ -94,15 -76,6 +118,15 @@@
-- Reinhard Tartler <siretart at tauware.de> Fri, 19 Nov 2010 10:50:51 +0100
+ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+ - explicitly --enable-pic on powerpc, cf. LP: #654666
+ * remove fix-CVE-2010-3429.patch, applied upstream
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 14 Nov 2010 12:19:50 +0100
+
ffmpeg (4:0.6.1-1) experimental; urgency=low
* Imported Upstream version 0.6.1
@@@ -112,44 -85,6 +136,44 @@@
-- Reinhard Tartler <siretart at tauware.de> Mon, 01 Nov 2010 09:18:08 +0100
+ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low
+
+ * fix dependency on libswscale-extra-0, LP: #637895
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 05 Oct 2010 21:25:53 +0200
+
+ffmpeg (4:0.6-2ubuntu5) maverick; urgency=low
+
+ * Add flic video patch. Fixes CVE-2010-3429
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 05 Oct 2010 21:11:41 +0200
+
+ffmpeg (4:0.6-2ubuntu4) maverick; urgency=low
+
+ * Configure with --enable-pic on powerpc. LP: #654666.
+
+ -- Matthias Klose <doko at ubuntu.com> Mon, 04 Oct 2010 19:39:46 +0200
+
+ffmpeg (4:0.6-2ubuntu3) maverick; urgency=low
+
+ * add libxfixes-dev to build-depends, LP: #631103
+
+ -- Dominic Evans <oldmanuk at gmail.com> Fri, 10 Sep 2010 14:21:23 +0100
+
+ffmpeg (4:0.6-2ubuntu2) maverick; urgency=low
+
+ * weaken the dependencies for the -extra package
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jul 2010 20:38:27 -0400
+
+ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
+
+ * merge from debian/experimental. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jul 2010 11:00:54 -0400
+
ffmpeg (4:0.6-2) experimental; urgency=low
[ Fabian Greffrath ]
@@@ -175,18 -110,6 +199,18 @@@
-- Reinhard Tartler <siretart at tauware.de> Tue, 29 Jun 2010 09:07:56 +0200
+ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low
+
+ * merge from debian/experimental. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac and libopenjpeg (all in universe)
+ * new upstream release
+ - internal vorbis encoder is disabled. LP: #585330
+ - includes native AMR-NB decoder, LP: #93849
+ - api-example is fixed: LP: #557319
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 16 Jun 2010 12:53:24 +0200
+
ffmpeg (4:0.6-1) experimental; urgency=low
* new upstream release
@@@ -196,21 -119,6 +220,21 @@@
-- Reinhard Tartler <siretart at tauware.de> Wed, 16 Jun 2010 09:25:28 +0200
+ffmpeg (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
+
+ * add proper replaces, fixes: LP: #587369
+ * fix typo in dependency on libavfilter-extra-1. LP: #587431
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 11:33:32 +0200
+
+ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
+
+ * merge from debian/experimental. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 May 2010 00:01:17 +0200
+
ffmpeg (4:0.6~svn20100505-1) experimental; urgency=low
* update to new upstream. Closes: #569727
@@@ -305,14 -213,6 +329,14 @@@ ffmpeg (4:0.5.1-2) unstable; urgency=lo
-- Reinhard Tartler <siretart at tauware.de> Wed, 10 Mar 2010 21:19:40 +0100
+ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
+
+ * merge from debian. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 04 Mar 2010 10:34:37 +0100
+
ffmpeg (4:0.5.1-1) unstable; urgency=low
* new upstream release:
@@@ -343,25 -243,6 +367,25 @@@ ffmpeg (4:0.5+svn20090706-6) unstable;
-- Reinhard Tartler <siretart at tauware.de> Sun, 31 Jan 2010 16:53:47 +0100
+ffmpeg (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
+
+ * tighten build dependency on new x264 package
+ * add x264 backport for ffmpeg 0.5
+ * install presets in 'libavcodec package' instead of 'ffmpeg' binary,
+ see git history for rationale of this change
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 17 Feb 2010 08:37:17 +0100
+
+ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
+
+ * merge from debian, remaining changes:
+ - dont disable internal encoders
+ - disabled extra depedencies (come with ffmpeg-extra)
+ - libdirac
+ - libopenjpeg
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 16 Jan 2010 10:12:15 +0100
+
ffmpeg (4:0.5+svn20090706-5) unstable; urgency=medium
* Upload to unstable
@@@ -388,7 -269,10 +412,7 @@@ ffmpeg (4:0.5+svn20090706-4) experiment
--enable-armvfp on ARM since the upstream configure script will do the
right thing when the proper flags are set.
- [ Reinhard Tartler ]
- * build with PIC on powerpc (Closes: #561956)
-
- -- Reinhard Tartler <siretart at tauware.de> Fri, 15 Jan 2010 21:46:49 +0100
+ -- Loïc Minier <lool at dooz.org> Wed, 13 Jan 2010 12:57:32 +0100
ffmpeg (4:0.5+svn20090706-3) experimental; urgency=low
@@@ -433,73 -317,6 +457,73 @@@
* make sure the ${misc:Depends} substvar is used for each binary package
-- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jan 2010 16:27:40 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa2) lucid; 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
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Nov 2009 20:31:29 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
+
+ [ Reinhard Tartler ]
+ * Make arguments of av_set_pts_info() unsigned.
+ * update debian/changelog
+ * use patch for issue1245 from git.ffmpeg.org
+ * Support constant-quant encoding for libtheora, LP: #356322
+ * increase swscale compile time width (VOF/VOFW), LP: #443264
+
+ [ 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
ffmpeg (4:0.5+svn20090706-2) unstable; urgency=low
@@@ -516,30 -333,6 +540,30 @@@
-- 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
@@@ -600,31 -393,6 +624,31 @@@ 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 ]
@@@ -739,49 -507,6 +763,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)
@@@ -820,13 -545,6 +844,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
@@@ -877,13 -595,6 +901,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)
@@@ -914,16 -625,6 +938,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)
@@@ -933,31 -634,6 +957,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 6d14723,0782428..59d02ec
--- a/debian/confflags
+++ b/debian/confflags
@@@ -91,14 -91,9 +91,12 @@@ gpl_confflags += --enable-postpro
gpl_confflags += --enable-swscale
gpl_confflags += --enable-x11grab
+# there is no libfaad in ubuntu/main, on in ubuntu/multiverse
+gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
+
# Common configuration flags
confflags += --extra-version='$(DEB_VERSION)'
confflags += --prefix=/usr
- confflags += --enable-avfilter
- confflags += --enable-avfilter-lavf
confflags += --enable-vdpau
confflags += --enable-bzlib
confflags += --enable-libgsm
@@@ -109,7 -104,6 +107,6 @@@ confflags += --enable-libvorbi
confflags += --enable-pthreads
confflags += --enable-zlib
confflags += --enable-libvpx
- confflags += --disable-stripping
confflags += --enable-runtime-cpudetect
ifeq ($(DEB_HOST_ARCH),armel)
# this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
@@@ -128,7 -122,6 +125,6 @@@ confflags += $(call cond_enable,/usr/in
# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
- gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
@@@ -232,9 -225,3 +228,3 @@@ vis_build_confflags += --disable-stati
vis_build_confflags += --extra-cflags="-fPIC -DPIC"
vis_build_confflags += --disable-ffmpeg
vis_build_confflags += --disable-ffplay
-
- # Additional documentation for PowerPC
- ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
- extradoc := doc/ffmpeg_powerpc_performance_evaluation_howto.txt
- endif
-
diff --combined debian/control
index cdc2e60,14d1871..edd1908
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
Source: libav
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>,
@@@ -11,18 -10,22 +11,19 @@@
Jonas Smedegaard <dr at jones.dk>
DM-Upload-Allowed: yes
Standards-Version: 3.9.1
- Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
- Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
- Homepage: http://ffmpeg.org/
+ Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
+ Homepage: http://libav.org/
Build-Depends-Indep: doxygen
Build-Depends: debhelper (>= 7),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libbz2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
+ libjack-dev,
- libopenjpeg-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- librtmp-dev (>= 2.2e-4),
libschroedinger-dev,
libsdl1.2-dev,
libspeex-dev,
@@@ -37,14 -40,14 +38,14 @@@
libxvmc-dev,
quilt,
texi2html,
- yasm [i386 amd64],
+ yasm [amd64 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 sparc powerpc],
zlib1g-dev
Package: ffmpeg
Section: video
Architecture: any
- Replaces: libavcodec52 (<< ${source:Version}),
- libavcodec-extra-52 (<< 4:0.6~)
+ Replaces: libavcodec53 (<< ${source:Version}),
+ libavcodec-extra-53 (<< 4:0.6~)
Depends: ${shlibs:Depends},
${misc:Depends}
Conflicts: ffprobe
@@@ -74,12 -77,12 +75,12 @@@ Package: libav-db
Section: debug
Priority: extra
Architecture: any
- Depends: libavutil50 (= ${binary:Version}),
- libavcodec52 (= ${binary:Version}),
- libavdevice52 (= ${binary:Version}),
- libpostproc51 (= ${binary:Version}),
- libavformat52 (= ${binary:Version}),
- libswscale0 (= ${binary:Version}),
+ Depends: libavutil51 (= ${binary:Version}),
+ libavcodec53 (= ${binary:Version}),
+ libavdevice53 (= ${binary:Version}),
+ libpostproc52 (= ${binary:Version}),
+ libavformat53 (= ${binary:Version}),
+ libswscale1 (= ${binary:Version}),
ffmpeg (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for Libav related packages
@@@ -121,7 -124,7 +122,7 @@@ Description: Documentation of the Liba
.
Only application developers will find this package useful.
- Package: libavutil50
+ Package: libavutil51
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@@ -129,61 -132,58 +130,58 @@@ Description: Libav utility librar
This is the common utility library from Libav. It contains shared code
used by all other ffmpeg libraries.
- Package: libavcodec52
+ Package: libavcodec53
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Breaks: libavcodec51 (<< 3:0.svn20090303-1)
Description: Libav codec library
This is the codec library from Libav (both encoding and decoding).
.
It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
- Package: libavdevice52
+ Package: libavdevice53
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav device handling library
This is the device handling library from Libav.
- Package: libavformat52
+ Package: libavformat53
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~)
Description: Libav file format library
This is the library for handling file formats from Libav.
.
It supports most existing file formats (AVI, MPEG, OGG, Matroska,
ASF...).
- Package: libavfilter1
+ Package: libavfilter2
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav video filtering library
This is the video filtering library from Libav.
- Package: libpostproc51
+ Package: libpostproc52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav video postprocessing library
This is the video postprocessing library from Libav.
- Package: libswscale0
+ Package: libswscale1
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~)
Description: Libav video scaling library
This is the video software scaling library from Libav.
Package: libavutil-dev
Section: libdevel
Architecture: any
- Depends: libavutil50 (>= ${binary:Version}) | libavutil-extra-50 (>= ${source:Upstream-Version}),
- libavutil50 (<= ${source:Upstream-Version}-99) | libavutil-extra-50 (<= ${source:Upstream-Version}-99),
+ Depends: libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
+ libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}-99),
${misc:Depends}
Description: Development files for libavutil
This is the common utility library from Libav.
@@@ -194,8 -194,8 +192,8 @@@
Package: libavcodec-dev
Section: libdevel
Architecture: any
- Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-extra-52 (>= ${source:Upstream-Version}),
- libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-extra-52 (<= ${source:Upstream-Version}-99),
+ Depends: libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
+ libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Suggests: libfaad-dev,
@@@ -219,8 -219,8 +217,8 @@@ Description: Development files for liba
Package: libavdevice-dev
Section: libdevel
Architecture: any
- Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-extra-52 (>= ${source:Upstream-Version}),
- libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-extra-52 (<= ${source:Upstream-Version}-99),
+ Depends: libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
+ libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}-99),
libavformat-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavdevice
@@@ -232,8 -232,8 +230,8 @@@
Package: libavformat-dev
Section: libdevel
Architecture: any
- Depends: libavformat52 (>= ${binary:Version}) | libavformat-extra-52 (>= ${source:Upstream-Version}),
- libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-extra-52 (<= ${source:Upstream-Version}-99),
+ Depends: libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
+ libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}-99),
libavcodec-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavformat
@@@ -246,8 -246,8 +244,8 @@@
Package: libavfilter-dev
Section: libdevel
Architecture: any
- Depends: libavfilter1 (>= ${binary:Version}) | libavfilter-extra-1 (>= ${source:Upstream-Version}),
- libavfilter1 (<= ${source:Upstream-Version}-99) | libavfilter-extra-1 (<= ${source:Upstream-Version}-99),
+ Depends: libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
+ libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}-99),
libavcodec-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavfilter
@@@ -259,8 -259,8 +257,8 @@@
Package: libpostproc-dev
Section: libdevel
Architecture: any
- Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-extra-51 (>= ${source:Upstream-Version}),
- libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-extra-51 (<= ${source:Upstream-Version}-99),
+ Depends: libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
+ libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}-99),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libpostproc
@@@ -272,8 -272,8 +270,8 @@@
Package: libswscale-dev
Section: libdevel
Architecture: any
- Depends: libswscale0 (>= ${binary:Version}) | libswscale-extra-0 (>= ${source:Upstream-Version}),
- libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-0 (<= ${source:Upstream-Version}-99),
+ Depends: libswscale1 (>= ${binary:Version}) | libswscale-extra-1 (>= ${source:Upstream-Version}),
+ libswscale1 (<= ${source:Upstream-Version}-99) | libswscale-extra-1 (<= ${source:Upstream-Version}-99),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libswscale
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list