[SCM] ffmpeg/ubuntu: Merge branch 'master' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Mon Dec 26 11:48:02 UTC 2011
update debian/changelog
forcefully disable v4l on kfreebsd
finalize upload
Bump shlibs for backported avcodec_open2() API
update version number
Merge commit 'upstream/0.7.3'
Imported Upstream version 0.7.3
Enable drawtext filter (Closes: #647132)
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: 136d6c2e4c8b30e4507b1938af142d56812986de
X-Git-Newrev: 1119e812574d444025a76e1b69843bbdb0473921
The following commit has been merged in the ubuntu branch:
commit 7eca4684fabcf34c8bf114a76cf7d2c1e3b416e2
Merge: 136d6c2e4c8b30e4507b1938af142d56812986de 6bebc77e873eb5588f779d64e1e9423aec65c611
Author: Reinhard Tartler <siretart at tauware.de>
Date: Mon Dec 26 11:54:31 2011 +0100
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
diff --combined debian/changelog
index 4652d0f,79da5c8..68ad56e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,24 +1,36 @@@
+ libav (4:0.7.3-2) unstable; urgency=low
+
+ * forcefully disable v4l on kfreebsd, fixes an FTBFS on kFreeBSD
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 26 Dec 2011 10:50:36 +0100
+
+ libav (4:0.7.3-1) unstable; urgency=high
+
+ * New upstream version. Includes fixes for:
+ - VP3 decoder (CVE-2011-4352)
+ - svq1 decoder (CVE-2011-4579)
+ - DoS in the VP5/VP6 decoders (CVE-2011-4353)
+ - QDM2 decoder (CVE-2011-4351)
+ - Sierra VMD decoder (CVE-2011-4364)
+ * Bumped urgency.
+ * Enable drawtext filter (Closes: #647132)
+ * Imported Upstream version 0.7.3
+ * Bump shlibs for backported avcodec_open2() API
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 25 Dec 2011 22:04:54 +0100
+
+libav (4:0.7.2-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg,
+ lame, xvid, x264 (all in universe)
+ - not installing into multiarch directories
+ * This new upstream release has basically merged in all 70 patches that
+ are present in 4:0.7.1-7ubuntu2, plus some additional, similarily
+ focused ones.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 01 Oct 2011 00:22:07 +0200
+
libav (4:0.7.2-1) unstable; urgency=low
* New upstream release: 0.7.2
@@@ -19,24 -28,6 +40,24 @@@
-- Reinhard Tartler <siretart at tauware.de> Fri, 30 Sep 2011 21:01:25 +0200
+libav (4:0.7.1-7ubuntu2) oneiric; urgency=low
+
+ * Revert "Convert package to include multiarch support."
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 28 Sep 2011 09:18:34 +0200
+
+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
+ * post-0.7.1/0070-Fix-memory-re-allocation-in-matroskadec.c-related-to.patch:
+ - fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080
+
+ -- 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
@@@ -66,15 -57,6 +87,15 @@@ libav (4:0.7.1-4) unstable; urgency=lo
* 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
@@@ -96,28 -78,6 +117,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 ]
@@@ -145,20 -105,6 +166,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.
@@@ -171,14 -117,6 +192,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
@@@ -188,14 -126,6 +209,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
@@@ -228,20 -158,6 +249,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
@@@ -255,17 -171,6 +276,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 ]
@@@ -284,25 -189,6 +305,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
@@@ -331,13 -217,6 +352,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 ]
@@@ -351,15 -230,6 +372,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
@@@ -369,44 -239,6 +390,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 ]
@@@ -432,18 -264,6 +453,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
@@@ -453,21 -273,6 +474,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
@@@ -562,14 -367,6 +583,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:
@@@ -600,25 -397,6 +621,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
@@@ -645,7 -423,10 +666,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
@@@ -690,73 -471,6 +711,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
@@@ -773,30 -487,6 +794,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
@@@ -857,31 -547,6 +878,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 ]
@@@ -996,49 -661,6 +1017,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)
@@@ -1077,13 -699,6 +1098,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
@@@ -1134,13 -749,6 +1155,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)
@@@ -1171,16 -779,6 +1192,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)
@@@ -1190,31 -788,6 +1211,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 eee98ea,1081d4a..30ffc3f
--- a/debian/confflags
+++ b/debian/confflags
@@@ -7,6 -7,7 +7,6 @@@ FLAVORS := stati
# shared is generic, i.e. without arch specific opcodes
FLAVORS += shared
-export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@@ -95,6 -96,7 +95,6 @@@ gpl_confflags += --enable-x11gra
confflags += --extra-version='$(DEB_VERSION)'
confflags += --arch='$(DEB_HOST_ARCH_CPU)'
confflags += --prefix=/usr
-confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
confflags += --enable-vdpau
confflags += --enable-bzlib
confflags += --enable-libgsm
@@@ -106,6 -108,7 +106,7 @@@ confflags += --enable-pthread
confflags += --enable-zlib
confflags += --enable-libvpx
confflags += --enable-runtime-cpudetect
+ confflags += --enable-libfreetype
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
@@@ -162,7 -165,7 +163,7 @@@ endi
static_build_confflags += $(confflags)
# Configuration flags for the non-optimized shared libraries
-shared_build_confflags += $(confflags) --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+shared_build_confflags += $(confflags)
# amd64 has no problems with optimized shared libs. i386 and arm do.
ifneq ($(DEB_HOST_ARCH),amd64)
shared_build_confflags += $(nooptflags)
@@@ -173,7 -176,7 +174,7 @@@ shared_build_confflags += --disable-sta
## specific to arm architectures
# Configuration flags for the optimised shared libraries
vfp_build_confflags += $(confflags)
-vfp_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/vfp
+vfp_build_confflags += --shlibdir=/usr/lib/vfp
vfp_build_confflags += --enable-shared
vfp_build_confflags += --disable-static
vfp_build_confflags += --extra-cflags="-mfpu=vfp $(float_abi)"
@@@ -181,7 -184,7 +182,7 @@@ vfp_build_confflags += --disable-ffmpe
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/$(DEB_HOST_MULTIARCH)/neon/vfp
+neon_build_confflags += --shlibdir=/usr/lib/neon/vfp
# the NEON pass now requires ubfx which was introduced in armv6t2; we need to
# enable at least armv6t2 for the NEON pass to build, but NEON implies armv7-a
# so pass armv7-a if it's not already enabled
@@@ -198,7 -201,7 +199,7 @@@ neon_build_confflags += --disable-ffpla
# Configuration flags for the optimized shared libraries
cmov_build_confflags += $(confflags)
cmov_build_confflags += $(nooptflags)
-cmov_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov
+cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
cmov_build_confflags += --cpu='i686'
cmov_build_confflags += --enable-shared
cmov_build_confflags += --disable-static
@@@ -208,7 -211,7 +209,7 @@@ cmov_build_confflags += --disable-ffpla
## powerpc architecture specific
# Configuration flags for the optimized shared libraries
altivec_build_confflags += $(confflags)
-altivec_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
+altivec_build_confflags += --shlibdir=/usr/lib/altivec
altivec_build_confflags += --cpu='g4'
altivec_build_confflags += --enable-shared
altivec_build_confflags += --disable-static
@@@ -219,7 -222,7 +220,7 @@@ altivec_build_confflags += --disable-ff
## sparc architecture specific
# Configuration flags for the optimized shared libraries
vis_build_confflags += $(confflags)
-vis_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/v9
+vis_build_confflags += --shlibdir=/usr/lib/v9
vis_build_confflags += --cpu='sparc64'
vis_build_confflags += --enable-shared
vis_build_confflags += --disable-static
diff --combined debian/patches/series
index b5442d8,b5c9d41..1d8456a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,4 +1,3 @@@
-
01-Tweak-doxygen-config.patch
02-make-MAP_ANONYMOUS_AVAILABLE.patch
+ 03-disable-v4l-on-kfreebsd.patch
diff --combined debian/rules
index 5002070,4063d5d..0cd0f14
--- a/debian/rules
+++ b/debian/rules
@@@ -4,7 -4,7 +4,7 @@@ EPOCH=4
DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
- SHLIBS_VERSION := 4:0.7-1
+ SHLIBS_VERSION := 4:0.7.3-1
LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
@@@ -93,11 -93,11 +93,11 @@@ install: buil
--fail-missing --sourcedir=debian/tmp
formats.txt: install
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
debian/tmp/usr/bin/ffmpeg -formats | tee $@
codecs.txt: install
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
debian/tmp/usr/bin/ffmpeg -codecs | tee $@
binary-indep: build-doxy install
@@@ -129,7 -129,7 +129,7 @@@ binary-arch: build install codecs.txt f
upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION).99)"; \
done
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
dh_shlibdeps
# target dependencies for external packages
for pkg in $(LIB_PKGS); do \
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list