[SCM] libav/ubuntu: merge changes from debian
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Aug 7 20:54:53 UTC 2012
update debian/changelog
Fix generation of shlibs file
update debian/changelog and correct earlier changelog entries
Make ffmpeg-dbg 'arch: all' for consistency with the libav-extra-dbg package
update debian/changelog
Make libav-extra-dbg arch:all
Fix up debian/changelog and get dependencies right accordingly.
update debian/changelog
Do not run doxygen if it is not installed.
Install all debug symbols into libav-dbg (Closes: #680602).
Mention qt-faststart in the long description (Closes: #681491.)
Remove Multi-arch header from the empty, transitional -extra- packages
Bug fix: "Multi-Arch: foreign libraries", thanks to Stepan Golosunov.
update debian/changelog
Declare a 'Breaks' relationship against mplayer, Closes: #671934
6:0.8.3-3
control/Uploaders: update my email address
Install the shared flavor last
update debian/changelog
{ffmpeg,libav-tools}.install: make files to install more explicit
add Pre-Depend on dpkg to libav-tools to ensure smooth updates
add dependency on libavcodec53 to libav-dbg
fix location in ffmpeg.NEWS file
add patch from upstream to fix playback of Canon AVHCD movies
Restrict Build-Depends to "yasm [any-amd64 any-i386]" and explicitely disable it if not found.
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.
Tidy up and sort configuration flags.
Use the cond_enable() macro for all additional features in debian/confflags.
Clarify relations between libavcodec53 and libavcodec-extra-53 in debian/control.\n\nConflicts seems too strong, Breaks should be enough, Enhances is plain wrong.
update debian/changelog
Merge tag 'upstream/0.8.3'
Update libav-doc doc base. (Closes: #674139)
create correct shlibs file for libavcodec-extra-53
update debian/changelog
cleanup generated formats*.txt and codec*.txt
Simplify internal dependencies
add comments about the various PKGS variables
Revert "temporarily disable opencv to work around dependency troubles"
prepare new upload
break long line
bump urgency
update debian/changelog
Revert "Revert "temporarily disable opencv to work around dependency troubles""
drop 02-fix-avpreset-extension.patch, applied upstream
Merge tag 'upstream/0.8.2'
Don't ignore errors in maintainer scripts.
Update changelog.
Revert "temporarily disable opencv to work around dependency troubles"
Update changelog.
Add #DEBHELPER# line to maintainer scripts.
Properly migrate /etc/ffserver.conf to /etc/avserver.conf. (Closes: #660786)
Add closes bug for other issue related to hurd build.
Update changelog.
Fix build for hurd. Thanks to Samuel Thibault for patch.
update debian/changelog
temporarily disable opencv to work around dependency troubles
Fix epoch in strict internal dependencies. Closes: #670861
bump epoch to fix messed upload to unstable (Closes: #670762)
Fix issue with generation of formats-*.txt file.
Fix issue with file not being multiarch compatible. (Closes: #669988)
Update changelog.
Have both libavcodec and libavcodec-extra package conflict with each other.
Use a Provides field to provide transitional packages instead of Conflicts. (Closes: #666401)
Update changelog for new upload.
Add symlinks to manpages for replaced programs.
Point to changelog inside ffmpeg package.
Fix spelling.
Add NEWS entry for ffmpeg deprecation.
Update changelog.
Change ffmpeg warning so that it's clearer the program is deprecated (LP: #939863)
Fix file conflicts between ffmpeg and libav-tools package.
Seperate the ffmpeg program into the transitional package.
Prepare new upload.
Update changelog.
Update changelog.
Mention license impact in libavcodec-extra-53's package description.
Fix issue with installation of debug symbols. (Closes: #642798)
Set Enhances field and update package description for libavcodec-extra package. (Closes: #653451)
Update changelog.
Remove dependencies and suggests of FAAD, no longer needed.
Remove libav-source package. No longer necessary.
Change packaging to only build libavcodec-extra* package. Other extra packages are unnecessary.
Filter out build of static library for packages.
Change packaging to build libav*-extra* packages through libav source package.
Install manpage for qt-faststart in the correct package.
upload to unstable
Don't override -g or -O3 flags set by libav's build system.
Enable jack support for all architectures. Hurd now has jack packages.
Make clear that is FAAC that's considered non-free, not AAC.
Update comment about GPLv3 features.
Include conditional enablers for vo-aacenc and vo-amrwbenc.
Update changelog.
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/libav
Enable vaapi for all architectures. libva is available on all architectures.
Enable pulse support.
Enable opencv support.
Enable libcdio support.
Enable tls support through gnutls.
Enable frei0r support.
update debian/changelog
Update changelog.
fix installation of avserver.conf and recordshow.sh into libav-tools
bump standards version, no changes needed
drop all post-0.8 patches, applied upstream
Merge tag 'upstream/0.8.1'
force upgrades of older libavcodec-extra-53 packages
Bump shlibs
update debian/changelog
Bugfix: expects wrong preset file extension
Merge remote-tracking branch 'origin/hardening'
add missing post 0.8 patches
Import post 0.8 patches
Set CPPFLAGS separately.
Filter out system-wide setting of -Bsymbolic-functions to avoid FTBFS.
Fix format string vulnerability detected by -Wformat-security.
Enable hardened build flags through dpkg-buildflags (Closes: #658929).
Fix maintainer's name.
confflags: use --enable-pic instead of manually messing with cflags
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: 36a45547c0c5bda574c8450c04f080c03aad8780
X-Git-Newrev: 19094e65b66114e46fa016270f7e35ab9ceb1b3b
The following commit has been merged in the ubuntu branch:
commit ab0d12b0f56cc887543cadfd2ec63923482bff8d
Merge: 57fbd35b6893b284d854c843a836621cc8831ea6 cf043fbd38132273138de587aeb70c1a55a9a4ad
Author: Reinhard Tartler <siretart at tauware.de>
Date: Tue Aug 7 22:21:59 2012 +0200
merge changes from debian
diff --combined debian/changelog
index b46ca1a,cfba07c..5ff8042
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,134 -1,219 +1,350 @@@
+ 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
+
+ libav (6:0.8.2-1) unstable; urgency=medium
+
+ * New upstream release:
+ - 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).
+ - 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
+ * drop 02-fix-avpreset-extension.patch, applied upstream
+ * Revert "Revert "temporarily disable opencv to work around dependency
+ troubles"" (Closes: #671302)
+ * Bumped urgency because of security issue.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 05 May 2012 11:08:44 +0200
+
+ libav (6:0.8.1-7) unstable; urgency=low
+
+ * Fix build for hurd. Thanks to Samuel Thibault for patch. (Closes: #613034)
+ (Closes: #671038)
+ * Properly migrate /etc/ffserver.conf to /etc/avserver.conf.
+ (Closes: #660786)
+ * Renable opencv support.
+
+ -- Andres Mejia <amejia at debian.org> Tue, 01 May 2012 21:33:13 -0400
+
+ libav (6:0.8.1-6) unstable; urgency=low
+
+ * Fix epoch in strict internal dependencies. Closes: #670861
+ * Temporarily disable opencv to work around dependency trouble
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 30 Apr 2012 08:14:20 +0200
+
+ libav (6:0.8.1-5) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Fix issue with file not being multiarch compatible. (Closes: #669988)
+
+ [ Reinhard Tartler ]
+ * Bump epoch to fix messed upload to unstable (Closes: #670762)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 29 Apr 2012 10:30:26 +0200
+
+ libav (5:0.8.1-4) unstable; urgency=low
+
+ * Use a Provides field to provide transitional packages instead of Conflicts.
+ (Closes: #666401)
+ * Have both libavcodec and libavcodec-extra package conflict with each other.
+
+ -- Andres Mejia <amejia at debian.org> Fri, 30 Mar 2012 10:15:50 -0400
+
+ libav (5:0.8.1-3) unstable; urgency=low
+
+ * Separate the ffmpeg program into the transitional package.
+ * Change ffmpeg warning so that it's clearer the program is
+ deprecated (LP: #939863)
+
+ -- Andres Mejia <amejia at debian.org> Thu, 29 Mar 2012 13:13:01 -0400
+
+ libav (5:0.8.1-2) experimental; urgency=low
+
+ [ Andres Mejia ]
+ * Merge libav-extra packages to libav. (Closes: #658084)
+ * Provide only libavcodec-extra package, the other packages are unnecessary.
+ * Remove libav-source package. No longer necessary.
+ * Remove dependencies and suggests of FAAD, no longer needed.
+ * Set Enhances field and update package description for libavcodec-extra
+ package. (Closes: #653451)
+ * Fix issue with installation of debug symbols. (Closes: #642798)
+
+ [ Fabian Greffrath ]
+ * Mention license impact in libavcodec-extra-53's package description.
+
+ -- Andres Mejia <amejia at debian.org> Wed, 21 Mar 2012 15:52:58 -0400
+
+ libav (4:0.8.1-1) unstable; urgency=medium
+
+ [ Reinhard Tartler ]
+ * Bump shlibs (Closes: #662793)
+ * force upgrades of older libavcodec-extra-53 packages
+ * drop all post-0.8 patches, applied upstream
+ * bump standards version, no changes needed
+ * Imported Upstream version 0.8.1
+ * Bumped urgency to medium because of included security fixes:
+ 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
+
+ [ Andres Mejia ]
+ * Enable frei0r support.
+ * Enable tls support through gnutls.
+ * Enable libcdio support.
+ * Enable opencv support.
+ * Enable pulse support.
+ * Enable vaapi for all architectures.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 19 Mar 2012 08:39:18 +0100
+
+ libav (4:0.8-2) unstable; urgency=low
+
+ [ Reinhard Tartler ]
+ * confflags: use --enable-pic instead of manually messing with cflags
+ * Import post 0.8 patches
+ * Bugfix: expects wrong preset file extension (Closes: #660978)
+ Thanks to Laurento <laurento.frittella at gmail.com> for spotting this.
+
+ [ Alessio Treglia ]
+ * Fix maintainer's name.
+
+ [ Fabian Greffrath ]
+ * Enable hardened build flags through dpkg-buildflags (Closes: #658929).
+ * Fix format string vulnerability detected by -Wformat-security.
+ * Filter out system-wide setting of -Bsymbolic-functions to avoid FTBFS.
+ * Set CPPFLAGS separately.
+
+ -- 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 ]
@@@ -150,14 -235,6 +366,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 ]
@@@ -186,14 -263,6 +402,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:
@@@ -231,15 -300,6 +447,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
@@@ -261,18 -321,6 +477,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
@@@ -282,24 -330,6 +498,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
@@@ -329,15 -359,6 +545,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
@@@ -359,28 -380,6 +575,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 ]
@@@ -408,20 -407,6 +624,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.
@@@ -434,14 -419,6 +650,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
@@@ -451,14 -428,6 +667,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
@@@ -491,20 -460,6 +707,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
@@@ -518,17 -473,6 +734,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 ]
@@@ -547,25 -491,6 +763,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
@@@ -594,13 -519,6 +810,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 ]
@@@ -614,15 -532,6 +830,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
@@@ -632,44 -541,6 +848,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 ]
@@@ -695,18 -566,6 +911,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
@@@ -716,21 -575,6 +932,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
@@@ -825,14 -669,6 +1041,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:
@@@ -863,25 -699,6 +1079,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
@@@ -908,7 -725,10 +1124,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
@@@ -953,73 -773,6 +1169,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
@@@ -1036,30 -789,6 +1252,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
@@@ -1120,31 -849,6 +1336,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 ]
@@@ -1259,49 -963,6 +1475,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)
@@@ -1340,13 -1001,6 +1556,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
@@@ -1397,13 -1051,6 +1613,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)
@@@ -1434,16 -1081,6 +1650,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)
@@@ -1453,31 -1090,6 +1669,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 c82c955,43c4f1a..19a1181
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,10 +1,11 @@@
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>,
- Loic Minier <lool at dooz.org>,
+ Loïc Minier <lool at debian.org>,
Reinhard Tartler <siretart at tauware.de>,
Fabian Greffrath <fabian+debian at greffrath.com>,
Andres Mejia <amejia at debian.org>,
@@@ -19,41 -18,52 +19,42 @@@ 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],
- libdirac-dev,
libfreetype6-dev,
libgnutls-dev,
libgsm1-dev,
libimlib2-dev,
libjack-dev,
- libmp3lame-dev,
- libopencore-amrnb-dev,
- libopencore-amrwb-dev,
- libopencv-dev,
- libopenjpeg-dev,
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,
+ libvo-aacenc-dev,
+ libvo-amrwbenc-dev,
libvorbis-dev,
libvpx-dev,
libx11-dev,
- libx264-dev,
libxext-dev,
libxfixes-dev,
- libxvidcore-dev,
libxvmc-dev,
texi2html,
- yasm,
+ yasm [any-amd64 any-i386],
zlib1g-dev
Package: libav-tools
Section: video
Architecture: any
- Provides:
- ffmpeg
Replaces:
ffmpeg (<< 4:0.8~),
libavcodec-extra-53 (<< 4:0.6~),
@@@ -75,16 -85,13 +76,17 @@@ Description: Multimedia player, server
streaming server, the avconv audio and video encoder, and the avprobe
stream analyzer. They support most existing file formats (AVI, MPEG,
OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
- DV...).
+ DV...). Additionally, it contains the qt-faststart utility which
+ rearranges Quicktime files to facilitate network streaming.
Package: ffmpeg
Section: oldlibs
Priority: extra
Architecture: any
+Conflicts:
+ libav-tools (<< 4:0.8.3-0ubuntu1)
+Replaces:
+ libav-tools (<< 4:0.8.3-0ubuntu1)
Depends:
libav-tools,
${misc:Depends},
@@@ -100,7 -107,7 +102,7 @@@ Description: Multimedia player, server
Package: ffmpeg-dbg
Section: oldlibs
Priority: extra
- Architecture: any
+ Architecture: all
Depends:
libav-dbg,
${misc:Depends}
@@@ -108,27 -115,24 +110,24 @@@ Description: Debug symbols for Libav re
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This package contains debug data of the Libav related shared libraries.
- .
- Most people will not need this package. Please install it to produce useful
- stacktraces to help debugging the Libav libraries.
- .
- This package contains the debug symbols for the deprecated ffmpeg program.
- It also serves as a transitional package to libav-tools-dbg.
+ This package serves as a transitional package to libav-dbg.
Package: libav-dbg
Section: debug
Priority: extra
Architecture: any
- Provides:
- ffmpeg-dbg
Replaces:
- ffmpeg-dbg (<< 5:0.8.1-3)
- ffmpeg-dbg (<< 6:0.8.3-5),
- libav-regular-dbg (<< 6:0.8.3-5),
- libav-extra-dbg (<< 6:0.8.3-5)
++ ffmpeg-dbg (<< 4:0.8.3-5),
++ libav-regular-dbg (<< 4:0.8.3-5),
++ libav-extra-dbg (<< 4:0.8.3-5)
Breaks:
- ffmpeg-dbg (<< 5:0.8.1-3)
- ffmpeg-dbg (<< 6:0.8.3-5),
- libav-regular-dbg (<< 6:0.8.3-5),
- libav-extra-dbg (<< 6:0.8.3-5)
++ ffmpeg-dbg (<< 4:0.8.3-5),
++ libav-regular-dbg (<< 4:0.8.3-5),
++ libav-extra-dbg (<< 4:0.8.3-5)
Depends:
+ ffmpeg (= ${binary:Version}),
libav-tools (= ${binary:Version}),
- libavcodec53 (= ${binary:Version}),
+ libavcodec53 (= ${binary:Version}) | libavcodec-extra-53 (= ${binary:Version}),
libavdevice53 (= ${binary:Version}),
libavformat53 (= ${binary:Version}),
libavutil51 (= ${binary:Version}),
@@@ -144,20 -148,31 +143,31 @@@ Description: Debug symbols for Libav re
Most people will not need this package. Please install it to produce useful
stacktraces to help debugging the Libav library.
- Package: libav-source
- Architecture: all
- Section: devel
+ Package: libav-regular-dbg
+ Section: oldlibs
+ Priority: extra
+ Architecture: any
Depends:
+ libav-dbg,
${misc:Depends}
- Description: Patched Libav sources
+ Description: Debug symbols for Libav related packages (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 serves as a transitional package to libav-dbg.
+
+ Package: libav-extra-dbg
+ Section: oldlibs
+ Priority: extra
+ Architecture: all
+ Depends:
+ libav-dbg,
+ ${misc:Depends}
+ Description: Debug symbols for Libav related packages (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
.
- This package is used as build-dependency for 'libav-extra', which provides
- the "extra" variants of libav.
+ This package serves as a transitional package to libav-dbg.
Package: ffmpeg-doc
Section: oldlibs
@@@ -201,6 -216,12 +211,12 @@@ Pre-Depends: ${misc:Pre-Depends
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libavutil-extra-51
+ Replaces:
+ libavutil-extra-51
+ Breaks:
+ libavutil-extra-51 (<< 5:0.8.1-2)
Description: Libav utility library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -215,6 -236,9 +231,9 @@@ Pre-Depends: ${misc:Pre-Depends
Depends:
${misc:Depends},
${shlibs:Depends}
+ Breaks:
+ libavcodec-extra-53,
+ mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
Description: Libav codec library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -230,6 -254,12 +249,12 @@@ Pre-Depends: ${misc:Pre-Depends
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libavdevice-extra-53
+ Replaces:
+ libavdevice-extra-53
+ Breaks:
+ libavdevice-extra-53 (<< 5:0.8.1-2)
Description: Libav device handling library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -243,6 -273,12 +268,12 @@@ Pre-Depends: ${misc:Pre-Depends
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libavformat-extra-53
+ Replaces:
+ libavformat-extra-53
+ Breaks:
+ libavformat-extra-53 (<< 5:0.8.1-2)
Description: Libav file format library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -259,6 -295,12 +290,12 @@@ Pre-Depends: ${misc:Pre-Depends
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libavfilter-extra-2
+ Replaces:
+ libavfilter-extra-2
+ Breaks:
+ libavfilter-extra-2 (<< 5:0.8.1-2)
Description: Libav video filtering library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -272,6 -314,12 +309,12 @@@ Pre-Depends: ${misc:Pre-Depends
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libpostproc-extra-52
+ Replaces:
+ libpostproc-extra-52
+ Breaks:
+ libpostproc-extra-52 (<< 5:0.8.1-2)
Description: Libav video postprocessing library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -285,6 -333,12 +328,12 @@@ Pre-Depends: ${misc:Pre-Depends
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libswscale-extra-2
+ Replaces:
+ libswscale-extra-2
+ Breaks:
+ libswscale-extra-2 (<< 5:0.8.1-2)
Description: Libav video scaling library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -295,8 -349,7 +344,7 @@@ Package: libavutil-de
Section: libdevel
Architecture: any
Depends:
- libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}.99),
- libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
+ libavutil51 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavutil
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -311,21 -364,22 +359,22 @@@ Package: libavcodec-de
Section: libdevel
Architecture: any
Depends:
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}.99),
- libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
+ libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
+ libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Suggests:
+ libdc1394-22-dev [linux-any],
libgsm1-dev,
libogg-dev,
+ libraw1394-dev [linux-any],
libschroedinger-dev,
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
libx11-dev,
libxext-dev,
- zlib1g-dev,
- ${lib1394-dev}
+ zlib1g-dev
Description: Development files for libavcodec
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -340,8 -394,7 +389,7 @@@ Package: libavdevice-de
Section: libdevel
Architecture: any
Depends:
- libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}.99),
- libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
+ libavdevice53 (= ${binary:Version}),
libavformat-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavdevice
@@@ -358,8 -411,7 +406,7 @@@ Section: libdeve
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}.99),
- libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
+ libavformat53 (= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavformat
@@@ -377,8 -429,7 +424,7 @@@ Section: libdeve
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}.99),
- libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
+ libavfilter2 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavfilter
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -394,8 -445,7 +440,7 @@@ Section: libdeve
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}.99),
- libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
+ libpostproc52 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libpostproc
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -411,8 -461,7 +456,7 @@@ Section: libdeve
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}.99),
- libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${source:Upstream-Version}),
+ libswscale2 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libswscale
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -421,4 -470,118 +465,4 @@@
This is the video scaling library from Libav.
.
This package contains the header files and static libraries needed to
- compile applications or shared objects that use libswlibav.
+ compile applications or shared objects that use libswscale.
-
-Package: libavutil-extra-51
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavutil51,
- ${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-53
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Replaces:
- libavcodec53
-Breaks:
- libavcodec53,
- 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 libavcodec53 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
-Architecture: all
-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-2
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavfilter2,
- ${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: libpostproc-extra-52
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libpostproc52,
- ${misc:Depends},
-Description: Libav video postprocessing 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-53
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavformat53,
- ${misc:Depends},
-Description: Libav video postprocessing 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: 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 is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
diff --combined debian/rules
index cbf607b,fa5a4a0..7d0aac8
--- a/debian/rules
+++ b/debian/rules
@@@ -1,13 -1,19 +1,19 @@@
#!/usr/bin/make -f
-EPOCH=6:
+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.8-1~
-SHLIBS_VERSION := 6:0.8.3-1~
++SHLIBS_VERSION := $(EPOCH)0.8.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)
- DEV_PKGS := $(shell echo $(LIB_PKGS) | sed 's/[0-9]\+\>/-dev/g')
+ # these package do not build -extra variants
+ LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+ # these packages do build -extra variants
+ LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+ # these packages are the -extra- variants
+ LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+ # these are the -dev packages
+ DEV_PKGS := $(shell echo $(LIB_PKGS) $(LIB_PKGS2) | sed 's/[0-9]\+\>/-dev/g')
# Support multiple makes at once
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@@ -36,7 -42,7 +42,7 @@@ define dh_install_file_opt_flavo
endef
- DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(DEV_PKGS), debian/$(pkg).install)
+ DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(LIB_PKGS2) $(LIB_EXTRA_PKGS) $(DEV_PKGS), debian/$(pkg).install)
$(DH_INSTALL_FILES):
sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
$(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
@@@ -48,12 -54,22 +54,22 @@@ configure-stamp-%
cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
$($*_build_confflags) $(extra_$*_build_confflags)
touch $@
+ configure-extra-stamp-%:
+ dh_testdir
+ mkdir -p debian-extra-$*
+ cd debian-extra-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
+ $($*_build_confflags) $(v3_confflags) $(extra_$*_build_confflags)
+ touch $@
build-%: build-stamp-%
build-stamp-%: configure-stamp-%
dh_testdir
$(MAKE) -C debian-$* $(NUMJOBS) V=1
touch $@
+ build-extra-stamp-%: configure-extra-stamp-%
+ dh_testdir
+ $(MAKE) -C debian-extra-$* $(NUMJOBS) V=1
+ touch $@
debian-shared/tools/qt-faststart: build-stamp-shared
$(MAKE) -C debian-shared tools/qt-faststart V=1
@@@ -61,20 -77,25 +77,25 @@@
build-doxy: build-doxy-stamp
build-doxy-stamp:
dh_testdir
- doxygen
+ [ ! -x /usr/bin/doxygen ] || doxygen
touch $@
- build: build-stamp
+ build: build-stamp build-extra
build-stamp: $(addprefix build-stamp-, $(FLAVORS)) debian-shared/tools/qt-faststart
touch $@
+ build-extra: $(addprefix build-extra-stamp-, $(filter-out static,$(FLAVORS)))
+ touch $@
clean:
dh_testdir
- rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \
+ rm -f build-stamp build-extra $(addprefix build-stamp-, $(FLAVORS)) \
+ $(addprefix build-extra-stamp-, $(FLAVORS)) \
$(addprefix configure-stamp-, $(FLAVORS)) \
+ $(addprefix configure-extra-stamp-, $(FLAVORS)) \
build-doxy-stamp
- rm -rf $(addprefix debian-, $(FLAVORS)) doxy
- dh_clean $(DH_INSTALL_FILES)
+ rm -rf $(addprefix debian-, $(FLAVORS)) \
+ $(addprefix debian-extra-, $(FLAVORS)) doxy
+ dh_clean $(DH_INSTALL_FILES) $(wildcard formats*.txt) $(wildcard codecs*.txt)
get-orig-source:
dh_testdir
@@@ -87,14 -108,19 +108,19 @@@ define install_flavo
endef
- install: build $(DH_INSTALL_FILES)
+ # The trailing newline is important!
+ define install_flavor_extra
+ $(MAKE) -C debian-extra-$(1) install DESTDIR=$(CURDIR)/debian/tmp/extra \
+ mandir=$(CURDIR)/debian/tmp/usr/share/man
+
+ endef
+
+ install: install-common install-extra
+ install-common: build $(DH_INSTALL_FILES)
dh_testdir
dh_testroot
dh_prep
dh_installdirs -ptmp usr/src
- tar czvf debian/tmp/usr/src/libav-source.tar.gz . \
- --exclude 'debian*' --exclude .git --exclude .pc --exclude '*-stamp' \
- --transform 's,^./,libav/,'
dh_installdirs -ptmp usr/share/doc/libav/html etc
dh_installdirs -ptmp usr/share/doc/libav-doc/html
$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
@@@ -103,29 -129,35 +129,36 @@@
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
- dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/libav \
- -Xusr/share/man/man1/ffmpeg.1 -Nffmpeg \
- --fail-missing --sourcedir=debian/tmp
+ dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xffmpeg \
+ -Xffmpeg.1 -Xusr/share/doc/libav-doc \
+ -Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
dh_install -pffmpeg --sourcedir=debian/tmp
-
- formats.txt: install
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
- debian/tmp/usr/bin/avconv -formats | tee $@
-
- codecs.txt: install
+ debian/tmp/usr/bin/avconv -formats | tee formats-$(DEB_HOST_ARCH).txt
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
- debian/tmp/usr/bin/avconv -codecs | tee $@
+ debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
+ dh_installdocs -plibavformat53 formats-$(DEB_HOST_ARCH).txt
+ dh_installdocs -plibavcodec53 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 \
+ --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
+ dh_installdocs -plibavcodec-extra-53 codecs.txt
binary-indep: build-doxy install
- binary-arch: build install codecs.txt formats.txt
+ binary-arch: build install
dh_testdir
dh_testroot
dh_installman -plibav-tools debian/qt-faststart.1
dh_installdocs doc/optimization.txt
dh_installdocs -A debian/README.Debian
- dh_installdocs -p libavcodec53 codecs.txt
- dh_installdocs -p libavformat53 formats.txt
dh_installdocs -p libavcodec-dev -plibavdevice-dev \
-plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
-plibswscale-dev -plibavutil-dev -plibav-doc \
@@@ -137,23 -169,18 +170,18 @@@
dh_link
dh_compress
dh_fixperms
- dh_strip -Nffmpeg --dbg-package=libav-dbg
- dh_strip -pffmpeg --dbg-package=ffmpeg-dbg
+ dh_strip --dbg-package=libav-dbg
- # strict internal dependencies
- for pkg in $(LIB_PKGS); do \
- 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)"; \
+ for pkg in $(LIB_PKGS) $(LIB_EXTRA_PKGS); do \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION))"; \
done
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
- dh_shlibdeps
- # target dependencies for external packages
- for pkg in $(LIB_PKGS); do \
+ for pkg in $(LIB_PKGS2); do \
upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION))"; \
done
+ dh_shlibdeps
dh_installdeb
- dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
+ dh_gencontrol
dh_md5sums
dh_builddeb
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list