[SCM] ffmpeg/ubuntu: Merge commit 'debian/4%0.7.1-7' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Sep 27 20:18:59 UTC 2011
update debian/changelog
prefer libtiff4 over libtiff5 for now
drop debian/patches/03-fix-movrel.patch, better patch upstream
add additional 0.7 patches
Convert package to include multiarch support.
update debian/changelog
Fix segmentation fault on ppc32, Closes: #639948
sync patches with upstream release branch
upload to unstable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: a0c6659fcf20bd322bbe2a4ac9c4ad96827100ec
X-Git-Newrev: 89b0f86eb965351896fdf5271314a7574597eeda
The following commit has been merged in the ubuntu branch:
commit 89b0f86eb965351896fdf5271314a7574597eeda
Merge: a0c6659fcf20bd322bbe2a4ac9c4ad96827100ec e69a88ba4da3ae307f8c87a636db6c47fa90c91f
Author: Reinhard Tartler <siretart at tauware.de>
Date: Tue Sep 27 22:07:03 2011 +0200
Merge commit 'debian/4%0.7.1-7' into ubuntu
Conflicts:
debian/changelog
diff --combined debian/changelog
index cd34299,4cdfcd3..e72ecf4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,32 +1,51 @@@
++libav (4:0.7.1-7ubuntu1) oneiric; urgency=medium
++
++ * Merge from debian/unstable
++ - don't build against libfaad, libdirac, librtmp and libopenjpeg,
++ lame, xvid, x264 (all in universe)
++ - Introduces Security fix for CVE-2011-3362
++ - Fixes LP: #835903
++
++ -- Reinhard Tartler <siretart at tauware.de> Tue, 27 Sep 2011 22:05:55 +0200
++
+ libav (4:0.7.1-7) unstable; urgency=medium
+
+ * Add 63 (!) additional post 0.7.1 patches
+ - all scheduled for next upstream point release
+ - Fix missing CAVS boundary checks, Closes: #641478, Fixes: CVE-2011-3362
+ * Medium urgency for fixing a security issue
+ * Drop debian/patches/03-fix-movrel.patch, better patch upstream
+ * prefer libtiff4 over libtiff5 for now
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 26 Sep 2011 22:24:47 +0200
+
+ libav (4:0.7.1-6) unstable; urgency=low
+
+ * Convert package to include multiarch support.
+
+ -- Andres Mejia <amejia at debian.org> Fri, 23 Sep 2011 22:03:39 -0400
+
+ libav (4:0.7.1-5) unstable; urgency=low
+
+ * sync patches with upstream release branch
+ * Fix segmentation fault on ppc32, Closes: #639948
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 05 Sep 2011 07:25:06 +0200
+
+ libav (4:0.7.1-4) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 01 Sep 2011 22:45:43 +0200
++
+libav (4:0.7.1-3ubuntu1) oneiric; urgency=low
+
+ * Merge from debian/unstable
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg,
+ lame, xvid, x264 (all in universe)
+ * Drop extra conflicts on libswscale-extra-1
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 26 Aug 2011 11:12:43 +0200
libav (4:0.7.1-3) experimental; urgency=low
@@@ -27,28 -48,6 +67,28 @@@ libav (4:0.7.1-2) experimental; urgency
-- Reinhard Tartler <siretart at tauware.de> Tue, 26 Jul 2011 21:58:18 +0200
+libav (4:0.7.1-1ubuntu3) oneiric; urgency=low
+
+ * libswscale-dev: fix alternate on libswscale-extra-2, Fixes LP: #829857
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 20 Aug 2011 19:29:21 +0200
+
+libav (4:0.7.1-1ubuntu2) oneiric; urgency=low
+
+ * relax dependencies in the shlibs file to accomodate the new versioning
+ scheme in libav-extra. Fixes LP: #818619
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 01 Aug 2011 13:16:59 +0200
+
+libav (4:0.7.1-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian/unstable
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+ - Extra conflicts on libswscale-extra-1 (can be dropped after natty release)
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 21 Jul 2011 21:12:27 +0200
+
libav (4:0.7.1-1) experimental; urgency=low
[ Andres Mejia ]
@@@ -76,20 -75,6 +116,20 @@@ libav (4:0.7-2) experimental; urgency=l
-- Reinhard Tartler <siretart at tauware.de> Sat, 16 Jul 2011 14:38:21 +0200
+libav (4:0.7-1ubuntu2) oneiric; urgency=low
+
+ * Conflicts/Replaces against broken libswscale-extra-1 package, LP: #804452
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jul 2011 15:29:06 +0200
+
+libav (4:0.7-1ubuntu1) oneiric; 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> Wed, 22 Jun 2011 10:47:22 +0200
+
libav (4:0.7-1) experimental; urgency=low
* New upstream release.
@@@ -102,14 -87,6 +142,14 @@@
-- Reinhard Tartler <siretart at tauware.de> Tue, 21 Jun 2011 07:49:59 +0200
+libav (4:0.7~rc1-1ubuntu1) oneiric; 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> Sat, 18 Jun 2011 15:43:30 +0200
+
libav (4:0.7~rc1-1) experimental; urgency=low
* New upstream version
@@@ -119,14 -96,6 +159,14 @@@
-- Reinhard Tartler <siretart at tauware.de> Tue, 14 Jun 2011 22:03:36 +0200
+libav (4:0.7~beta2-2ubuntu1) oneiric; 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, 27 May 2011 19:27:07 +0200
+
libav (4:0.7~beta2-2) experimental; urgency=low
* refresh patches
@@@ -159,20 -128,6 +199,20 @@@ libav (4:0.7~b1-2) experimental; urgenc
-- Reinhard Tartler <siretart at tauware.de> Sun, 01 May 2011 18:58:40 +0200
+libav (4:0.7~b1-1ubuntu1) oneiric; 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
+ * Cherry-picked from git:
+ - install doc/APIChanges and refer to them in NEWS.Debian (Closes: #623682)
+ - don't try to install non-existing documentation, fixes FTBFS on powerpc
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 30 Apr 2011 14:27:42 +0200
+
libav (4:0.7~b1-1) experimental; urgency=low
* New upstream version
@@@ -186,17 -141,6 +226,17 @@@
-- 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 ]
@@@ -215,25 -159,6 +255,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
@@@ -262,13 -187,6 +302,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 ]
@@@ -282,15 -200,6 +322,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
@@@ -300,44 -209,6 +340,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 ]
@@@ -363,18 -234,6 +403,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
@@@ -384,21 -243,6 +424,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
@@@ -493,14 -337,6 +533,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:
@@@ -531,25 -367,6 +571,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
@@@ -576,7 -393,10 +616,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
@@@ -621,73 -441,6 +661,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
@@@ -704,30 -457,6 +744,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
@@@ -788,31 -517,6 +828,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 ]
@@@ -927,49 -631,6 +967,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)
@@@ -1008,13 -669,6 +1048,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
@@@ -1065,13 -719,6 +1105,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)
@@@ -1102,16 -749,6 +1142,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)
@@@ -1121,31 -758,6 +1161,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/control
index 3b9661d,811652e..4a7c23e
--- 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>,
@@@ -15,26 -14,33 +15,27 @@@ Vcs-Git: git://git.debian.org/git/pkg-m
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),
+ Build-Depends: debhelper (>= 8.1.3~),
libasound2-dev [linux-any],
libbz2-dev,
libdc1394-22-dev [linux-any],
- libdirac-dev,
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
libjack-dev [!hurd-i386],
- libmp3lame-dev,
- libopenjpeg-dev,
libraw1394-dev [linux-any],
- librtmp-dev (>= 2.2e-4),
libschroedinger-dev,
libsdl1.2-dev,
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
+ libtiff4-dev | libtiff-dev,
libva-dev [!hurd-i386],
libvdpau-dev,
libvorbis-dev,
libvpx-dev,
libx11-dev,
- libx264-dev,
libxext-dev,
libxfixes-dev,
- libxvidcore-dev,
libxvmc-dev,
texi2html,
yasm,
@@@ -124,6 -130,8 +125,8 @@@ Description: Documentation of the Liba
Package: libavutil51
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav utility library
@@@ -132,6 -140,8 +135,8 @@@
Package: libavcodec53
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav codec library
@@@ -141,6 -151,8 +146,8 @@@
Package: libavdevice53
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav device handling library
@@@ -148,6 -160,8 +155,8 @@@
Package: libavformat53
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav file format library
@@@ -158,6 -172,8 +167,8 @@@
Package: libavfilter2
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav video filtering library
@@@ -165,6 -181,8 +176,8 @@@
Package: libpostproc52
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav video postprocessing library
@@@ -172,6 -190,8 +185,8 @@@
Package: libswscale2
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Libav video scaling library
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list