[SCM] FFmpeg packaging branch, ubuntu.karmic.unstripped, updated. debian/0.5+svn20090609-2-98-g212579c
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Aug 25 14:46:25 UTC 2009
The following commit has been merged in the ubuntu.karmic.unstripped branch:
commit ec7170941b303ecfdc3762a66b4e604034b4c0bd
Merge: b63299b3615a8b54e7e6d4083119d412ce5c0204 f86c002b291b4234fac4e05184f2cdb4217947c4
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Aug 1 23:36:02 2009 +0200
Merge branch 'ubuntu.karmic' (early part) into ubuntu.karmic.unstripped
diff --combined debian/changelog
index 93649e6,ee41aa6..ab206e9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,54 +1,61 @@@
+ ffmpeg-debian (4:0.5+svn20090609-2ubuntu1) karmic; urgency=low
+
+ * prepare new upload
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 01 Aug 2009 23:30:01 +0200
+
+ ffmpeg-debian (4:0.5+svn20090609-2) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Remove .install files for unstripped packages that we do not build
+ from this branch anyway.
+ * Remove debian/fixup-config.sh which was only a hack needed to repair
+ the crippled config.h
+ * Finally remove strip.sh.
+
+ [ Andres Mejia ]
+ * Add vdpau support by including vdpau headers in deb packaging.
+ (Closes: #511544)
+ * Don't disable encoders if internalencoders is set in
+ DEB_BUILD_OPTIONS.
+ * Enable yasm for i386 and amd64.
+
+ [ Reinhard Tartler ]
+ * clarifications suggested by upstream in README.Source
+ * refresh patches
+
+ [ Fabian Greffrath ]
+ * Document the copyright notice and license for the VDPAU headers in
+ debian/copyright.
+ * Remove parallel make support from debian/confflags, it's overridden
+ in debian/rules anyway.
+ * Quote opts in debian/watch.
+ * Bump debhelper compat to 7.
+ * Clean up clean target in debian/rules in favour of debian/clean.
+ * Replace "dh_clean -k" by dh_prep.
+
+ [ Reinhard Tartler ]
+ * remove duplicated libxvmc-dev build dependency
+ * sort build dependencies alphabetically
+ * remove section numbering from README.Debian
+ * add note about the lintian override
+
+ -- Andres Mejia <mcitadel at gmail.com> Mon, 06 Jul 2009 13:04:17 -0400
+
-ffmpeg-debian (4:0.5+svn20090609-1ubuntu3) karmic; urgency=low
+ffmpeg (4:0.5+svn20090609-2+unstripped2) 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
+ * update debian/changelog
+ * enable libopenjpeg support for the multiverse package
- -- Reinhard Tartler <siretart at tauware.de> Sat, 25 Jul 2009 09:15:12 +0200
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 25 Jul 2009 09:27:28 +0200
+
+ffmpeg (4:0.5+svn20090609-2+unstripped1) karmic; urgency=low
+
+ * brown paperbag upload
+ * add missing comma in build depends
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 24 Jul 2009 22:00:29 +0200
ffmpeg-debian (4:0.5+svn20090609-1ubuntu2) karmic; urgency=low
@@@ -20,15 -57,6 +64,15 @@@
-- 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:
@@@ -234,24 -262,6 +278,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:
@@@ -309,21 -319,6 +353,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
@@@ -361,16 -356,6 +405,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.
@@@ -379,7 -364,7 +423,7 @@@
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
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:50:19 +0100
ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
diff --combined debian/confflags
index a4cffac,2f4af82..5d7f12b
--- a/debian/confflags
+++ b/debian/confflags
@@@ -60,10 -60,8 +60,8 @@@ disable_encoders += --disable-encoder=m
disable_encoders += --disable-encoder=msmpeg4v2
disable_encoders += --disable-encoder=msmpeg4v3
- # disabling the next three lines might enable some additional encoders,
- # not in debian at this point, as we munge the source there as well,
- # though
- ifeq ($(DEB_SOURCE),ffmpeg-debian)
+ # don't disable encoders if internalencoders is set in DEB_BUILD_OPTIONS
+ ifeq (,$(filter internalencoders,$(DEB_BUILD_OPTIONS)))
confflags += $(disable_encoders)
endif
@@@ -72,10 -70,10 +70,11 @@@ confflags += --extra-version='$(DEB_VER
confflags += --prefix=/usr
confflags += --enable-avfilter
confflags += --enable-avfilter-lavf
+ confflags += --enable-vdpau
confflags += --enable-bzlib
# confflags += --enable-libdirac # Waiting for libdirac to enter Debian
confflags += --enable-libgsm
+confflags += --enable-libopenjpeg
confflags += --enable-libschroedinger
confflags += --enable-libspeex
confflags += --enable-libtheora
@@@ -90,7 -88,6 +89,6 @@@ confflags += $(extra_common_confflags
gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
- confflags += $(call cond_enable,/usr/include/vdpau/vdpau.h,vdpau)
# comment out following line for LGPL versions of the libraries
confflags += $(gpl_confflags)
@@@ -101,6 -98,9 +99,9 @@@ ifneq (,$(findstring linux,$(DEB_HOST_G
lib1394-dev += libraw1394-dev, libdc1394-22-dev
endif
+ # We add vdpau headers ourselves so ffmpeg can stay in main
+ confflags += --extra-cflags="-I$(CURDIR)/debian/include"
+
# XXX this probably needs fixing
CFLAGS :=
@@@ -178,13 -178,6 +179,6 @@@ vis_build_confflags += --extra-cflags="
vis_build_confflags += --disable-ffmpeg
vis_build_confflags += --disable-ffplay
- # Support multiple makes at once (taken from the qemu package)
- ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- else
- NJOBS := 1
- endif
-
# Additional documentation for PowerPC
ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
extradoc := doc/ffmpeg_powerpc_performance_evaluation_howto.txt
diff --combined debian/control
index 23341f3,b6bc4c0..8f03440
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
-Source: ffmpeg-debian
+Source: ffmpeg
Section: libs
Priority: optional
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
@@@ -14,119 -14,230 +14,120 @@@ Vcs-Git: git://git.debian.org/git/pkg-m
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 (>= 6.0.7~),
+ Build-Depends: debhelper (>= 7),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libbz2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++ libfaac-dev,
+ libfaad-dev | libfaad2-dev,
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
++ libmp3lame-dev,
+ libopenjpeg-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libsdl1.2-dev,
libschroedinger-dev,
+ libsdl1.2-dev,
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
- libopenjpeg-dev,
libx11-dev,
- libxext-dev,
+ libx264-dev,
- libmp3lame-dev,
- libfaac-dev,
+ libxext-dev,
+ libxvidcore-dev | libxvidcore4-dev,
- quilt,
- texi2html,
- zlib1g-dev,
libxvmc-dev,
+ nvidia-180-libvdpau-dev [i386 amd64],
- libbz2-dev
+ quilt,
+ texi2html,
+ yasm [i386 amd64],
+ zlib1g-dev
-Package: ffmpeg
-Section: video
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: multimedia player, server and encoder
- 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,
- DivX, MPEG4, AC3, DV...).
-
-Package: ffmpeg-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libavutil49 (= ${binary:Version}),
- libavcodec52 (= ${binary:Version}),
- libavdevice52 (= ${binary:Version}),
- libpostproc51 (= ${binary:Version}),
- libavformat52 (= ${binary:Version}),
- libswscale0 (= ${binary:Version}),
- ffmpeg (= ${binary:Version})
-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
- stacktraces to help debugging the ffmpeg library.
-
-Package: ffmpeg-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Description: documentation of the ffmpeg API
- This package contains the html doxygen documentation of the ffmpeg API.
-
-Package: libavutil49
+Package: libavutil-unstripped-49
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libavutilcvs49, libavutil49
+Replaces: libavutilcvs49, libavutil49
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
+ This package contains a unrestricted version of the libavutil shared
object that should only be used by Debian packages.
-Package: libavcodec52
+Package: libavcodec-unstripped-52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Suggests: libfaad0
+Conflicts: libavcodec52
+Replaces: libavcodec52
Description: ffmpeg codec library
This is the codec library from the ffmpeg project. It supports most existing
encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
.
- This package contains a Debian-specific version of the libavcodec shared
+ This package contains a unrestricted version of the libavcodec shared
object that should only be used by Debian packages.
-Package: libavdevice52
+Package: libavdevice-unstripped-52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libavdevicecvs52, libavdevice52
+Replaces: libavdevicecvs52, libavdevice52
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.
-
-Package: libavformat52
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Breaks: libavcodec51 (<< 3:0.svn20090303-1)
-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...).
- .
- This package contains a Debian-specific version of the libavformat shared
+ This package contains a unrestricted version of the libavdevice shared
object that should only be used by Debian packages.
-Package: libavfilter0
+Package: libavfilter-unstripped-0
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.
.
- This package contains a Debian-specific version of the libavfilter shared
+ This package contains a unrestricted version of the libavfilter shared
object that should only be used by Debian packages.
-Package: libpostproc51
+Package: libpostproc-unstripped-51
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libpostproccvs51, libpostproc51
+Replaces: libpostproccvs51, libpostproc51
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
+ This package contains a unrestricted version of the libpostproc shared
object that should only be used by Debian packages.
-Package: libswscale0
+Package: libavformat-unstripped-52
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.
-
-Package: libavutil-dev
-Section: libdevel
-Architecture: any
-Depends: libavutil49 (>= ${binary:Version}) | libavutil-unstripped-49 (>= ${binary:Version}),
- libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-unstripped-49 (<= ${source:Upstream-Version}-99)
-Description: development files for libavutil
- This is the common utility library from the ffmpeg project. It is required
- by all other ffmpeg libraries.
- .
- 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: libavcodec52 (>= ${binary:Version}) | libavcodec-unstripped-52 (>= ${binary:Version}),
- libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-unstripped-52 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version})
-Suggests: libfaad-dev,
- libgsm1-dev,
- libogg-dev,
- libschroedinger-dev,
- libspeex-dev,
- libtheora-dev (>> 0.0.0.alpha4),
- libvorbis-dev,
- libx11-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
- 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: libavdevice52 (>= ${binary:Version}) | libavdevice-unstripped-52 (>= ${binary:Version}),
- libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-unstripped-52 (<= ${source:Upstream-Version}-99),
- libavformat-dev (= ${binary:Version})
-Description: development files for libavdevice
- This is the device handling library from the ffmpeg project.
- .
- 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: libavformat52 (>= ${binary:Version}) | libavformat-unstripped-52 (>= ${binary:Version}),
- libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-unstripped-52 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version})
-Description: development files for libavformat
+Conflicts: libavformatcvs52, libavformat52
+Replaces: libavformatcvs52, libavformat52
+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...).
.
- 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: libavfilter0 (>= ${binary:Version}) | libavfilter-unstripped-0 (>= ${binary:Version}),
- libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-unstripped-0 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version})
-Description: development files for libavfilter
- This is the video filtering library from the ffmpeg project.
- .
- 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: libpostproc51 (>= ${binary:Version}) | libpostproc-unstripped-51 (>= ${binary:Version}),
- libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-unstripped-51 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version})
-Description: development files for libpostproc
- This is the video postprocessing library from the ffmpeg 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 libavformat shared
+ object that should only be used by Debian packages.
-Package: libswscale-dev
-Section: libdevel
+Package: libswscale-unstripped-0
Architecture: any
-Depends: libswscale0 (>= ${binary:Version}) | libswscale-unstripped-0 (>= ${binary:Version}),
- libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-unstripped-0 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version})
-Description: development files for libswscale
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libswscalecvs0, libswscale0
+Replaces: libswscalecvs0, libswscale0
+Description: ffmpeg video scaling library
This is the video scaling library from the ffmpeg 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.
+
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list