[SCM] FFmpeg packaging branch, master.unstripped, updated. debian/0.svn20090204-2unstripped2-25-g40bbcdf
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Mar 3 22:54:02 UTC 2009
The following commit has been merged in the master.unstripped branch:
commit 40bbcdfdc5c85c5df8cce6b6ef6118d5262cf1a6
Merge: a28e704dbe7ffa9113c58c9d5e0348f9a856d553 3d2ab017eb235bd9ed9d9ec3ab895ef751ab1557
Author: Reinhard Tartler <siretart at tauware.de>
Date: Tue Mar 3 22:59:59 2009 +0100
Merge branch 'master' into master.unstripped
diff --combined debian/changelog
index f98fc54,fc3f67b..57e1db8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,40 +1,46 @@@
- ffmpeg (3:0.svn20090204-2unstripped2) experimental; urgency=low
++ffmpeg (3:0.svn20090303-1unstripped1) unstable; urgency=low
+
- * add correct epoch in the "internal" shlibs generation
++ * rebuild using a clean, uncrippled ffmpeg tarball
+
- -- Reinhard Tartler <siretart at tauware.de> Fri, 06 Feb 2009 11:05:54 +0100
++ -- Reinhard Tartler <siretart at tauware.de> Tue, 03 Feb 2009 09:23:00 +0100
+
- ffmpeg (3:0.svn20090204-2unstripped1) experimental; urgency=low
+ ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
- * rebuild using a clean, uncrippled ffmpeg tarball
+ * 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 Feb 2009 09:23:00 +0100
+ -- 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
diff --combined debian/control
index 83d9e40,7cf5a05..110e7ae
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
-Source: ffmpeg-debian
+Source: ffmpeg
Section: libs
Priority: optional
Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
@@@ -7,12 -7,12 +7,12 @@@ Uploaders: Sam Hocevar (Debian packages
Reinhard Tartler <siretart at tauware.de>,
Fabian Greffrath <fabian at debian-unofficial.org>
Standards-Version: 3.8.0
- Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
- Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
- Homepage: http://ffmpeg.mplayerhq.hu/
+ 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),
- libasound2-dev,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libfaad-dev | libfaad2-dev,
libfreetype6-dev,
@@@ -26,100 -26,213 +26,102 @@@
libvorbis-dev,
libx11-dev,
libxext-dev,
+ libxvmc-dev,
quilt,
texi2html,
zlib1g-dev
-Package: ffmpeg
-Section: graphics
-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: libs
-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
Section: libs
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
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Suggests: liba52-0.7.4, libfaad0
++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
Section: libs
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
+ This package contains a unrestricted version of the libavdevice shared
object that should only be used by Debian packages.
-Package: libavformat52
+Package: libavfilter-unstripped-0
Section: libs
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...).
+Description: ffmpeg video filtering library
+ This is the video filtering library from the ffmpeg project.
.
- This package contains a Debian-specific version of the libavformat shared
+ This package contains a unrestricted version of the libavfilter shared
object that should only be used by Debian packages.
-Package: libavfilter0
+Package: libpostproc-unstripped-51
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Description: ffmpeg video filtering library
- This is the video filtering library from the ffmpeg project.
+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 libavfilter shared
+ This package contains a unrestricted version of the libpostproc shared
object that should only be used by Debian packages.
-Package: libpostproc51
+Package: libavformat-unstripped-52
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Description: ffmpeg video postprocessing library
- This is the video postprocessing library from the ffmpeg project.
+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 a Debian-specific version of the libpostproc shared
+ This package contains a unrestricted version of the libavformat shared
object that should only be used by Debian packages.
-Package: libswscale0
+Package: libswscale-unstripped-0
Section: libs
Architecture: any
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 a Debian-specific version of the libswscale shared
+ This package contains a unrestricted 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})
-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}),
- 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}),
- 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}),
- libavcodec-dev (= ${binary:Version})
-Description: development files for libavformat
- 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}),
- 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}),
- 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.
-
-Package: libswscale-dev
-Section: libdevel
-Architecture: any
-Depends: libswscale0 (= ${binary:Version}),
- libavutil-dev (= ${binary:Version})
-Description: development files for libswscale
- 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.
diff --combined debian/rules
index d3dc88a,a85276e..21409f7
--- a/debian/rules
+++ b/debian/rules
@@@ -7,7 -7,7 +7,7 @@@ DEB_SOURCE := $(shell dpkg-parsechangel
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
- SHLIBS_VERSION := $(EPOCH)0.svn20090128-1
+ SHLIBS_VERSION := $(EPOCH)0.svn20090303-1
LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-unstripped-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
@@@ -16,6 -16,17 +16,17 @@@ ifneq ($(DEB_SOURCE),ffmpeg-debian
DEB_BUILD_OPTIONS += ,internalencoders
endif
+ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ else
+ # on i386 and amd64, we query the system unless overriden by DEB_BUILD_OPTIONS
+ ifeq ($(DEB_HOST_ARCH),i386)
+ NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+ else ifeq ($(DEB_HOST_ARCH),amd64)
+ NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+ endif
+ endif
+
internalencoders := $(findstring internalencoders,$(DEB_BUILD_OPTIONS))
include debian/confflags
@@@ -47,7 -58,7 +58,7 @@@ endi
build-%: build-stamp-%
build-stamp-%: configure-stamp-%
dh_testdir
- $(MAKE) -C debian-$* -j $(NJOBS)
+ $(MAKE) -C debian-$* $(NUMJOBS)
touch $@
debian-shared/tools/qt-faststart: build-stamp-shared
@@@ -136,7 -147,6 +147,6 @@@ els
endif
dh_compress
dh_fixperms
- dh_installdeb
# strict internal dependencies
ifeq ($(DEB_SOURCE),ffmpeg-debian)
for pkg in $(LIB_PKGS); do \
@@@ -145,7 -155,7 +155,7 @@@
done
else
for pkg in $(LIB_PKGS); do \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(UPSTREAM_VERSION)), $$pkg (< $(UPSTREAM_VERSION)-99)"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
done
endif
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
@@@ -161,6 -171,7 +171,7 @@@ els
dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
done
endif
+ dh_installdeb
dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
dh_md5sums
dh_builddeb
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list