[SCM] FFmpeg packaging branch, ubuntu.jaunty.unstripped, updated. debian/0.svn20081115-1ubuntu1+unstripped1-95-ga12c50b
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Feb 6 09:46:40 UTC 2009
The following commit has been merged in the ubuntu.jaunty.unstripped branch:
commit 4484aa0d569ddcdb86e1da858616399d0b70ec66
Merge: f0556f08d33e684544439958e5ab400871ae5b2b 974e11b2a50baf8f0823dd1b893404849296d464
Author: Reinhard Tartler <siretart at tauware.de>
Date: Thu Feb 5 21:40:17 2009 +0100
Merge branch 'master.unstripped' into ubuntu.jaunty.unstripped
diff --combined debian/changelog
index 2f4c05a,8cf5768..ccf368d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,59 +1,81 @@@
+ ffmpeg (3:0.svn20090204-2unstripped1) experimental; urgency=low
+
+ * rebuild using a clean, uncrippled ffmpeg tarball
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 03 Feb 2009 09:23:00 +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 (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
+ * 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)
@@@ -50,26 -84,6 +106,26 @@@ 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.
+ * 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:50:19 +0100
+
ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
* new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
@@@ -79,31 -93,6 +135,31 @@@
-- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 21:37:16 +0100
+ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
+
+ * really disable faad support completely.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:58:01 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
+
+ * drop the patch to dlopen faad at runtime for now. it needs more
+ polishing, and we can have that functionality easier with the 'ffmpeg'
+ source package that will appear in multiverse.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:31:47 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian.
+ * keep myself in the maintainer field. If you are touching this or the
+ 'ffmpeg' package in multiverse, please get in touch with me. Both
+ source packages come from the same packaging branch.
+ * drop dependency on faad.
+ * import patches from old packaging to dlopen libfaad at runtime.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 07:31:16 +0100
+
ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
* upstream svn snapshot (svn revision 15786, libswscale revision 27900).
diff --combined debian/control
index cd8191c,83d9e40..39ad55f
--- a/debian/control
+++ b/debian/control
@@@ -12,6 -12,7 +12,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
Homepage: http://ffmpeg.mplayerhq.hu/
Build-Depends-Indep: doxygen
Build-Depends: debhelper (>= 5.0.0),
+ libasound2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libfaad-dev | libfaad2-dev,
libfreetype6-dev,
@@@ -20,18 -21,13 +21,19 @@@
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,
+ libmp3lame-dev,
+ libfaac-dev,
+ libxvidcore-dev | libxvidcore4-dev,
quilt,
texi2html,
+ libx264-dev (>> 1:0.svn20081230),
+ libxvmc-dev [i386 amd64],
+ nvidia-180-libvdpau-dev [i386 amd64],
zlib1g-dev
Package: libavutil-unstripped-49
@@@ -81,8 -77,6 +83,6 @@@ Section: lib
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Conflicts: libavfilter0
- Replaces: libavfilter0
Description: ffmpeg video filtering library
This is the video filtering library from the ffmpeg project.
.
diff --combined debian/control.ffmpeg
index d62e48c,689de48..740b128
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@@ -1,4 -1,5 +1,5 @@@
Build-Depends: debhelper (>= 5.0.0),
+ libasound2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libfaad-dev | libfaad2-dev,
libfreetype6-dev,
@@@ -7,18 -8,14 +8,19 @@@
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,
+ libmp3lame-dev,
+ libfaac-dev,
+ libxvidcore-dev | libxvidcore4-dev,
quilt,
texi2html,
+ libx264-dev (>> 1:0.svn20081230),
+ libxvmc-dev [i386 amd64],
+ nvidia-180-libvdpau-dev [i386 amd64],
zlib1g-dev
Package: libavutil-unstripped-49
diff --combined debian/control.ffmpeg-debian
index 4973d2b,79e9770..7b29ad9
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@@ -1,11 -1,14 +1,13 @@@
Build-Depends: debhelper (>= 5.0.0),
+ libasound2-dev,
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,
@@@ -150,6 -153,7 +152,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