[SCM] libav/ubuntu: Merge branch 'experimental' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Wed Jan 2 06:06:07 UTC 2013
refresh patches
drop post beta2 patches
prepare new upload
Merge tag 'upstream/9_beta3' into experimental
Imported Upstream version 9~beta3
update debian/changelog
fix builds on the buildds
update debian/changelog
add lintian override for libavcodec-extra-54
Fix installation of doxygen HTML pages.
libavresample1: Add Replaces relationship with libavresample0 (Closes: #693327)
Include all post 9beta2 patches
update debian/changelog
Remove stale Conflicts/Replaces on libavutil51
Disable doxygen patch for now
import bits from ubuntu to minimize the diff
location of Doxyfile has moved
add post 9 beta2 patches
Start 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: 54c48f3cd9275da93b0397d2877ad4f2ba1055c2
X-Git-Newrev: a8517f7c65cf9d74d0a0ac02291dc31eee62b8a1
The following commit has been merged in the ubuntu branch:
commit a8517f7c65cf9d74d0a0ac02291dc31eee62b8a1
Merge: 54c48f3cd9275da93b0397d2877ad4f2ba1055c2 529f9aa912b1252126c9e0734b94451841ec9ac1
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Dec 21 16:21:10 2012 +0100
Merge branch 'experimental' into ubuntu
Conflicts:
debian/changelog
debian/rules
diff --combined debian/changelog
index 5076529,ac079be..676d9c3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,35 +1,51 @@@
- libav (6:9~beta2-1ubuntu1~ppa1) raring; urgency=low
++libav (6:9~beta3-1ubuntu1~ppa1) raring; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
+ vo-aacenc, vo-amrenc, x264, and xvid (all in universe)
+ - do not build libav-extra-dbg, it is build from the libav-extra source
+ package in ubuntu.
+ - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
+ - several ifdefs in debian/rules that allow the use of the same file
+ in libav and libav-extra (most of this can be merged into the debian
+ package)
+ - build libav-source for use with Ubuntu's libav-extra package
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 01 Nov 2012 17:48:41 +0100
+
+ libav (6:9~beta3-1) experimental; urgency=low
+
+ * New upstream version.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 21 Dec 2012 15:32:13 +0100
+
+ libav (6:9~beta2-4) experimental; urgency=low
+
+ * Fix compilation on the buildds
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 16 Nov 2012 07:56:59 +0100
+
+ libav (6:9~beta2-3) experimental; urgency=low
+
+ * Include all post 9beta2 patches
+ - Fixes linking with libavfilter/libavutil, Closes: #693040
+ * libavresample1: Unbreak partial updates by adding Replaces
+ relationship with libavresample0, Closes: #693327
+ * Fix installation of doxygen HTML pages.
+ * add lintian override for libavcodec-extra-54
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 15 Nov 2012 21:29:50 +0100
+
+ libav (6:9~beta2-2) experimental; urgency=low
+
+ * add post 9 beta2 patches
+ * import bits from ubuntu to minimize the diff
+ * Remove stale Conflicts/Replaces on libavutil51, fixes instability
+ issues with libavutil51.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 11 Nov 2012 17:21:15 +0100
++>>>>>>> experimental
+
libav (6:9~beta2-1) experimental; urgency=low
* new upstream release: libav 9 beta2
@@@ -112,123 -129,9 +145,123 @@@ libav (6:0.8.99-1537-gacb2c79-1) experi
-- Reinhard Tartler <siretart at tauware.de> Sat, 12 May 2012 22:02:03 +0200
+libav (6:0.8.3-6ubuntu2) quantal; urgency=low
+
+ * Temporarily fudge the versioning of libavcodec-dev's dependency on
+ libavcodec-extra-53 to cope with the botched merge of libav-extra.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Mon, 01 Oct 2012 11:48:25 +0100
+
+libav (6:0.8.3-6ubuntu1) quantal; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
+ vo-aacenc, vo-amrenc, x264, and xvid (all in universe)
+ - do not build libav-extra-dbg, it is build from the libav-extra source
+ package in ubuntu.
+ - drop libav-regular-dbg, not necessary in ubuntu
+ - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
+ - several ifdefs in debian/rules that allow the use of the same file
+ in libav and libav-extra (most of this can be merged into the debian
+ package)
+ - several dependency fixups in debian/control
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 07 Aug 2012 22:23:55 +0200
+
+libav (6:0.8.3-6) unstable; urgency=low
+
+ * Clarify the changes in the 6:0.8.3-5 upload, as discussed in bug
+ #683247.
+ * Make ffmpeg-dbg 'arch: all' for consistency with the libav-extra-dbg
+ package.
+ * Fix generation of shlibs file. (Closes: #679542)
+ Wrong make variables where used for the shlibs generation.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 04 Aug 2012 09:03:54 +0200
+
+libav (6:0.8.3-5) unstable; urgency=low
+
+ [ Reinhard Tartler ]
+ * Bug fix: "Multi-Arch: foreign libraries", thanks to Stepan Golosunov.
+ Make the transitional libavfoo-extra-NN packages 'arch: all' and
+ remove the 'Multi-Arch: foreign' fields to avoid that the dependency
+ can be satisfied by packages of other architectures, which would break
+ applications. Closes: #680613
+ * Make libav-extra-dbg 'arch: all'. As empty, transitional package
+ without strict dependencies, we can safely ship it as arch:all
+ package.
+
+ [ Fabian Greffrath ]
+ * Mention qt-faststart in the long description (Closes: #681491).
+ * Install all debug symbols into libav-dbg (Closes: #680602).
+ * Do not run doxygen if it is not installed. This does not change anything
+ for regular builds, but helps with bootstrapping the package to new
+ architectures that may not have doxygen available yet.
+ * Fix up debian/changelog and tighten dependencies.
+ * Do not declare "ffmpeg" as virtual package (provided by libav-tools).
+ Instead, we provide it as transitional package for libav-tools. Note
+ the next upstream version will no longer provide neither an 'ffmpeg'
+ package, nor a /usr/bin/ffmpeg binary. This means that front-end
+ applications in Debian that previously used this binary needs to be
+ ported to /usr/bin/avconv for jessie.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 15 Jul 2012 23:13:42 +0200
+
+libav (6:0.8.3-4) unstable; urgency=low
+
+ * Declare a 'Breaks' relationship against mplayer, Closes: #671934
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 26 Jun 2012 08:46:42 +0200
+
+libav (6:0.8.3-3) unstable; urgency=low
+
+ * Install the shared flavor last; the binaries from the optimized flavor(s)
+ would overwrite the ones from the shared baseline flavor causing SIGILL;
+ closes: #657885.
+ * control/Uploaders: update my email address
+
+ -- Loïc Minier <lool at debian.org> Mon, 25 Jun 2012 21:21:24 +0200
+
+libav (6:0.8.3-2) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Clarify relations between libavcodec53 and libavcodec-extra-53
+ in debian/control.
+ * Use the cond_enable() macro for all additional features in debian/confflags.
+ * Tidy up and sort configuration flags.
+ * Add a debian/README.source file that describes how to rebuild libav
+ with a reduced feature set in order to avoid circular build-dependencies
+ for bootstrapping.
+ * Restrict Build-Depends to "yasm [any-amd64 any-i386]"
+ and explicitly disable it if not found.
+
+ [ Reinhard Tartler ]
+ * add patch from upstream to fix playback of Canon AVHCD movies.
+ (Fixes: LP: #937561)
+ * fix location in ffmpeg.NEWS file
+ * add dependency on libavcodec53 to libav-dbg
+ * add Pre-Depend on dpkg to libav-tools to ensure smooth updates
+ * {ffmpeg,libav-tools}.install: make files to install more explicit
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 25 Jun 2012 19:06:49 +0200
+
+libav (6:0.8.3-1) unstable; urgency=medium
+
+ [ Andres Mejia ]
+ * Update libav-doc doc base. (Closes: #674139)
+
+ [ Reinhard Tartler ]
+ * New upstream release 0.8.3:
+ - Several bugs and crashes have been fixed in the following codecs: PNG,
+ Electronic Arts TQI, H.264 (CVE-2012-0851) and H.263 (CVE-2011-3937)
+ * Raising severity because of security issues.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 09 Jun 2012 13:25:31 +0200
+
libav (6:0.8.2-2) unstable; urgency=low
- *
+ * Revert "temporarily disable opencv to work around dependency troubles"
+ * Simplify internal dependencies (Closes: #672791)
-- Reinhard Tartler <siretart at tauware.de> Mon, 14 May 2012 21:37:59 +0200
@@@ -351,137 -254,6 +384,137 @@@ libav (4:0.8-2) unstable; urgency=lo
-- Reinhard Tartler <siretart at tauware.de> Mon, 05 Mar 2012 19:47:54 +0100
+libav (4:0.8.3-0ubuntu3) quantal; urgency=low
+
+ * debian/patches/05-H264-AVCodecContext-cropping.patch: Added patch from
+ Måns Rullgård to fix H264 video size from Canon DSLR cameras (LP: #937561)
+
+ -- Jason Gerard DeRose <jderose at novacut.com> Mon, 30 Jul 2012 14:55:29 -0600
+
+libav (4:0.8.3-0ubuntu2) quantal; urgency=low
+
+ * debian/control:
+ - Prefer libtiff5-dev
+
+ -- Michael Terry <mterry at ubuntu.com> Tue, 17 Jul 2012 14:04:07 -0400
+
+libav (4:0.8.3-0ubuntu1) quantal; urgency=low
+
+ * New Upstream releases:
+ + version 0.8.3:
+ - Several bugs and crashes have been fixed in the following codecs: PNG,
+ Electronic Arts TQI, H.264 (CVE-2012-0851) and H.263 (CVE-2011-3937)
+ + version 0.8.2:
+ - Several bugs and crashes have been fixed in the following codecs: AAC,
+ APE, H.263, H.264, Indeo 4, Mimic, MJPEG, Motion Pixels Video, RAW,
+ TTA, VC1, VQA, WMA Voice, vqavideo (CVE-2012-0947). LP: #980963
+ - Several bugs and crashes have been fixed in the following formats:
+ ASF, ID3v2, MOV, xWMA
+ - This release additionally updates the following codecs to the
+ bytestream2 API, and therefore benefit from additional overflow
+ checks: truemotion2, utvideo, vqavideo
+ * libav-tools: add pre-depends on dpkg
+ * ffmpeg: update Conflict/Replaces relationships
+
+ [ Matthieu Baerts (matttbe) <matttbe at gmail.com> ]
+ * debian/ffmpeg.install and debian/libav-tools.install:
+ - Moved all ffmpeg binaries and manpages to ffmpeg package (LP: #1011136)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 10 Jun 2012 20:24:59 +0200
+
+libav (4:0.8.1-0ubuntu3) quantal; urgency=low
+
+ [ Andres Mejia ]
+ * Install manpage for qt-faststart in the correct package.
+
+ [ Reinhard Tartler ]
+ * bump standards version, no changes needed
+
+ [ Andres Mejia ]
+ * Remove dependencies and suggests of FAAD, no longer needed.
+ * Enable frei0r support.
+
+ [ Reinhard Tartler ]
+ * drop build-dep on frei0r-plugins-dev
+
+ [ Andres Mejia ]
+ * Enable tls support through gnutls.
+ * Enable libcdio support.
+ * Enable opencv support.
+
+ [ Reinhard Tartler ]
+ * drop build-dep on libcv-dev and libopencv-dev
+
+ [ Andres Mejia ]
+ * Enable pulse support.
+ * Include conditional enablers for vo-aacenc and vo-amrwbenc.
+ * Update comment about GPLv3 features.
+ * Make clear that is FAAC that's considered non-free, not AAC.
+ * Enable jack support for all architectures.
+
+ [ Fabian Greffrath ]
+ * Enable hardened build flags through dpkg-buildflags (Closes: #658929).
+ * Filter out system-wide setting of -Bsymbolic-functions to avoid FTBFS.
+ * Set CPPFLAGS separately.
+
+ [ Andres Mejia ]
+ * Don't override -g or -O3 flags set by libav's build system.
+
+ [ Reinhard Tartler ]
+ * confflags: use --enable-pic instead of manually messing with cflags
+
+ [ Andres Mejia ]
+ * Separate the ffmpeg program into the transitional package.
+ * Add NEWS entry for ffmpeg deprecation.
+
+ [ Reinhard Tartler ]
+ * add conflicts/replaces for ffmpeg transitional package
+
+ [ Andres Mejia ]
+ * Properly migrate /etc/ffserver.conf to /etc/avserver.conf. (Closes: #660786)
+ * Don't ignore errors in maintainer scripts.
+ * Fix build for hurd. Thanks to Samuel Thibault for patch.
+
+ [ Reinhard Tartler ]
+ * Cherry pick the mentioned changes above to the ubuntu branch
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 10 Jun 2012 11:59:00 +0200
+
+libav (4:0.8.1-0ubuntu2) quantal; urgency=low
+
+ * Update warning to make clearer the deprecation of ffmpeg binary.
+ (LP: #939863)
+
+ -- Andres Mejia <amejia at debian.org> Sun, 13 May 2012 13:07:30 -0400
+
+libav (4:0.8.1-0ubuntu1) precise; urgency=low
+
+ * New upstream bug and security fix release (FFe: LP: #960949)
+ - fixes the following CVEs:
+ CVE-2012-0848, CVE-2012-0853, CVE-2012-0858, CVE-2011-3929,
+ CVE-2011-3936, CVE-2011-3937, CVE-2011-3940, CVE-2011-3945,
+ CVE-2011-3947, CVE-2011-3951, CVE-2011-3952
+
+ * Pull fix from Debian git to fix installation of avserver.conf and
+ recordshow.sh into libav-tools; Thanks to Julien Cristau for spotting this!
+ - update debian/rules
+
+ -- Micah Gersten <micahg at ubuntu.com> Wed, 21 Mar 2012 21:18:24 -0500
+
+libav (4:0.8-1ubuntu2) precise; urgency=low
+
+ * No-change rebuild to pick libvpx's new shlibs. (LP: #926580)
+
+ -- Alessio Treglia <quadrispro at ubuntu.com> Thu, 09 Feb 2012 08:50:07 +0100
+
+libav (4:0.8-1ubuntu1) precise; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp,
+ x264, and xvid (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 24 Jan 2012 07:41:33 +0100
+
libav (4:0.8-1) unstable; urgency=medium
[ Fabian Greffrath ]
@@@ -503,14 -275,6 +536,14 @@@
-- Reinhard Tartler <siretart at tauware.de> Sun, 22 Jan 2012 21:24:22 +0100
+libav (4:0.8~beta2-3ubuntu1) precise; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp,
+ x264, and xvid (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Jan 2012 09:34:37 +0100
+
libav (4:0.8~beta2-3) unstable; urgency=low
[ Fabian Greffrath ]
@@@ -539,14 -303,6 +572,14 @@@ libav (4:0.8~beta2-2) unstable; urgency
-- Reinhard Tartler <siretart at tauware.de> Sun, 15 Jan 2012 16:19:41 +0100
+libav (4:0.8~beta2-1ubuntu1) precise; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp,
+ x264, and xvid (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 12 Jan 2012 22:30:00 +0100
+
libav (4:0.8~beta2-1) unstable; urgency=low
* New Upstream version 0.8~beta2:
@@@ -584,15 -340,6 +617,15 @@@ libav (4:0.8~beta1-1) experimental; urg
-- Reinhard Tartler <siretart at tauware.de> Fri, 30 Dec 2011 23:45:34 +0100
+libav (4:0.7.3-2ubuntu1) precise; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp,
+ x264, and xvid (all in universe)
+ * Install libraries in multi-arch directories.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 26 Dec 2011 11:58:50 +0100
+
libav (4:0.7.3-2) unstable; urgency=low
* forcefully disable v4l on kfreebsd, fixes an FTBFS on kFreeBSD
@@@ -614,18 -361,6 +647,18 @@@ libav (4:0.7.3-1) unstable; urgency=hig
-- 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
@@@ -635,24 -370,6 +668,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
@@@ -682,15 -399,6 +715,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
@@@ -712,28 -420,6 +745,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 ]
@@@ -761,20 -447,6 +794,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.
@@@ -787,14 -459,6 +820,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
@@@ -804,14 -468,6 +837,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
@@@ -844,20 -500,6 +877,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
@@@ -871,17 -513,6 +904,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 ]
@@@ -900,25 -531,6 +933,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
@@@ -947,13 -559,6 +980,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 ]
@@@ -967,15 -572,6 +1000,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
@@@ -985,44 -581,6 +1018,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 ]
@@@ -1048,18 -606,6 +1081,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
@@@ -1069,21 -615,6 +1102,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
@@@ -1178,14 -709,6 +1211,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:
@@@ -1216,25 -739,6 +1249,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
@@@ -1261,7 -765,10 +1294,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
@@@ -1306,73 -813,6 +1339,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
@@@ -1389,30 -829,6 +1422,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
@@@ -1473,31 -889,6 +1506,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 ]
@@@ -1612,49 -1003,6 +1645,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)
@@@ -1693,13 -1041,6 +1726,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
@@@ -1750,13 -1091,6 +1783,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)
@@@ -1787,16 -1121,6 +1820,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)
@@@ -1806,31 -1130,6 +1839,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 87fa3d1,351c6b9..971abee
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
Source: libav
Section: libs
Priority: optional
-Maintainer: Debian Multimedia 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>,
Loïc Minier <lool at debian.org>,
@@@ -19,31 -18,44 +19,31 @@@ Build-Depends-Indep
doxygen
Build-Depends:
debhelper (>= 8.1.3~),
- frei0r-plugins-dev,
libasound2-dev [linux-any],
libbz2-dev,
libcdio-cdda-dev,
libcdio-dev,
libcdio-paranoia-dev,
- libcv-dev,
libdc1394-22-dev [linux-any],
libfreetype6-dev,
libgnutls-dev,
libgsm1-dev,
libimlib2-dev,
libjack-dev,
- libmp3lame-dev,
- libopencore-amrnb-dev,
- libopencore-amrwb-dev,
- libopencv-dev,
- libopenjpeg-dev,
-# libopus-dev, temporarily disabled until #690563 is fixed
libpulse-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,
+ libtiff5-dev | libtiff-dev,
libva-dev [!hurd-any],
libvdpau-dev,
libvorbis-dev,
libvpx-dev,
libx11-dev,
- libx264-dev,
libxext-dev,
libxfixes-dev,
- libxvidcore-dev,
libxvmc-dev,
texi2html,
yasm [any-amd64 any-i386],
@@@ -78,12 -90,14 +78,12 @@@ Section: debu
Priority: extra
Architecture: any
Replaces:
- ffmpeg-dbg (<< 6:0.8.3-5),
libav-extra-dbg (<< 6:0.8.3-5)
Breaks:
libav-extra-dbg (<< 6:0.8.3-5)
Depends:
libav-tools (= ${binary:Version}),
- libavcodec54 (= ${binary:Version}) | libavcodec-extra-54 (= ${binary:Version}),
+ libavcodec54 (= ${binary:Version}),
libavdevice53 (= ${binary:Version}),
libavformat54 (= ${binary:Version}),
libavutil52 (= ${binary:Version}),
@@@ -122,10 -136,6 +122,6 @@@ Pre-Depends: ${misc:Pre-Depends
Depends:
${misc:Depends},
${shlibs:Depends}
- Conflicts:
- libavutil-extra-51
- Replaces:
- libavutil-extra-51
Description: Libav utility library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -241,8 -251,8 +237,8 @@@ Package: libavcodec-de
Section: libdevel
Architecture: any
Depends:
- libavcodec54 (<= ${source:Upstream-Version}-99) | libavcodec-extra-54 (<= ${source:Upstream-Version}-99),
- libavcodec54 (>= ${binary:Version}) | libavcodec-extra-54 (>= ${binary:Version}),
+ libavcodec54 (<= ${source:Upstream-Version}-99) | libavcodec-extra-54 (<= ${source:Upstream-Version}.99),
+ libavcodec54 (>= ${binary:Version}) | libavcodec-extra-54 (>= ${source:Upstream-Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Suggests:
@@@ -353,6 -363,8 +349,8 @@@ Package: libavresample
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
+ Replaces:
+ libavresample0
Depends:
${misc:Depends},
${shlibs:Depends}
@@@ -362,17 -374,102 +360,17 @@@ Description: Libav audo resampling libr
.
This is the audio software resampling library from Libav.
-Package: libavutil-extra-52
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavutil52,
- ${misc:Depends},
-Description: Libav utility library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libavcodec-extra-54
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Replaces:
- libavcodec54
-Breaks:
- libavcodec54,
- mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
-Description: Libav codec library (additional codecs)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the codec library from Libav (both encoding and decoding).
- .
- This package is a replacement for the regular libavcodec54 library package;
- it contains the following additional codecs:
- .
- * OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band (Encoder/Decoder)
- * OpenCORE Adaptive Multi-Rate (AMR) Wide-Band (Decoder)
- * Android VisualOn AAC (Encoder)
- * Android VisualOn Adaptive Multi-Rate (AMR) Wide-Band (Encoder)
- .
- Because this package links against libraries that are licensed under
- Apache License 2.0, the resulting binaries are distributed under the
- GPL version 3 or later.
-
-Package: libavdevice-extra-53
-Section: oldlibs
-Priority: extra
+Package: libav-source
Architecture: all
+Section: devel
Depends:
- libavdevice53,
- ${misc:Depends},
-Description: Libav device handling library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libavfilter-extra-3
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavfilter3,
- ${misc:Depends},
-Description: Libav filter library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libavformat-extra-54
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavformat54,
- ${misc:Depends},
-Description: Libav file format library (transitional package)
+ ${misc:Depends}
+Description: Patched Libav sources
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libswscale-extra-2
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libswscale2,
- ${misc:Depends},
-Description: Libav video software scaling library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
+ This package contains a tarball the source file that were used to produce
+ this package, containing all modifications that have been applied inline.
.
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
+ This package is used as build-dependency for 'libav-extra', which provides
+ the "extra" variants of libav.
diff --combined debian/rules
index e3e4c63,d0c82cb..d0752fd
--- a/debian/rules
+++ b/debian/rules
@@@ -120,9 -120,7 +120,9 @@@ debian-shared/tools/qt-faststart: build
build-doxy: build-doxy-stamp
build-doxy-stamp:
dh_testdir
+ifneq ($(DEB_SOURCE), libav-extra)
- [ ! -x /usr/bin/doxygen ] || doxygen
+ [ ! -x /usr/bin/doxygen ] || doxygen doc/Doxyfile
+endif
touch $@
build: build-stamp build-extra
@@@ -176,7 -174,7 +176,7 @@@ endi
dh_installdirs -ptmp usr/share/doc/libav-doc/html
$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
# don't fail on binary-indep only builds.
- [ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/libav-doc
+ -cp -avf doc/doxy/html debian/tmp/usr/share/doc/libav-doc
install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
install -m 644 -D doc/avserver.conf debian/tmp/etc/
install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
@@@ -189,13 -187,12 +189,13 @@@
debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
dh_installdocs -plibavformat54 formats-$(DEB_HOST_ARCH).txt
dh_installdocs -plibavcodec54 codecs.txt
+
install-extra: build $(DH_INSTALL_FILES)
dh_testdir
dh_testroot
$(foreach flavor,$(filter-out static,$(FLAVORS)),$(call install_flavor_extra,$(flavor)))
dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) -Xusr/share/doc/libav-doc \
- -Xusr/share/doc/libav --fail-missing \
+ -Xusr/share/doc/libav --list-missing \
--sourcedir=debian/tmp/extra
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list