[SCM] FFmpeg packaging branch, ubuntu.jaunty, updated. debian/0.svn20090303-1ubuntu1.ppa1-17-g29734a4
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Mar 21 13:40:34 UTC 2009
The following commit has been merged in the ubuntu.jaunty branch:
commit 993e32d06190c9596fab63f49587a382a52c0292
Merge: 8e60bb8d9ce83673126e849036adb6ef3a3ec3d1 3d2ab017eb235bd9ed9d9ec3ab895ef751ab1557
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Mar 7 20:10:09 2009 +0100
Merge branch 'master' into ubuntu.intrepid.ppa
diff --combined debian/changelog
index 5806d11,fc3f67b..8ad3cb4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,130 +1,155 @@@
+ ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
+
+ * New Upstream Version (svn revision 17737 libswscale revision 28799)
+ - Electronic Arts TQI decoder
+ - OpenJPEG based JPEG 2000 decoder
+ - NC (NC4600) camera file demuxer
+ - Gopher client support
+ - MXF D-10 muxer
+ - generic metadata API
+ * debian/get-orig-source.sh: Track the version 0.5 release branch. The
+ version number does not really reflect this, but this package is
+ actually very close to the 0.5 release branch.
+ * various cleanups to improve get-orig-source.sh
+ * Remove liba52 from the suggests field in debian/control.ffmpeg, as
+ ffmpeg does no longer use it since upload 0.svn20080206-10.
+ * Fix the Vcs-Git urls to the correct locations.
+ * The libavformat52 now links against libavcodec52, which breaks
+ applications that *ALSO* link against libavcodec51. Adding a
+ Breaks: libavcodec51 should prevent this and (hopefully) Closes: #516885.
+ * improve parallel builds on SMP/multicores by supporting the parallel
+ flag in DEB_BUILD_OPTIONS, and default to the number of available CPUs
+ on i386 and amd64.
+ * Drop unapplied patches from debian/patches.
+ * bump shlibs version.
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 03 Mar 2009 21:01:25 +0100
+
+ ffmpeg-debian (3:0.svn20090204-3) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * remove libasound2-dev from build-depends on non-Linux archs
+
+ [ Reinhard Tartler ]
+ * fix postinst generation by calling dh_installdeb after dh_makeshlibs
+ * upload to unstable
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 22 Feb 2009 09:32:49 +0100
+
+ ffmpeg-debian (3:0.svn20090204-2) experimental; urgency=low
+
+ * add libxvmc-dev to build-depends in the 'ffmpeg' variant
+ * add libasound2-dev to build-depends. This means that ffplay is now able to
+ actually play using alsa directly instead only via libsdl
+ * add epochs for the "internal" shlibs dependencies
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Feb 2009 20:30:05 +0100
+
+ ffmpeg-debian (3:0.svn20090204-1) experimental; urgency=low
+
+ [ Reinhard Tartler ]
+ * New Upstream Version (svn revision 16978 libswscale revision 28461)
+
+ Upstream Changes:
+ - R3D REDCODE demuxer
+ - ALSA support for playback and record
+
+ * strighten internal dependencies by using a shlibs.local file
+ Closes: #512844, #512466
+ * New upstream version reintroduces a compatibility symbol ff_gcd
+ Closes: #512946
+ * Bump shlibs because of changes of the Metadata API in libavformat.
+ Actually no other package should use them yet, but let's better play safe
+ here...
+ * no longer install dsputil.h. It exposes lots of function that are private
+ to ffmpeg and may change on any new upstream revision. Please get in touch
+ with the ffmpeg maintainers if you maintain packages that rely on that
+ ffmpeg internal headers like this.
+ * simplify debian/confflags by doing autodetection of headers:
+ - xvid.h
+ - lame/lame.h
+ - faac.h
+ - x264.h
+ - vdpau/vdpau.h
+ Also remove the setting externalcodecs from DEB_BUILD_OPTIONS. The codecs
+ will be enabled as soon as the headers are installed on the filesystem,
+ so there is no need in enabling that separately.
+ * install ffpresets in /usr/share/ffmpeg/. Currently only presets for
+ x264 are avaiable, so a libx264 enabled libavcodec (like
+ libavcodec-unstripped-52) is needed to actually use them.
+
+ [ Fabian Greffrath ]
+ * Enabled Speex decoding via libspeex.
+ * Use an alternative approach to achieve strict internal dependencies
+ by calling dh_makeshlibs twice in debian/rules instead of a
+ debian/shlibs.local file.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 19:54:27 +0100
+
+ ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
+
+ * New Upstream Version (svn revision 16681 libswscale revision 28341)
+ * update Vcs-Git tags. Packaging has now moved to git
+ * updates to packaging that faciliate building the unstripped and ubuntu
+ variants of this package
+ * enable xvmc support
+
+ Upstream Changes:
+ - SVQ3 watermark decoding support
+ - hybrid WavPack support
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 20 Jan 2009 00:55:26 +0100
+
+ ffmpeg-debian (3:0.svn20090110-1) experimental; urgency=low
+
+ * new upstream svn snapshot (svn revision 16508, libswscale revision 28286)
+
+ Upstream Changes:
+ - RV30 and RV40 decoder
+ - QCELP / PureVoice decoder
+
+ * removed patch 050_fix_pkgconfig_files.patch. Merged upstream
+ * disabled patch 020_visibility_patch. It needs to be adapted to the new
+ upstream changes. Hopefully it will get merged into ffmpeg properly.
+ * install formats.txt in the libavcodec52 package to document what
+ formats this version of ffmpeg has enabled.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jan 2009 20:55:48 +0100
+
+ ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
+
+ * new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
+ * bump standards version to version 3.8.0, no changes needed
+ * Adjust pkg-files to no longer put unnecessary dependencies in the generated
+ .pc files. Closes: #504220
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 21:37:16 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
+
+ * really disable faad support completely.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:58:01 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
+
+ * drop the patch to dlopen faad at runtime for now. it needs more
+ polishing, and we can have that functionality easier with the 'ffmpeg'
+ source package that will appear in multiverse.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:31:47 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian.
+ * keep myself in the maintainer field. If you are touching this or the
+ 'ffmpeg' package in multiverse, please get in touch with me. Both
+ source packages come from the same packaging branch.
+ * drop dependency on faad.
+ * import patches from old packaging to dlopen libfaad at runtime.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 07:31:16 +0100
+
ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
* upstream svn snapshot (svn revision 15786, libswscale revision 27900).
diff --combined debian/control
index 1c7fe9f,7cf5a05..50d16c9
--- a/debian/control
+++ b/debian/control
@@@ -6,23 -6,27 +6,26 @@@ Uploaders: Sam Hocevar (Debian packages
Loic Minier <lool at dooz.org>,
Reinhard Tartler <siretart at tauware.de>,
Fabian Greffrath <fabian at debian-unofficial.org>
- Standards-Version: 3.7.3
- Vcs-Svn: https://code.launchpad.net/~siretart/ffmpeg/ffmpeg.jaunty
- Vcs-Browser: https://code.launchpad.net/~siretart/ffmpeg/ffmpeg.jaunty
- Homepage: http://ffmpeg.mplayerhq.hu/
+ Standards-Version: 3.8.0
+ Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg-debian.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg-debian.git;a=summary
+ Homepage: http://ffmpeg.org/
+ Build-Depends-Indep: doxygen
Build-Depends: debhelper (>= 5.0.0),
- doxygen,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libfaad-dev | libfaad2-dev,
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libsdl1.2-dev,
libschroedinger-dev,
+ libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
libx11-dev,
libxext-dev,
+ libxvmc-dev,
quilt,
texi2html,
zlib1g-dev
@@@ -102,6 -106,7 +105,7 @@@ Section: lib
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+ Breaks: libavcodec51
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...).
@@@ -162,6 -167,7 +166,7 @@@ Suggests: libfaad-dev
libgsm1-dev,
libogg-dev,
libschroedinger-dev,
+ libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
libx11-dev,
diff --combined debian/control.ffmpeg-debian
index 1cc4f17,1000358..4028b85
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@@ -1,16 -1,19 +1,18 @@@
Build-Depends: debhelper (>= 5.0.0),
- doxygen,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libfaad-dev | libfaad2-dev,
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libsdl1.2-dev,
libschroedinger-dev,
+ libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
libx11-dev,
libxext-dev,
+ libxvmc-dev,
quilt,
texi2html,
zlib1g-dev
@@@ -90,6 -93,7 +92,7 @@@ Section: lib
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+ Breaks: libavcodec51
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...).
@@@ -150,6 -154,7 +153,7 @@@ Suggests: libfaad-dev
libgsm1-dev,
libogg-dev,
libschroedinger-dev,
+ libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
libx11-dev,
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list