[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 17:42:06 UTC 2012
drop unnecessary Provides
empty LIB_EXTRA_PKGS variable for the ubuntu 'libav' main package
bump epoch from 4:->6: for consistency with debian
update debian/changelog
dependency fixups
drop libav-regular-dbg
do not build libav-extra-dbg
Adjust LIB_PKGS/LIB_PKGS2 for ubuntu
merge in changes from libav-extra sister package
build the libav-source tarball iff there is a libav-source package
Revert "Remove libav-source package. No longer necessary."
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: f22bb7a7138fa6e4ab2ef4b198fa845c76895e2e
X-Git-Newrev: d0679790a7beec3cf6d2ba9546404cc59d04826e
The following commit has been merged in the ubuntu.extra branch:
commit 09b52bc92be5f30a651681dd5b4d94e9b9097a11
Merge: f22bb7a7138fa6e4ab2ef4b198fa845c76895e2e e6047f13e789703e24d5a7462e26e3f7ef686d59
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Aug 11 15:20:03 2012 +0200
Merge branch 'ubuntu' into ubuntu.extra
Conflicts:
debian/control
debian/rules
diff --combined debian/changelog
index ca2d7a1,2019cbe..7cbe82e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,16 +1,24 @@@
+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)
+ - do not build libav-extra-dbg, it is build from the libav-extra source
+ package in ubuntu.
+ - drop libav-regular-dbg, not necessary in ubuntu
+ - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
+ - several ifdefs in debian/rules that allow the use of the same file
+ in libav and libav-extra (most of this can be merged into the debian
+ package)
+ - several dependency fixups in debian/control
-- Reinhard Tartler <siretart at tauware.de> Tue, 07 Aug 2012 22:23:55 +0200
@@@ -244,14 -244,6 +252,14 @@@ libav (4:0.8.3-0ubuntu2) quantal; urgen
-- 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:
@@@ -654,34 -646,6 +662,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:
@@@ -702,13 -666,6 +710,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:
@@@ -793,19 -750,6 +801,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:
@@@ -817,14 -761,6 +825,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 ]
@@@ -910,13 -846,6 +918,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:
@@@ -935,26 -864,6 +943,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
@@@ -985,20 -894,6 +993,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:
@@@ -1032,13 -927,6 +1040,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:
@@@ -1067,40 -955,6 +1075,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:
@@@ -1203,26 -1057,6 +1211,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:
@@@ -1261,33 -1095,15 +1269,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:
@@@ -1391,12 -1207,6 +1399,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)
@@@ -1411,27 -1221,14 +1419,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.
@@@ -1441,19 -1238,7 +1449,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
@@@ -1582,15 -1367,6 +1590,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:
@@@ -1796,24 -1572,6 +1804,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:
@@@ -1871,21 -1629,6 +1879,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
@@@ -1923,16 -1666,6 +1931,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 cc6e408,3d0ec89..24fe462
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,8 +1,8 @@@
-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>,
Loïc Minier <lool at debian.org>,
@@@ -15,30 -15,23 +15,30 @@@ 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,
@@@ -46,151 -39,405 +46,154 @@@
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 [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 (<< 6:0.8.3-0ubuntu1)
-Replaces:
- libav-tools (<< 6: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 (<< 6:0.8.3-5),
- libav-regular-dbg (<< 6:0.8.3-5),
- libav-extra-dbg (<< 6:0.8.3-5)
-Breaks:
- ffmpeg-dbg (<< 6:0.8.3-5),
- libav-regular-dbg (<< 6:0.8.3-5),
- libav-extra-dbg (<< 6:0.8.3-5)
-Depends:
- ffmpeg (= ${binary:Version}),
- libav-tools (= ${binary:Version}),
- libavcodec53 (= ${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: 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}
-Conflicts:
- libavutil-extra-51
-Replaces:
- libavutil-extra-51
+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}
-Conflicts:
- libavcodec-extra-53
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libavcodec53
+Replaces: libavcodec53
+ Breaks:
+ 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.
+ 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...).
+ This package is an enhancement to the regular libavcodec library package.
+ This package 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)
+ * OpenCV filtering
+ * Dirac decoding support via libdirac
+ * MP3 encoding with liblame
+ * H.264 encoding via libx264
+ * MPEG4 Part 2 encoding via libxvidcore
+ .
+ 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: libavdevice53
+Package: libavdevice-extra-53
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Replaces:
- libavdevice-extra-53
-Breaks:
- libavdevice-extra-53 (<< 5:0.8.1-2)
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libavdevice53
+Replaces: libavdevice53
Description: Libav device handling library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
+ This is the device handling library from the Libav project.
.
- This is the device handling library from Libav.
+ This package contains a unrestricted version of the libavdevice shared
+ object that should only be used by Debian packages.
-Package: libavformat53
-Architecture: any
+Package: libavfilter-extra-2
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-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.
- .
- It supports most existing file formats (AVI, MPEG, OGG, Matroska,
- ASF...).
-
-Package: libavfilter2
Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-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: libavfilter2
+Replaces: libavfilter2
+Description: Libav video postprocessing library
+ This is the video postprocessing library from Libav.
.
- This is the video filtering library from Libav.
+ This package contains a unrestricted version of the libavfilter shared
+ object that should only be used by Debian packages.
-Package: libpostproc52
-Architecture: any
+Package: libpostproc-extra-52
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
+Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
-Replaces:
- libpostproc-extra-52
-Breaks:
- libpostproc-extra-52 (<< 5:0.8.1-2)
+Conflicts: libpostproc52
+Replaces: libpostproc52
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 the Libav project.
.
- This is the video postprocessing library from Libav.
+ This package contains a unrestricted version of the libpostproc shared
+ object that should only be used by Debian packages.
-Package: libswscale2
-Architecture: any
+Package: libavformat-extra-53
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-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}),
- ${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 (>= ${source:Upstream-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.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavdevice.
-
-Package: libavformat-dev
-Section: libdevel
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.
-
-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.
+ This package contains a unrestricted version of the libavformat shared
+ object that should only be used by Debian packages.
-Package: libpostproc-dev
-Section: libdevel
+Package: libswscale-extra-2
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Architecture: any
-Depends:
- libavutil-dev (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${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.
+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 libpostproc.
+ This package contains a unrestricted version of the libswscale shared
+ object that should only be used by Debian packages.
-Package: libswscale-dev
-Section: libdevel
+Package: libav-extra-dbg
+Section: debug
+Priority: extra
Architecture: any
Depends:
- libavutil-dev (= ${binary:Version}),
- libswscale2 (= ${binary:Version}),
- ${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.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libswscale.
-
-Package: libav-source
-Architecture: all
-Section: devel
-Depends:
+ libav-dbg,
${misc:Depends}
-Description: Patched Libav sources
+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 a tarball the source file that were used to produce
- this package, containing all modifications that have been applied inline.
+ This package contains debug data of the Libav related shared libraries.
.
- This package is used as build-dependency for 'libav-extra', which provides
- the "extra" variants of libav.
+ Most people will not need this package. Please install it to produce useful
+ stacktraces to help debugging the Libav library.
diff --combined debian/rules
index 8dca37d,047a53d..b340383
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,6 +1,6 @@@
#!/usr/bin/make -f
- EPOCH=4:
+ EPOCH=6:
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/-[^-]+$$//')
@@@ -8,11 -8,11 +8,11 @@@ SHLIBS_VERSION := $(EPOCH)0.8.3-1
ifeq ($(DEB_SOURCE),libav)
# 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)
+ LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|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)
+ LIB_PKGS2 :=
# these packages are the -extra- variants
- LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-LIB_EXTRA_PKGS :=
++LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
else
# these package do not build -extra variants
LIB_PKGS :=
@@@ -142,6 -142,13 +142,13 @@@ install-common: build $(DH_INSTALL_FILE
dh_testroot
dh_prep
ifeq ($(DEB_SOURCE), libav)
+ # the libav-source package does exist in some derivatives such as ubuntu, etc.
+ if grep -q 'Package: libav-source' debian/control; then \
+ 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/,' ; \
+ fi
dh_installdirs -ptmp usr/src
dh_installdirs -ptmp usr/share/doc/libav/html etc
dh_installdirs -ptmp usr/share/doc/libav-doc/html
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list