[SCM] ffmpeg/ubuntu: Merge remote branch 'origin/master' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Feb 13 22:26:35 UTC 2011
update debian/changelog
don't libva usage on hurd only
Force upgrade of mplayer pre-rc4 for upgrades of libswscale, Closes: #612292
minor updates to libswscale0's package description
don't enable vaapi support on s390 and the hurd
start new upload
start new upload
update debian/changelog
also for upgrades of the 'mplayer-gui' package (Closes: #611579)
revised package descriptions
sanitize LDFLAGS variable
call gpl_confflags macro properly
simplify lintian-overrides
track 'master' branch
remove README.upstream-upgrade
Merge branch 'master' into master.snapshot
remove note about packages being "Debian-specific"
enable dirac conditionally (not in ubuntu/main)
enable libopenjpeg conditionally (not in ubuntu/main)
sort gpl_confflags
sort build-dependencies alphabetically
add libxfixes-dev to build depends
start new upload
Add myself as uploader.
Single-space indent continuated lines in control file.
bump urgency
update debian/changelog
Fix several security issues in flicvideo.c
finalize debian/changelog
fix x11grab example in e.g. the manpage so that they actually work
add libxfixes-dev to build-depends to unbreak x11grab input, Closes: #596342, LP: #631103
start new upload
finalize changelog
Fix typo: use -march=armv7-a instead of -marmv7-a
merged the last two changelog entries, -3 hasn't been uploaded
Update changelog for last fix
Pass -marmv7-a for the NEON flavor if needed
Initial 4:0.5.2-4 changelog to fix a bug id
confflags: detect armv6t2 support; closes: #594093
Move breaks declaration from libavformat to libavcodec to help the apt solver, Closes: #591881
prepare new upload
update debian/changelog
bump standards version
more elaborate debian/changelog
update debian/changelog
Enable all encoders, Closes: #418231, #433287, #440216
fix debian/control file
add proper replaces for ffpresets move
fix upload target
Update debian/changelog.
Remove fix-ftbfs-altivec.patch, applied upstream.
Remove ffmpeg-debian_hurd.patch, applied upstream.
Merge commit 'upstream/0.5.2'
Imported Upstream version 0.5.2
update debian/changelog
move presets back to 'ffmpeg' package. Closes #581748
Update overrides for new libavcodec52 libraries.
Bumpt to Standards-Version 3.8.4
Fix dependency problem for ffmpeg binary package when using extra ffmpeg libs. This will still leave problem with ffmpeg-dbg, but the debug package will be useless anyway when using extra ffmpeg libs.
new upload
fix ftbfs on powerpc
finalize debian/changelog
Fix compilation on powerpc with --disable-altivec
reintroduce gnu/hurd patch
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: 012f3392c047e6917b9908b35b17623d0ec546c7
X-Git-Newrev: 2580768e5254fd8b62b7ed8bea2a9b91906689c6
The following commit has been merged in the ubuntu branch:
commit 74dd38f86c5d5d0cc295d97807e6f6d6a4711dbb
Merge: 012f3392c047e6917b9908b35b17623d0ec546c7 ee481e32a74e5b863851cee273a6ee83c58a8fb9
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Feb 13 20:03:44 2011 +0100
Merge remote branch 'origin/master' into ubuntu
Conflicts:
debian/changelog
debian/control
debian/gbp.conf
debian/rules
diff --combined debian/changelog
index 0ed069e,4a076e3..28f4b0c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,31 +1,38 @@@
+ ffmpeg (4:0.6.1-5) unstable; urgency=low
+
+ * don't enable vaapi support on the hurd, Closes: #613034
+ * minor updates to libswscale0's package description
+ * Force upgrade of mplayer pre-rc4 for upgrades of libswscale,
+ Closes: #612292
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 13 Feb 2011 09:25:42 +0100
+
+ ffmpeg (4:0.6.1-4) unstable; urgency=low
+
+ * no change rebuild to fix broken last upload.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 06 Feb 2011 09:20:39 +0100
+
+ ffmpeg (4:0.6.1-3) unstable; urgency=low
+
+ * add libxfixes-dev to build depends
+ * minor packaging cleanups
+ * revised package description
+ * detect libopenjpeg and dirac at build-time
+ * remove note about packages being "Debian-specific"
+ * simplify lintian-overrides
+ * Sanitize LDFLAGS variable; it seems that dpkg-buildflags injects
+ -Wl,-Bsymbolic-functions to LDFLAGS, which breaks the build on amd64
+
+ -- 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 ]
@@@ -18,15 -39,6 +46,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
@@@ -36,44 -48,6 +64,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 ]
@@@ -99,18 -73,6 +127,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
@@@ -120,21 -82,6 +148,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
@@@ -151,63 -98,6 +179,66 @@@
* Many upstream changes, see upstream Changelog for details
-- Reinhard Tartler <siretart at tauware.de> Sun, 24 Jan 2010 21:24:56 +0100
++<<<<<<< HEAD
+
+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:
+ - clarifies documentation on metadata, Closes: #570050, LP: #501729
+ - further security backports, Closes: #570713
+ * adapt to new versioning scheme
+ * use '<<' instead of '<' relationship for internal shlib file
+ * merge changes from ubuntu packaging
+ * drop wmapro backport again as discussed with upstream. The unrelated
+ changes seem too risky for a stable release.
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 03 Mar 2010 22:28:24 +0100
+
+ffmpeg (4:0.5+svn20090706-6) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * debian/patches/901-fix-misc-typos.patch: New patch taken from
+ upstream GIT (slightly modified) to fix some spelling errors.
+ * Document our calling of debhelper programs in an odd order in
+ debian/rules.
+
+ [ Reinhard Tartler ]
+ * document some unattributed patches
+ * enable cpu autodetection in libswscale, Closes: #567725, LP: #386397
+
+ [ Christopher Martin ]
+ * backport wmapro codec from ffmpeg trunk
+
+ -- 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
++=======
++>>>>>>> origin/master
ffmpeg (4:0.5+svn20090706-5) unstable; urgency=medium
@@@ -235,7 -125,10 +266,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
@@@ -280,73 -173,6 +311,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
@@@ -363,30 -189,6 +394,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
@@@ -447,31 -249,6 +478,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 ]
@@@ -586,49 -363,6 +617,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)
@@@ -667,13 -401,6 +698,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
@@@ -724,13 -451,6 +755,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)
@@@ -761,16 -481,6 +792,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)
@@@ -780,31 -490,6 +811,31 @@@
-- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 21:37:16 +0100
+ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
+
+ * really disable faad support completely.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:58:01 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
+
+ * drop the patch to dlopen faad at runtime for now. it needs more
+ polishing, and we can have that functionality easier with the 'ffmpeg'
+ source package that will appear in multiverse.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:31:47 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian.
+ * keep myself in the maintainer field. If you are touching this or the
+ 'ffmpeg' package in multiverse, please get in touch with me. Both
+ source packages come from the same packaging branch.
+ * drop dependency on faad.
+ * import patches from old packaging to dlopen libfaad at runtime.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 07:31:16 +0100
+
ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
* upstream svn snapshot (svn revision 15786, libswscale revision 27900).
diff --combined debian/confflags
index da57f23,029a075..d597414
--- a/debian/confflags
+++ b/debian/confflags
@@@ -7,10 -7,10 +7,10 @@@ FLAVORS := stati
# shared is generic, i.e. without arch specific opcodes
FLAVORS += shared
--export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
--export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN")
@@@ -88,11 -88,8 +88,12 @@@ ende
# Configuration flags causing the libs to be GPL tainted
gpl_confflags += --enable-gpl
gpl_confflags += --enable-postproc
++gpl_confflags += --enable-swscale
gpl_confflags += --enable-x11grab
+# there is no libfaad in ubuntu/main, on in ubuntu/multiverse
+gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
+
# Common configuration flags
confflags += --extra-version='$(DEB_VERSION)'
confflags += --prefix=/usr
@@@ -105,17 -102,16 +106,15 @@@ confflags += --enable-libschroedinge
confflags += --enable-libspeex
confflags += --enable-libtheora
confflags += --enable-libvorbis
- confflags += --enable-vaapi
confflags += --enable-pthreads
confflags += --enable-zlib
confflags += --enable-libvpx
confflags += --disable-stripping
confflags += --enable-runtime-cpudetect
--
--# for mysterical reasons, the aac decoder seem to cause the bss segment
--# to grow to big on ia64, disable it until the toolchain gets fixed
--ifeq ($(DEB_HOST_ARCH),ia64)
--confflags += --disable-decoder=aac --disable-encoder=aac
++ifeq ($(DEB_HOST_ARCH),armel)
++# this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
++# plenty of incompatible assembly; not sure how to detect that properly
++confflags += --extra-cflags="-marm -fPIC -DPIC"
endif
ifeq ($(DEB_HOST_ARCH),powerpc)
@@@ -124,17 -120,23 +123,19 @@@ endi
confflags += $(extra_common_confflags)
+ # vaapi is not available on s390 and on the hurd
+ confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
+
# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
+ gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
- gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
- gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
- gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
+ gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
+ gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
+ gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
- # Opencore-amr requires GPL v3
- v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
- v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)
+ confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
-# Opencore-amr requires GPL v3
-v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
-v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)
-
# AAC is considered non-free upstream
confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
@@@ -148,8 -150,9 +149,9 @@@ ifneq (,$(findstring linux,$(DEB_HOST_G
lib1394-dev += libraw1394-dev, libdc1394-22-dev
endif
- # XXX this probably needs fixing
+ # Sanitize injected compiler in linker flags
CFLAGS :=
+ LDFLAGS :=
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
# Various parts of ffmpeg (and swscale) FTBFS when compiling with -fPIC
diff --combined debian/control
index 27c61b6,dd39128..09abd01
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
Source: ffmpeg
Section: libs
Priority: optional
-Maintainer: Debian multimedia packages 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>,
Reinhard Tartler <siretart at tauware.de>,
@@@ -19,25 -18,29 +19,25 @@@ Build-Depends: debhelper (>= 7)
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libbz2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
- libopenjpeg-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- librtmp-dev (>= 2.2e-4),
libschroedinger-dev,
libsdl1.2-dev,
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
+ libva-dev [!hurd-i386],
+ libvdpau-dev,
libvorbis-dev,
+ libvpx-dev,
libx11-dev,
libxext-dev,
libxfixes-dev,
- libvdpau-dev,
- libvpx-dev,
libxvmc-dev,
quilt,
texi2html,
yasm [i386 amd64],
- libva-dev,
zlib1g-dev
Package: ffmpeg
@@@ -48,7 -51,7 +48,7 @@@ Replaces: libavcodec52 (<< ${source:Ver
Depends: ${shlibs:Depends},
${misc:Depends}
Conflicts: ffprobe
- Description: multimedia player, server and encoder
+ Description: Multimedia player, server, encoder and transcoder
This package contains the ffplay multimedia player, the ffserver streaming
server and the ffmpeg audio and video encoder. They support most existing
file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
@@@ -66,7 -69,7 +66,7 @@@ Depends: libavutil50 (= ${binary:Versio
libswscale0 (= ${binary:Version}),
ffmpeg (= ${binary:Version}),
${misc:Depends}
- Description: Debug symbols for ffmpeg related packages
+ Description: Debug symbols for FFmpeg related packages
This package contains debug data of the ffmpeg related shared libraries.
.
Most people will not need this package. Please install it to produce useful
@@@ -76,83 -79,68 +76,68 @@@ Package: ffmpeg-do
Section: doc
Architecture: all
Depends: ${misc:Depends}
- Description: documentation of the ffmpeg API
- This package contains the html doxygen documentation of the ffmpeg API.
+ Description: Documentation of the FFmpeg API
+ This package contains the html doxygen documentation of the FFmpeg API.
+ .
+ Only application developers will find this package useful.
Package: libavutil50
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Description: ffmpeg utility library
- This is the common utility library from the ffmpeg project. It is required
- by all other ffmpeg libraries.
- .
- This package contains a Debian-specific version of the libavutil shared
- object that should only be used by Debian packages.
+ Description: FFmpeg utility library
+ This is the common utility library from FFmpeg. It contains shared code
+ used by all other ffmpeg libraries.
Package: libavcodec52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Breaks: libavcodec51 (<< 3:0.svn20090303-1)
- Description: ffmpeg codec library
- This is the codec library from the ffmpeg project. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
+ Description: FFmpeg codec library
+ This is the codec library from FFmpeg (both encoding and decoding).
.
- This package contains a Debian-specific version of the libavcodec shared
- object that should only be used by Debian packages.
+ It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
Package: libavdevice52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Description: ffmpeg device handling library
- This is the device handling library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libavdevice shared
- object that should only be used by Debian packages.
+ Description: FFmpeg device handling library
+ This is the device handling library from FFmpeg.
Package: libavformat52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Breaks: mplayer (<< 2:1.0~rc4~)
- Description: ffmpeg file format library
- This is the demuxer library from the ffmpeg project. It supports most
- existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
+ Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~)
+ Description: FFmpeg file format library
+ This is the library for handling file formats from FFmpeg.
.
- This package contains a Debian-specific version of the libavformat shared
- object that should only be used by Debian packages.
+ It supports most existing file formats (AVI, MPEG, OGG, Matroska,
+ ASF...).
Package: libavfilter1
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Description: ffmpeg video filtering library
- This is the video filtering library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libavfilter shared
- object that should only be used by Debian packages.
+ Description: FFmpeg video filtering library
+ This is the video filtering library from FFmpeg.
Package: libpostproc51
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Description: ffmpeg video postprocessing library
- This is the video postprocessing library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libpostproc shared
- object that should only be used by Debian packages.
+ Description: FFmpeg video postprocessing library
+ This is the video postprocessing library from FFmpeg.
Package: libswscale0
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Description: ffmpeg video scaling library
- This is the video scaling library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libswscale shared
- object that should only be used by Debian packages.
+ Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~)
+ Description: FFmpeg video scaling library
+ This is the video software scaling library from FFmpeg.
Package: libavutil-dev
Section: libdevel
@@@ -160,9 -148,8 +145,8 @@@ Architecture: an
Depends: libavutil50 (>= ${binary:Version}) | libavutil-extra-50 (>= ${source:Upstream-Version}),
libavutil50 (<= ${source:Upstream-Version}-99) | libavutil-extra-50 (<= ${source:Upstream-Version}-99),
${misc:Depends}
- Description: development files for libavutil
- This is the common utility library from the ffmpeg project. It is required
- by all other ffmpeg libraries.
+ Description: Development files for libavutil
+ This is the common utility library from FFmpeg.
.
This package contains the header files and static libraries needed to
compile applications or shared objects that use libavutil.
@@@ -185,8 -172,8 +169,8 @@@ Suggests: libfaad-dev
libxext-dev,
zlib1g-dev,
${lib1394-dev}
- Description: development files for libavcodec
- This is the codec library from the ffmpeg project. It supports most existing
+ Description: Development files for libavcodec
+ This is the codec library from FFmpeg. It supports most existing
encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
.
This package contains the header files and static libraries needed to
@@@ -199,8 -186,8 +183,8 @@@ Depends: libavdevice52 (>= ${binary:Ver
libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-extra-52 (<= ${source:Upstream-Version}-99),
libavformat-dev (= ${binary:Version}),
${misc:Depends}
- Description: development files for libavdevice
- This is the device handling library from the ffmpeg project.
+ Description: Development files for libavdevice
+ This is the device handling library from FFmpeg.
.
This package contains the header files and static libraries needed to
compile applications or shared objects that use libavdevice.
@@@ -212,8 -199,8 +196,8 @@@ Depends: libavformat52 (>= ${binary:Ver
libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-extra-52 (<= ${source:Upstream-Version}-99),
libavcodec-dev (= ${binary:Version}),
${misc:Depends}
- Description: development files for libavformat
- This is the demuxer library from the ffmpeg project. It supports most
+ Description: Development files for libavformat
+ This is the demuxer library from FFmpeg. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
.
This package contains the header files and static libraries needed to
@@@ -226,8 -213,8 +210,8 @@@ Depends: libavfilter1 (>= ${binary:Vers
libavfilter1 (<= ${source:Upstream-Version}-99) | libavfilter-extra-1 (<= ${source:Upstream-Version}-99),
libavcodec-dev (= ${binary:Version}),
${misc:Depends}
- Description: development files for libavfilter
- This is the video filtering library from the ffmpeg project.
+ Description: Development files for libavfilter
+ This is the video filtering library from FFmpeg.
.
This package contains the header files and static libraries needed to
compile applications or shared objects that use libavfilter.
@@@ -239,8 -226,8 +223,8 @@@ Depends: libpostproc51 (>= ${binary:Ver
libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-extra-51 (<= ${source:Upstream-Version}-99),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
- Description: development files for libpostproc
- This is the video postprocessing library from the ffmpeg project.
+ Description: Development files for libpostproc
+ This is the video postprocessing library from FFmpeg.
.
This package contains the header files and static libraries needed to
compile applications or shared objects that use libpostproc.
@@@ -252,8 -239,8 +236,8 @@@ Depends: libswscale0 (>= ${binary:Versi
libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-0 (<= ${source:Upstream-Version}-99),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
- Description: development files for libswscale
- This is the video scaling library from the ffmpeg project.
+ Description: Development files for libswscale
+ This is the video scaling library from FFmpeg.
.
This package contains the header files and static libraries needed to
compile applications or shared objects that use libswscale.
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list