Commit 2cd066b4 authored by Jean-Paul Saman's avatar Jean-Paul Saman

ffmpeg-mt: debian package

Build ffmpeg with multithreaded support as ffmpeg-mt debian package.
- update all package names to include -mt extension
- update all package shared lib versions
- update all dependencies
- update Replace, Conflicts and Provide for debian package
- make sure this package replaces ffmpeg packet by *-mt variants
parent ac4deeac
ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low ffmpeg-mt (4:0.5.1-1iphion1) lucid; urgency=low
* merge from ffmpeg-mt repository at http://gitorious.org/ffmpeg/ffmpeg-mt * merge from ffmpeg-mt repository at http://gitorious.org/ffmpeg/ffmpeg-mt
- enable pthreads decoding - enable pthreads decoding
......
This diff is collapsed.
# Overriding these fpic lintian errors. Please see bug #528080. # Overriding these fpic lintian errors. Please see bug #528080.
libavcodec52: shlib-with-non-pic-code usr/lib/i686/cmov/libavcodec.so.52.20.0 libavcodec52: shlib-with-non-pic-code usr/lib/i686/cmov/libavcodec.so.52.78.0
libavcodec52: shlib-with-non-pic-code usr/lib/libavcodec.so.52.20.0 libavcodec52: shlib-with-non-pic-code usr/lib/libavcodec.so.52.78.0
# Overriding these fpic lintian errors. Please see bug #528080. # Overriding these fpic lintian errors. Please see bug #528080.
libavdevice52: shlib-with-non-pic-code usr/lib/i686/cmov/libavdevice.so.52.1.0 libavdevice52: shlib-with-non-pic-code usr/lib/i686/cmov/libavdevice.so.52.2.0
libavdevice52: shlib-with-non-pic-code usr/lib/libavdevice.so.52.1.0 libavdevice52: shlib-with-non-pic-code usr/lib/libavdevice.so.52.2.0
# Overriding these fpic lintian errors. Please see bug #528080. # Overriding these fpic lintian errors. Please see bug #528080.
libavfilter0: shlib-with-non-pic-code usr/lib/i686/cmov/libavfilter.so.0.4.0 libavfilter1: shlib-with-non-pic-code usr/lib/i686/cmov/libavfilter.so.1.20.0
libavfilter0: shlib-with-non-pic-code usr/lib/libavfilter.so.0.4.0 libavfilter1: shlib-with-non-pic-code usr/lib/libavfilter.so.1.20.0
# Overriding these fpic lintian errors. Please see bug #528080. # Overriding these fpic lintian errors. Please see bug #528080.
libavformat52: shlib-with-non-pic-code usr/lib/i686/cmov/libavformat.so.52.31.0 libavformat52: shlib-with-non-pic-code usr/lib/i686/cmov/libavformat.so.52.68.0
libavformat52: shlib-with-non-pic-code usr/lib/libavformat.so.52.31.0 libavformat52: shlib-with-non-pic-code usr/lib/libavformat.so.52.68.0
# Overriding these fpic lintian errors. Please see bug #528080. # Overriding these fpic lintian errors. Please see bug #528080.
libavutil49: shlib-with-non-pic-code usr/lib/i686/cmov/libavutil.so.49.15.0 libavutil50: shlib-with-non-pic-code usr/lib/i686/cmov/libavutil.so.50.19.0
libavutil49: shlib-with-non-pic-code usr/lib/libavutil.so.49.15.0 libavutil50: shlib-with-non-pic-code usr/lib/libavutil.so.50.19.0
# Overriding these fpic lintian errors. Please see bug #528080. # Overriding these fpic lintian errors. Please see bug #528080.
libswscale0: shlib-with-non-pic-code usr/lib/i686/cmov/libswscale.so.0.7.1 libswscale0: shlib-with-non-pic-code usr/lib/i686/cmov/libswscale.so.0.11.0
libswscale0: shlib-with-non-pic-code usr/lib/libswscale.so.0.7.1 libswscale0: shlib-with-non-pic-code usr/lib/libswscale.so.0.11.0
...@@ -9,7 +9,8 @@ UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$ ...@@ -9,7 +9,8 @@ UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$
SHLIBS_VERSION := 4:0.5.1-1 SHLIBS_VERSION := 4:0.5.1-1
LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control) LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+-mt)[[:space:]]*$$/\1/p' debian/control)
$(info LIB_PKGS=$(LIB_PKGS))
# Support multiple makes at once # Support multiple makes at once
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
...@@ -98,7 +99,7 @@ binary-indep: build-doxy install ...@@ -98,7 +99,7 @@ binary-indep: build-doxy install
binary-arch: build install formats.txt binary-arch: build install formats.txt
dh_testdir dh_testdir
dh_testroot dh_testroot
dh_installman -pffmpeg debian/qt-faststart.1 dh_installman -pffmpeg-mt debian/qt-faststart.1
dh_installdocs $(extradoc) doc/optimization.txt dh_installdocs $(extradoc) doc/optimization.txt
dh_installdocs -A MAINTAINERS CREDITS doc/TODO dh_installdocs -A MAINTAINERS CREDITS doc/TODO
dh_installdocs -A debian/README.Debian dh_installdocs -A debian/README.Debian
...@@ -111,7 +112,7 @@ binary-arch: build install formats.txt ...@@ -111,7 +112,7 @@ binary-arch: build install formats.txt
dh_link dh_link
dh_compress dh_compress
dh_fixperms dh_fixperms
dh_strip --dbg-package=ffmpeg-dbg dh_strip --dbg-package=ffmpeg-mt-dbg
# We generate the shlibs file twice: First time for the internal # We generate the shlibs file twice: First time for the internal
# dependencies, and then we regenerate them for inclusion in the # dependencies, and then we regenerate them for inclusion in the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment