[SCM] libav/ubuntu.extra: Merge branch 'ubuntu' into ubuntu.extra
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Aug 11 07:37:06 UTC 2012
update debian/changelogg
remove frei0r-plugins-dev, vo-aacenc and vo-amrenc from build depends
minimize changes to debian
update debian/changelog
merge changes from debian
Imported Debian patch 4:0.8.3-0ubuntu3
Imported Debian patch 4:0.8.3-0ubuntu2
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
ffmpeg: update conflicts/replaces on libav-tools
Moved all ffmpeg binaries and manpages to ffmpeg package (LP: #1011136)
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.extra
X-Git-Reftype: branch
X-Git-Oldrev: ebeb62c811db7c9ca72a72db254e48a42e358cb3
X-Git-Newrev: f22bb7a7138fa6e4ab2ef4b198fa845c76895e2e
The following commit has been merged in the ubuntu.extra branch:
commit c3a4a073d663368ff6e0ef708eac03bffc52cbf0
Merge: ebeb62c811db7c9ca72a72db254e48a42e358cb3 6cd595be8940a632107042882e971cd83a7da1e6
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Aug 10 19:55:08 2012 +0200
Merge branch 'ubuntu' into ubuntu.extra
Conflicts:
debian/changelog
debian/control
debian/patches/series
debian/rules
diff --combined debian/changelog
index 0f8d1c8,2e7d159..7316044
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,241 +1,257 @@@
++libav-extra (4:0.8.3.6ubuntu1) quantal; urgency=low
++
++ * Merge from 'libav' package in main.
++ - build against dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore,
++ opencv, opencore (for AMR wb&nb and vo-aacenc)
++
++ -- Reinhard Tartler <siretart at tauware.de> Fri, 10 Aug 2012 19:53:56 +0200
++
+ 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)
+
+ -- 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
+
+ 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-extra (4:0.8.3.0ubuntu1) quantal; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore,
+ opencv, opencore (for AMR wb&nb),
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 10 Jun 2012 21:00:18 +0200
+
libav (4:0.8.3-0ubuntu1) quantal; urgency=low
* New Upstream releases:
@@@ -15,13 -245,18 +261,21 @@@
+ 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).
+ 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
++<<<<<<< HEAD
++=======
+ * 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)
++>>>>>>> ubuntu
-- Reinhard Tartler <siretart at tauware.de> Sun, 10 Jun 2012 20:24:59 +0200
@@@ -403,34 -638,6 +657,34 @@@ libav (4:0.7-1ubuntu2) oneiric; urgency
-- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jul 2011 15:29:06 +0200
+libav-extra (4:0.7-1ubuntu5) oneiric; urgency=low
+
+ * Cleanup after LP #802116, fixes LP: #804452
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 01 Jul 2011 21:58:13 +0200
+
+libav-extra (4:0.7-1ubuntu4) oneiric; urgency=low
+
+ * complete renaming of libswscale-extra-1 to libswscale-extra-2 package,
+ fixes FTBFS.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 27 Jun 2011 09:19:07 +0200
+
+libav-extra (4:0.7-1ubuntu3) oneiric; urgency=low
+
+ * Rename libswscale-extra-1 to libswscale-extra-2 to follow
+ forgotten SONAME change. LP: #802116
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 27 Jun 2011 08:33:38 +0200
+
+libav-extra (4:0.7-1ubuntu2) oneiric; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+ * Tighten build dependency on libav-source
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 22 Jun 2011 10:51:30 +0200
+
libav (4:0.7-1ubuntu1) oneiric; urgency=low
* Merge from debian. Remaining changes:
@@@ -451,13 -658,6 +705,13 @@@ libav (4:0.7-1) experimental; urgency=l
-- Reinhard Tartler <siretart at tauware.de> Tue, 21 Jun 2011 07:49:59 +0200
+libav-extra (4:0.7~rc1-1ubuntu1) oneiric; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 18 Jun 2011 17:10:08 +0200
+
libav (4:0.7~rc1-1ubuntu1) oneiric; urgency=low
* Merge from debian. Remaining changes:
@@@ -542,19 -742,6 +796,19 @@@ libav (4:0.7~b1-1) experimental; urgenc
-- Reinhard Tartler <siretart at tauware.de> Tue, 19 Apr 2011 15:04:55 +0200
+libav-extra (4:0.6.2-1ubuntu2) natty; urgency=low
+
+ * fix path to powerpc extradoc
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 24 Mar 2011 15:42:35 +0100
+
+libav-extra (4:0.6.2-1ubuntu1) natty; urgency=low
+
+ * rename to libav-extra
+ * remove all sources from branch and rely on libav-source package instead
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 20 Mar 2011 10:48:16 +0100
+
libav (4:0.6.2-1ubuntu1) natty; urgency=low
* Merge from debian. Remaining changes:
@@@ -566,14 -753,6 +820,14 @@@
-- Reinhard Tartler <siretart at tauware.de> Sun, 20 Mar 2011 12:09:31 +0100
+ffmpeg-extra (4:0.6.1-2ubuntu1) natty; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+ * force upgrade of the mplayer package
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 19 Nov 2010 12:15:19 +0100
+
libav (4:0.6.2-1) unstable; urgency=medium
[ Reinhard Tartler ]
@@@ -659,13 -838,6 +913,13 @@@ ffmpeg (4:0.6.1-2) experimental; urgenc
-- Reinhard Tartler <siretart at tauware.de> Fri, 19 Nov 2010 10:50:51 +0100
+ffmpeg-extra (4:0.6.1-1ubuntu1) natty; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 14 Nov 2010 21:03:40 +0100
+
ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
* Merge from debian. Remaining changes:
@@@ -684,26 -856,6 +938,26 @@@ ffmpeg (4:0.6.1-1) experimental; urgenc
-- Reinhard Tartler <siretart at tauware.de> Mon, 01 Nov 2010 09:18:08 +0100
+ffmpeg-extra (4:0.6-2ubuntu5) natty; urgency=low
+
+ * Remove dummy packages with 'unstripped' notation
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 14 Nov 2010 11:35:26 +0100
+
+ffmpeg-extra (4:0.6-2ubuntu4) natty; urgency=low
+
+ * sort build-deps alphabetically
+ * build against librtmp-dev, closes LP: #673850
+ * Bump Standards Version
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 12 Nov 2010 17:50:19 +0100
+
+ffmpeg-extra (4:0.6-2ubuntu3) maverick; urgency=low
+
+ * merge changes from 'ffmpeg' package
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 05 Oct 2010 21:40:28 +0200
+
ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low
* fix dependency on libswscale-extra-0, LP: #637895
@@@ -734,20 -886,6 +988,20 @@@ ffmpeg (4:0.6-2ubuntu2) maverick; urgen
-- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jul 2010 20:38:27 -0400
+ffmpeg-extra (4:0.6-2ubuntu2) maverick; urgency=low
+
+ * Add libxfixes-dev to build-depends, LP: #631103. Thanks to
+ Dominic Evans for the initial patch against ffmpeg.
+
+ -- Stefan Potyra <sistpoty at ubuntu.com> Sun, 19 Sep 2010 13:55:05 +0200
+
+ffmpeg-extra (4:0.6-2ubuntu1) maverick; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 16 Jun 2010 13:04:08 +0200
+
ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
* merge from debian/experimental. remaining changes:
@@@ -781,13 -919,6 +1035,13 @@@ ffmpeg (4:0.6-2) experimental; urgency=
-- Reinhard Tartler <siretart at tauware.de> Tue, 29 Jun 2010 09:07:56 +0200
+ffmpeg-extra (4:0.6-1ubuntu1) maverick; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 16 Jun 2010 13:04:08 +0200
+
ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low
* merge from debian/experimental. remaining changes:
@@@ -816,40 -947,6 +1070,40 @@@ ffmpeg (4:0.6~svn20100505-1ubuntu2) mav
-- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 11:33:32 +0200
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu5) maverick; urgency=low
+
+ * install files into libavfilter-extra-1.install. LP: #587424
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 22:07:30 +0200
+
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu4) maverick; urgency=low
+
+ * bump soname for package libavutil49->libavutil50
+ * fix installation rule, LP: #587424
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 11:42:48 +0200
+
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu3) maverick; urgency=low
+
+ * remove all install rules that are related to non-library packages
+ Fixes FTBFS
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 28 May 2010 15:09:06 +0200
+
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
+
+ * don't try install html files, we don't build ffmpeg-doc in ffmpeg-extra
+ Fixes FTBFS
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 28 May 2010 13:34:02 +0200
+
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
+
+ * merge from 'main' package. Changes
+ - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 May 2010 07:49:18 +0200
+
ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
* merge from debian/experimental. remaining changes:
@@@ -952,26 -1049,6 +1206,26 @@@ ffmpeg (4:0.5.1-2) unstable; urgency=lo
-- Reinhard Tartler <siretart at tauware.de> Wed, 10 Mar 2010 21:19:40 +0100
+ffmpeg-extra (4:0.5.1-2) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Prepare new upload for Debian.
+ * Update gbp.conf for master.extra branch.
+ * Bump Standards-Version to 3.8.4.
+ * Don't include build-depends-indep when only building arch-dependent
+ packages.
+ * Include ${misc:Depends} for all packages.
+ * Set the team as maintainers.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sat, 08 May 2010 02:46:46 -0400
+
+ffmpeg-extra (4:0.5.1-1ubuntu1) lucid; urgency=low
+
+ * merge from 'main' package. Changes
+ - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 04 Mar 2010 13:08:25 +0100
+
ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
* merge from debian. remaining changes:
@@@ -1010,33 -1087,15 +1264,33 @@@ 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
+ffmpeg-extra (4:0.5+svn20090706-5ubuntu4) lucid; urgency=low
* tighten build dependency on new x264 package
- * add x264 backport for ffmpeg 0.5
+ * add libx264 wrapper 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-extra (4:0.5+svn20090706-5ubuntu3) lucid; urgency=low
+
+ * rebuild for ffmpeg versioned symbols
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 19 Jan 2010 20:55:30 +0100
+
+ffmpeg-extra (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
+
+ * No-change rebuild against new dirac package synced from Debian
+
+ -- Iain Lane <laney at ubuntu.com> Sun, 17 Jan 2010 17:41:48 +0000
+
+ffmpeg-extra (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
+
+ * merge from 'ubuntu' branch
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 17 Jan 2010 09:34:54 +0100
+
ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
* merge from debian, remaining changes:
@@@ -1140,12 -1199,6 +1394,12 @@@ ffmpeg (4:0.5+svn20090706-2ubuntu4) luc
-- Reinhard Tartler <siretart at tauware.de> Mon, 21 Dec 2009 23:57:34 +0100
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
+
+ * merge from 'ffmpeg' package
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 10 Nov 2009 13:18:24 +0100
+
ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
* security backports from ffmpeg trunk (Closes: #550442)
@@@ -1160,27 -1213,14 +1414,27 @@@
-- Reinhard Tartler <siretart at tauware.de> Thu, 05 Nov 2009 20:31:29 +0100
-ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu3) karmic; urgency=low
+
+ * make the conflicts/replaces on the former -unstripped- variants
+ versioned so the -unstripped- and -extra- variants can actually be
+ coinstalled.
+ * remove references to obsolete 'cvs' packages. these have never existed
+ in ubuntu after all.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 16 Oct 2009 10:29:16 +0200
+
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
[ Reinhard Tartler ]
+ * merge from the 'ffmpeg' package
* 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
+ * Add missing Conflicts/Replaces to ensure a working upgrade patch from
+ intrepid/jaunty. LP: #418785
[ Loïc Minier ]
* Update config for karmic's armel toolchain.
@@@ -1190,19 -1230,7 +1444,19 @@@
* 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
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 14 Oct 2009 09:15:50 +0200
+
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
+
+ * merge from the 'ffmpeg' package
+ * enable dirac, libopenjpeg
+ * reintroduce the formats.txt file
+ * reintroduce "missing" codecs: LP: #419103
+ * is co-installable with the -dev packages LP: #416436, #418168
+ * should now have the proper replaces lines: LP: #418789, #418799, #418807, #323789
+ * don't build doxygen documentation, it is not installed anyway
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 11:50:32 +0200
ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
@@@ -1331,15 -1359,6 +1585,15 @@@ ffmpeg-debian (4:0.5+svn20090609-1ubunt
-- Reinhard Tartler <siretart at tauware.de> Fri, 24 Jul 2009 21:53:47 +0200
+ffmpeg (4:0.5+svn20090609-1ubuntu1+unstripped1) karmic; urgency=low
+
+ * prepare new upload
+ * update gbp.conf
+ * move gbp.conf to debian/
+ * regroup build dependencies to minimize the diff
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 24 Jul 2009 19:45:26 +0200
+
ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low
* merge from debian. Remaining changes:
@@@ -1545,24 -1564,6 +1799,24 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
-- Reinhard Tartler <siretart at tauware.de> Sun, 22 Feb 2009 09:32:49 +0100
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped3) jaunty; urgency=low
+
+ * add conflicts replaces for libavfilter0, LP: #322570
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 09 Mar 2009 18:24:56 +0100
+
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped2) jaunty; urgency=low
+
+ * add correct epoch in the "internal" shlibs generation
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 06 Feb 2009 15:24:58 +0100
+
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped1) jaunty; urgency=low
+
+ * rebuild using a clean, uncrippled ffmpeg tarball
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Feb 2009 21:45:05 +0100
+
ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
* merge from debian. Remaining changes:
@@@ -1620,21 -1621,6 +1874,21 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 19:54:27 +0100
+ffmpeg (3:0.svn20090119-1ubuntu1+unstripped2) jaunty; urgency=low
+
+ * add conflicts/replaces on libavfilter0. LP: #323789
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 18:45:46 +0100
+
+ffmpeg (3:0.svn20090119-1ubuntu1+unstripped1) jaunty; urgency=low
+
+ * merge with the ubuntu.jaunty branch
+ * reenable x264 LP: #303537
+ * build against vdpau
+ * enable xvmc support
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 20 Jan 2009 17:51:19 +0100
+
ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
* merge from debian. LP: #318501
@@@ -1672,16 -1658,6 +1926,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jan 2009 20:55:48 +0100
+ffmpeg (3:0.svn20081115-1ubuntu1+unstripped1) jaunty; urgency=low
+
+ * build unstripped version for multiverse.
+ * enable additional external libraries:
+ - libmp3lame-dev
+ - libfaac-dev
+ - libxvidcore-dev
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:50:42 +0100
+
ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
* merge from debian.
diff --combined debian/control
index 3f5f16e,2641167..3937d3d
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,11 +1,11 @@@
-Source: libav
+Source: libav-extra
Section: libs
Priority: optional
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>
++XSBC-Original-Maintainer: Debian Multimedia 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>,
@@@ -15,164 -15,451 +15,166 @@@ Standards-Version: 3.9.
Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
Homepage: http://libav.org/
-Build-Depends-Indep:
- doxygen
Build-Depends:
- debhelper (>= 8.1.3~),
+ debhelper (>= 9),
libasound2-dev [linux-any],
+ libav-source (>= 4:0.8.3-0ubuntu1),
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 | libxvidcore4-dev,
libxvmc-dev,
texi2html,
- yasm,
+ yasm [any-amd64 any-i386],
zlib1g-dev
-Package: libav-tools
-Section: video
-Architecture: any
-Replaces:
- ffmpeg (<< 4:0.8~),
- libavcodec-extra-53 (<< 4:0.6~),
- libavcodec53 (<< ${source:Version})
-Pre-Depends:
- dpkg (>= 1.15.7.2~)
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- ffmpeg (<< 4:0.8~)
-Conflicts:
- ffprobe
-Description: Multimedia player, server, encoder and transcoder
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the avplay multimedia player, the avserver
- 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...). 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},
- ${shlibs:Depends}
-Description: Multimedia player, server, encoder and transcoder (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the deprecated ffmpeg program. This package also serves
- as a transitional package to libav-tools. Users are advised to use avconv from
- the libav-tools package instead of ffmpeg.
-
-Package: ffmpeg-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 serves as a transitional package to libav-dbg.
-
-Package: libav-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Replaces:
- 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 (<< 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}) | libavcodec-extra-53 (= ${binary:Version}),
- libavdevice53 (= ${binary:Version}),
- libavformat53 (= ${binary:Version}),
- libavutil51 (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
- libswscale2 (= ${binary:Version}),
- ${misc:Depends}
-Description: Debug symbols for Libav related packages
- 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 library.
-
-Package: libav-regular-dbg
-Section: oldlibs
-Priority: extra
-Architecture: any
-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 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 serves as a transitional package to libav-dbg.
-
-Package: ffmpeg-doc
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libav-doc,
- ${misc:Depends}
-Description: Documentation of the Libav API (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the html doxygen documentation of the Libav API.
- .
- Only application developers will find this package useful.
- .
- This package is only used for transitional purposes and can be safely
- removed.
-
-Package: libav-doc
-Section: doc
-Architecture: all
-Depends:
- ${misc:Depends}
-Breaks:
- ffmpeg-doc (<< ${binary:Version})
-Replaces:
- ffmpeg-doc (<< ${binary:Version})
-Description: Documentation of the Libav API
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the html doxygen documentation of the Libav API.
- .
- Only application developers will find this package useful.
-
-Package: libavutil51
+Package: libavutil-extra-51
Architecture: any
Multi-Arch: same
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)
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libavutil51
+Replaces: libavutil51
Description: Libav utility library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
+ This is the common utility library from the Libav project. It is required
+ by all other Libav libraries.
.
- This is the common utility library from Libav. It contains shared code
- used by all other Libav libraries.
+ This package contains a unrestricted version of the libavutil shared
+ object that should only be used by Debian packages.
-Package: libavcodec53
+Package: libavcodec-extra-53
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- libavcodec-extra-53,
- mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libavcodec53
+Replaces: libavcodec53
Description: Libav codec library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
+ This package contains the ffplay multimedia player, the ffserver streaming
+ server and the Libav audio and video encoder. They support most existing
+ file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
+ DivX, MPEG4, AC3, DV...).
.
This is the codec library from Libav (both encoding and decoding).
.
- It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
-
-Package: libavdevice53
-Architecture: any
-Multi-Arch: same
-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.
+ This package is an enhancement to the regular libavcodec library package.
+ This package contains the following additional codecs.
.
- This is the device handling library from Libav.
-
-Package: libavformat53
-Architecture: any
-Multi-Arch: same
-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.
- .
- This is the library for handling file formats from Libav.
+ * 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)
+ * OpenCV filtering
+ * Dirac decoding support via libdirac
+ * MP3 encoding with liblame
+ * H.264 encoding via libx264
+ * MPEG4 Part 2 encoding via libxvidcore
.
- It supports most existing file formats (AVI, MPEG, OGG, Matroska,
- ASF...).
+ Because this package links against libraries that are licensed
+ under Apache License 2.0, the resulting binaries are distributed under the
+ GPL version 3.
-Package: libavfilter2
+Package: libavdevice-extra-53
Architecture: any
Multi-Arch: same
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.
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libavdevice53
+Replaces: libavdevice53
+Description: Libav device handling library
+ This is the device handling library from the Libav project.
.
- This is the video filtering library from Libav.
+ This package contains a unrestricted version of the libavdevice shared
+ object that should only be used by Debian packages.
-Package: libpostproc52
-Architecture: any
+Package: libavfilter-extra-2
Multi-Arch: same
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)
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libavfilter2
+Replaces: libavfilter2
Description: Libav video postprocessing library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
This is the video postprocessing library from Libav.
+ .
+ This package contains a unrestricted version of the libavfilter shared
+ object that should only be used by Debian packages.
-Package: libswscale2
-Architecture: any
+Package: libpostproc-extra-52
Multi-Arch: same
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.
- .
- This is the video software scaling library from Libav.
-
-Package: libavutil-dev
-Section: libdevel
Architecture: any
-Depends:
- libavutil51 (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libavutil
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the common utility library from Libav.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavutil.
-
-Package: libavcodec-dev
-Section: libdevel
-Architecture: any
-Depends:
- 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
-Description: Development files for libavcodec
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the codec library from Libav. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavcodec.
-
-Package: libavdevice-dev
-Section: libdevel
-Architecture: any
-Depends:
- libavdevice53 (= ${binary:Version}),
- libavformat-dev (= ${binary:Version}),
- ${misc:Depends}
-Description: Development files for libavdevice
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the device handling library from Libav.
+Conflicts: libpostproc52
+Replaces: libpostproc52
+Description: Libav video postprocessing library
+ This is the video postprocessing library from the Libav project.
.
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavdevice.
+ This package contains a unrestricted version of the libpostproc shared
+ object that should only be used by Debian packages.
-Package: libavformat-dev
-Section: libdevel
+Package: libavformat-extra-53
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Architecture: any
-Depends:
- libavcodec-dev (= ${binary:Version}),
- libavformat53 (= ${binary:Version}),
- libavutil-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libavformat
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the demuxer library from Libav. It supports most
+Conflicts: libavformat53
+Replaces: libavformat53
+Description: Libav file format library
+ This is the demuxer library from the Libav project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
.
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavformat.
+ This package contains a unrestricted version of the libavformat shared
+ object that should only be used by Debian packages.
-Package: libavfilter-dev
-Section: libdevel
-Architecture: any
-Depends:
- libavcodec-dev (= ${binary:Version}),
- libavfilter2 (= ${binary:Version}),
- ${misc:Depends}
-Description: Development files for libavfilter
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video filtering library from Libav.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavfilter.
-
-Package: libpostproc-dev
-Section: libdevel
-Architecture: any
-Depends:
- libavutil-dev (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
- ${misc:Depends}
-Description: Development files for libpostproc
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video postprocessing library from Libav.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libpostproc.
-
-Package: libswscale-dev
-Section: libdevel
+Package: libswscale-extra-2
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Architecture: any
-Depends:
- libavutil-dev (= ${binary:Version}),
- libswscale2 (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libswscale
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video scaling library from Libav.
+Conflicts: libswscale-extra-1 (>> 4:0.7~), libswscale2
+Replaces: libswscale-extra-1 (>> 4:0.7~), libswscale2
+Description: Libav video scaling library
+ This is the video scaling library from the Libav project.
.
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libswscale.
+ This package contains a unrestricted version of the libswscale shared
+ object that should only be used by Debian packages.
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list