[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-1-g5e546ce
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sun May 10 07:49:51 UTC 2009
The following commit has been merged in the master branch:
commit 5e546ce45f22e206c2dce0cb8bf27fe6cd31a376
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun May 10 03:49:30 2009 -0400
* Add myself to Uploaders list.
* Add DM-Upload-Allowed: yes field.
* Bump Standards-Version to 3.8.1.
* Add libopenjpeg support. (Closes: #527811)
* Add bzlib support. (Closes: #527844)
* Explicitely enable zlib and bzlib support in configure script.
* Build static libraries for ffmpeg-debian and ffmpeg packages.
(Closes: #527761)
* Modify control.ffmpeg-debian to match Depends of *-dev packages in control
file introduced in previous pacakage version.
* Some changes recommended by lintian.
+ Add watch file.
+ Fix ordering of debhelper calls.
+ Remove redundant Section fields in control file for binary packages.
+ Add comment in patch, also refreshed it.
+ Fix lintian error shlib-with-non-pic-code.
+ Don't install LICENSE. The licensing information should be, and is,
covered in debian/copyright.
+ Fix 'breaks-without-version libavcodec51' warning.
* Register ffmpeg documentation with doc-base.
* Install documentation with dh_installdocs.
diff --git a/debian/changelog b/debian/changelog
index 2657235..91df85d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+ffmpeg-debian (4:0.5+svn20090420-3) unstable; urgency=low
+
+ * Add myself to Uploaders list.
+ * Add DM-Upload-Allowed: yes field.
+ * Bump Standards-Version to 3.8.1.
+ * Add libopenjpeg support. (Closes: #527811)
+ * Add bzlib support. (Closes: #527844)
+ * Explicitely enable zlib and bzlib support in configure script.
+ * Build static libraries for ffmpeg-debian and ffmpeg packages.
+ (Closes: #527761)
+ * Modify control.ffmpeg-debian to match Depends of *-dev packages in control
+ file introduced in previous pacakage version.
+ * Some changes recommended by lintian.
+ + Add watch file.
+ + Fix ordering of debhelper calls.
+ + Remove redundant Section fields in control file for binary packages.
+ + Add comment in patch, also refreshed it.
+ + Fix lintian error shlib-with-non-pic-code.
+ + Don't install LICENSE. The licensing information should be, and is,
+ covered in debian/copyright.
+ + Fix 'breaks-without-version libavcodec51' warning.
+ * Register ffmpeg documentation with doc-base.
+ * Install documentation with dh_installdocs.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sat, 09 May 2009 14:07:24 -0400
+
ffmpeg-debian (4:0.5+svn20090420-2) unstable; urgency=low
* debian/control: fix dependencies for libavutil-dev and libavfilter-dev
diff --git a/debian/confflags b/debian/confflags
index e6e0b64..b3e54d0 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -1,12 +1,8 @@
# -*- mode: makefile -*-
# vim:syntax=make
#
-# build a static version on every architecture in the ffmpeg-debian package
# shared is generic, i.e. without arch specific opcodes
-FLAVORS := shared
-ifeq ($(DEB_SOURCE),ffmpeg-debian)
-FLAVORS += static
-endif
+FLAVORS := shared static
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -68,12 +64,16 @@ confflags += --extra-version='$(DEB_VERSION)'
confflags += --prefix=/usr
confflags += --enable-avfilter
confflags += --enable-avfilter-lavf
+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
confflags += --enable-libvorbis
confflags += --enable-pthreads
+confflags += --enable-zlib
confflags += --disable-stripping
confflags += --disable-vhook
@@ -117,6 +117,7 @@ shared_build_confflags += $(nooptflags)
endif
shared_build_confflags += --enable-shared
shared_build_confflags += --disable-static
+shared_build_confflags += --extra-cflags="-fPIC -DPIC"
## armel architecture specific
# Configuration flags for the optimised shared libraries
@@ -144,6 +145,7 @@ cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
cmov_build_confflags += --cpu='i686'
cmov_build_confflags += --enable-shared
cmov_build_confflags += --disable-static
+cmov_build_confflags += --extra-cflags="-fPIC -DPIC"
cmov_build_confflags += --disable-ffmpeg
cmov_build_confflags += --disable-ffserver
cmov_build_confflags += --disable-ffplay
diff --git a/debian/control b/debian/control
index 3df7dd3..96b684b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,10 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
Loic Minier <lool at dooz.org>,
Reinhard Tartler <siretart at tauware.de>,
- Fabian Greffrath <fabian at debian-unofficial.org>
-Standards-Version: 3.8.0
+ Fabian Greffrath <fabian at debian-unofficial.org>,
+ Andres Mejia <mcitadel at gmail.com>
+DM-Upload-Allowed: yes
+Standards-Version: 3.8.1
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/
@@ -24,12 +26,14 @@ Build-Depends: debhelper (>= 5.0.0),
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
+ libopenjpeg-dev,
libx11-dev,
libxext-dev,
libxvmc-dev,
quilt,
texi2html,
- zlib1g-dev
+ zlib1g-dev,
+ libbz2-dev
Package: ffmpeg
Section: video
@@ -67,7 +71,6 @@ Description: documentation of the ffmpeg API
This package contains the html doxygen documentation of the ffmpeg API.
Package: libavutil49
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -79,7 +82,6 @@ Description: ffmpeg utility library
object that should only be used by Debian packages.
Package: libavcodec52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -91,7 +93,6 @@ Description: ffmpeg codec library
object that should only be used by Debian packages.
Package: libavdevice52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -102,11 +103,10 @@ Description: ffmpeg device handling library
object that should only be used by Debian packages.
Package: libavformat52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Breaks: libavcodec51
+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...).
@@ -115,7 +115,6 @@ Description: ffmpeg file format library
object that should only be used by Debian packages.
Package: libavfilter0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -126,7 +125,6 @@ Description: ffmpeg video filtering library
object that should only be used by Debian packages.
Package: libpostproc51
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -137,7 +135,6 @@ Description: ffmpeg video postprocessing library
object that should only be used by Debian packages.
Package: libswscale0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -151,7 +148,7 @@ 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)
+ 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.
@@ -164,7 +161,6 @@ 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,
@@ -188,7 +184,6 @@ 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.
.
@@ -200,7 +195,6 @@ 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
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -213,7 +207,6 @@ 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.
.
@@ -225,7 +218,6 @@ 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.
.
@@ -237,7 +229,6 @@ Section: libdevel
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
This is the video scaling library from the ffmpeg project.
.
diff --git a/debian/control.common b/debian/control.common
index a99c916..321e77e 100644
--- a/debian/control.common
+++ b/debian/control.common
@@ -4,8 +4,10 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
Loic Minier <lool at dooz.org>,
Reinhard Tartler <siretart at tauware.de>,
- Fabian Greffrath <fabian at debian-unofficial.org>
-Standards-Version: 3.8.0
+ Fabian Greffrath <fabian at debian-unofficial.org>,
+ Andres Mejia <mcitadel at gmail.com>
+DM-Upload-Allowed: yes
+Standards-Version: 3.8.1
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/
diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
index b68b1e6..2994a32 100644
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@ -11,15 +11,16 @@ Build-Depends: debhelper (>= 5.0.0),
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
+ libopenjpeg-dev,
libx11-dev,
libxext-dev,
libxvmc-dev,
quilt,
texi2html,
- zlib1g-dev
+ zlib1g-dev,
+ libbz2-dev
Package: libavutil-unstripped-49
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -33,7 +34,6 @@ Description: ffmpeg utility library
object that should only be used by Debian packages.
Package: libavcodec-unstripped-52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -48,7 +48,6 @@ Description: ffmpeg codec library
object that should only be used by Debian packages.
Package: libavdevice-unstripped-52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -61,7 +60,6 @@ Description: ffmpeg device handling library
object that should only be used by Debian packages.
Package: libavfilter-unstripped-0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -72,7 +70,6 @@ Description: ffmpeg video filtering library
object that should only be used by Debian packages.
Package: libpostproc-unstripped-51
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -85,13 +82,12 @@ Description: ffmpeg video postprocessing library
object that should only be used by Debian packages.
Package: libavformat-unstripped-52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Conflicts: libavformatcvs52, libavformat52
Replaces: libavformatcvs52, libavformat52
-Breaks: libavcodec51
+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...).
@@ -100,7 +96,6 @@ Description: ffmpeg file format library
object that should only be used by Debian packages.
Package: libswscale-unstripped-0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -111,4 +106,3 @@ Description: ffmpeg video scaling library
.
This package contains a unrestricted version of the libswscale shared
object that should only be used by Debian packages.
-
diff --git a/debian/control.ffmpeg-debian b/debian/control.ffmpeg-debian
index 7a6a935..e13eb22 100644
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@ -11,12 +11,14 @@ Build-Depends: debhelper (>= 5.0.0),
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
+ libopenjpeg-dev,
libx11-dev,
libxext-dev,
libxvmc-dev,
quilt,
texi2html,
- zlib1g-dev
+ zlib1g-dev,
+ libbz2-dev
Package: ffmpeg
Section: video
@@ -54,7 +56,6 @@ Description: documentation of the ffmpeg API
This package contains the html doxygen documentation of the ffmpeg API.
Package: libavutil49
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -66,7 +67,6 @@ Description: ffmpeg utility library
object that should only be used by Debian packages.
Package: libavcodec52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -78,7 +78,6 @@ Description: ffmpeg codec library
object that should only be used by Debian packages.
Package: libavdevice52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -89,11 +88,10 @@ Description: ffmpeg device handling library
object that should only be used by Debian packages.
Package: libavformat52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Breaks: libavcodec51
+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...).
@@ -102,7 +100,6 @@ Description: ffmpeg file format library
object that should only be used by Debian packages.
Package: libavfilter0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -113,7 +110,6 @@ Description: ffmpeg video filtering library
object that should only be used by Debian packages.
Package: libpostproc51
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -124,7 +120,6 @@ Description: ffmpeg video postprocessing library
object that should only be used by Debian packages.
Package: libswscale0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -137,7 +132,8 @@ Description: ffmpeg video scaling library
Package: libavutil-dev
Section: libdevel
Architecture: any
-Depends: libavutil49 (= ${binary:Version})
+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.
@@ -148,8 +144,8 @@ Description: development files for libavutil
Package: libavcodec-dev
Section: libdevel
Architecture: any
-Depends: libavcodec52 (= ${binary:Version}),
- libavutil-dev (= ${binary:Version})
+Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-unstripped-52 (>= ${binary:Version}),
+ libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-unstripped-52 (<= ${source:Upstream-Version}-99),
Suggests: libfaad-dev,
libgsm1-dev,
libogg-dev,
@@ -171,8 +167,8 @@ Description: development files for libavcodec
Package: libavdevice-dev
Section: libdevel
Architecture: any
-Depends: libavdevice52 (= ${binary:Version}),
- libavformat-dev (= ${binary:Version})
+Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-unstripped-52 (>= ${binary:Version}),
+ libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-unstripped-52 (<= ${source:Upstream-Version}-99),
Description: development files for libavdevice
This is the device handling library from the ffmpeg project.
.
@@ -182,8 +178,8 @@ Description: development files for libavdevice
Package: libavformat-dev
Section: libdevel
Architecture: any
-Depends: libavformat52 (= ${binary:Version}),
- libavcodec-dev (= ${binary:Version})
+Depends: libavformat52 (>= ${binary:Version}) | libavformat-unstripped-52 (>= ${binary:Version}),
+ libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-unstripped-52 (<= ${source:Upstream-Version}-99),
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...).
@@ -194,8 +190,8 @@ Description: development files for libavformat
Package: libavfilter-dev
Section: libdevel
Architecture: any
-Depends: libavfilter0 (= ${binary:Version}),
- libavcodec-dev (= ${binary:Version})
+Depends: libavfilter0 (>= ${binary:Version}) | libavfilter-unstripped-0 (>= ${binary:Version}),
+ libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-unstripped-0 (<= ${source:Upstream-Version}-99),
Description: development files for libavfilter
This is the video filtering library from the ffmpeg project.
.
@@ -205,8 +201,8 @@ Description: development files for libavfilter
Package: libpostproc-dev
Section: libdevel
Architecture: any
-Depends: libpostproc51 (= ${binary:Version}),
- libavutil-dev (= ${binary:Version})
+Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-unstripped-51 (>= ${binary:Version}),
+ libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-unstripped-51 (<= ${source:Upstream-Version}-99),
Description: development files for libpostproc
This is the video postprocessing library from the ffmpeg project.
.
@@ -216,8 +212,8 @@ Description: development files for libpostproc
Package: libswscale-dev
Section: libdevel
Architecture: any
-Depends: libswscale0 (= ${binary:Version}),
- libavutil-dev (= ${binary:Version})
+Depends: libswscale0 (>= ${binary:Version}) | libswscale-unstripped-0 (>= ${binary:Version}),
+ libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-unstripped-0 (<= ${source:Upstream-Version}-99),
Description: development files for libswscale
This is the video scaling library from the ffmpeg project.
.
diff --git a/debian/ffmpeg-doc.doc-base b/debian/ffmpeg-doc.doc-base
new file mode 100644
index 0000000..19b81c8
--- /dev/null
+++ b/debian/ffmpeg-doc.doc-base
@@ -0,0 +1,9 @@
+Document: ffmpeg-doc
+Title: ffmpeg API Documentation
+Author: FFmpeg Developers
+Abstract: This is the main documentation for the ffmpeg API.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/ffmpeg-doc/html/index.html
+Files: /usr/share/doc/ffmpeg-doc/html/*.html
diff --git a/debian/ffmpeg-doc.docs b/debian/ffmpeg-doc.docs
new file mode 100644
index 0000000..068472e
--- /dev/null
+++ b/debian/ffmpeg-doc.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/ffmpeg-doc/html
diff --git a/debian/ffmpeg-doc.install b/debian/ffmpeg-doc.install
deleted file mode 100644
index c6b16bf..0000000
--- a/debian/ffmpeg-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/ffmpeg-doc
diff --git a/debian/ffmpeg.docs b/debian/ffmpeg.docs
new file mode 100644
index 0000000..8a6ecc7
--- /dev/null
+++ b/debian/ffmpeg.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/ffmpeg/html
diff --git a/debian/ffmpeg.install b/debian/ffmpeg.install
index c6671f4..98227ed 100644
--- a/debian/ffmpeg.install
+++ b/debian/ffmpeg.install
@@ -1,5 +1,4 @@
etc
usr/bin
-usr/share/doc/ffmpeg
usr/share/man
usr/share/ffmpeg/*.ffpreset
diff --git a/debian/patches/900_doxyfile b/debian/patches/900_doxyfile
index b224e19..04a2b74 100644
--- a/debian/patches/900_doxyfile
+++ b/debian/patches/900_doxyfile
@@ -1,7 +1,7 @@
-Index: ffmpeg-0.svn20080626/Doxyfile
-===================================================================
---- ffmpeg-0.svn20080626.orig/Doxyfile 2008-06-26 15:36:33.000000000 +0100
-+++ ffmpeg-0.svn20080626/Doxyfile 2008-06-26 15:37:40.000000000 +0100
+Exclude some directories we use for packaging.
+==========================================================================
+--- a/Doxyfile
++++ b/Doxyfile
@@ -359,7 +359,7 @@
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
diff --git a/debian/patches/fpic-fix.patch b/debian/patches/fpic-fix.patch
new file mode 100644
index 0000000..0f19181
--- /dev/null
+++ b/debian/patches/fpic-fix.patch
@@ -0,0 +1,222 @@
+This patch fixes FTBFS issue when using -fPIC.
+==========================================================================
+--- a/libavcodec/x86/dsputil_mmx.c
++++ b/libavcodec/x86/dsputil_mmx.c
+@@ -695,14 +695,14 @@
+ "punpckhdq %%mm1, %%mm1 \n\t"
+ "movd %%mm1, %3 \n\t"
+
+- : "=m" (*(uint32_t*)(dst + 0*dst_stride)),
+- "=m" (*(uint32_t*)(dst + 1*dst_stride)),
+- "=m" (*(uint32_t*)(dst + 2*dst_stride)),
+- "=m" (*(uint32_t*)(dst + 3*dst_stride))
+- : "m" (*(uint32_t*)(src + 0*src_stride)),
+- "m" (*(uint32_t*)(src + 1*src_stride)),
+- "m" (*(uint32_t*)(src + 2*src_stride)),
+- "m" (*(uint32_t*)(src + 3*src_stride))
++ : "=r" (*(uint32_t*)(dst + 0*dst_stride)),
++ "=r" (*(uint32_t*)(dst + 1*dst_stride)),
++ "=r" (*(uint32_t*)(dst + 2*dst_stride)),
++ "=r" (*(uint32_t*)(dst + 3*dst_stride))
++ : "r" (*(uint32_t*)(src + 0*src_stride)),
++ "r" (*(uint32_t*)(src + 1*src_stride)),
++ "r" (*(uint32_t*)(src + 2*src_stride)),
++ "r" (*(uint32_t*)(src + 3*src_stride))
+ );
+ }
+
+--- a/libavcodec/x86/h264dsp_mmx.c
++++ b/libavcodec/x86/h264dsp_mmx.c
+@@ -943,8 +943,8 @@
+ \
+ __asm__ volatile(\
+ "pxor %%mm7, %%mm7 \n\t"\
+- "movq %5, %%mm4 \n\t"\
+- "movq %6, %%mm5 \n\t"\
++ "movq ff_pw_5, %%mm4 \n\t"\
++ "movq ff_pw_16, %%mm5 \n\t"\
+ "1: \n\t"\
+ "movd -1(%0), %%mm1 \n\t"\
+ "movd (%0), %%mm2 \n\t"\
+@@ -974,17 +974,15 @@
+ "decl %2 \n\t"\
+ " jnz 1b \n\t"\
+ : "+a"(src), "+c"(dst), "+g"(h)\
+- : "d"((x86_reg)srcStride), "S"((x86_reg)dstStride), "m"(ff_pw_5), "m"(ff_pw_16)\
+- : "memory"\
++ : "d"((x86_reg)srcStride), "S"((x86_reg)dstStride)\
+ );\
+ }\
+ static av_noinline void OPNAME ## h264_qpel4_h_lowpass_l2_ ## MMX(uint8_t *dst, uint8_t *src, uint8_t *src2, int dstStride, int src2Stride){\
+ int h=4;\
+ __asm__ volatile(\
+- "pxor %%mm7, %%mm7 \n\t"\
+- "movq %0, %%mm4 \n\t"\
+- "movq %1, %%mm5 \n\t"\
+- :: "m"(ff_pw_5), "m"(ff_pw_16)\
++ "pxor %mm7, %mm7 \n\t"\
++ "movq ff_pw_5, %mm4 \n\t"\
++ "movq ff_pw_16, %mm5 \n\t"\
+ );\
+ do{\
+ __asm__ volatile(\
+@@ -1117,7 +1115,7 @@
+ int h=8;\
+ __asm__ volatile(\
+ "pxor %%mm7, %%mm7 \n\t"\
+- "movq %5, %%mm6 \n\t"\
++ "movq ff_pw_5, %%mm6 \n\t"\
+ "1: \n\t"\
+ "movq (%0), %%mm0 \n\t"\
+ "movq 1(%0), %%mm2 \n\t"\
+@@ -1151,7 +1149,7 @@
+ "punpcklbw %%mm7, %%mm5 \n\t"\
+ "paddw %%mm3, %%mm2 \n\t"\
+ "paddw %%mm5, %%mm4 \n\t"\
+- "movq %6, %%mm5 \n\t"\
++ "movq ff_pw_16, %%mm5 \n\t"\
+ "paddw %%mm5, %%mm2 \n\t"\
+ "paddw %%mm5, %%mm4 \n\t"\
+ "paddw %%mm2, %%mm0 \n\t"\
+@@ -1165,17 +1163,15 @@
+ "decl %2 \n\t"\
+ " jnz 1b \n\t"\
+ : "+a"(src), "+c"(dst), "+g"(h)\
+- : "d"((x86_reg)srcStride), "S"((x86_reg)dstStride), "m"(ff_pw_5), "m"(ff_pw_16)\
+- : "memory"\
++ : "d"((x86_reg)srcStride), "S"((x86_reg)dstStride)\
+ );\
+ }\
+ \
+ static av_noinline void OPNAME ## h264_qpel8_h_lowpass_l2_ ## MMX(uint8_t *dst, uint8_t *src, uint8_t *src2, int dstStride, int src2Stride){\
+ int h=8;\
+ __asm__ volatile(\
+- "pxor %%mm7, %%mm7 \n\t"\
+- "movq %0, %%mm6 \n\t"\
+- :: "m"(ff_pw_5)\
++ "pxor %mm7, %mm7 \n\t"\
++ "movq ff_pw_5, %mm6 \n\t"\
+ );\
+ do{\
+ __asm__ volatile(\
+@@ -1211,7 +1207,7 @@
+ "punpcklbw %%mm7, %%mm5 \n\t"\
+ "paddw %%mm3, %%mm2 \n\t"\
+ "paddw %%mm5, %%mm4 \n\t"\
+- "movq %5, %%mm5 \n\t"\
++ "movq ff_pw_16, %%mm5 \n\t"\
+ "paddw %%mm5, %%mm2 \n\t"\
+ "paddw %%mm5, %%mm4 \n\t"\
+ "paddw %%mm2, %%mm0 \n\t"\
+@@ -1226,9 +1222,7 @@
+ "add %4, %1 \n\t"\
+ "add %3, %2 \n\t"\
+ : "+a"(src), "+c"(dst), "+d"(src2)\
+- : "D"((x86_reg)src2Stride), "S"((x86_reg)dstStride),\
+- "m"(ff_pw_16)\
+- : "memory"\
++ : "D"((x86_reg)src2Stride), "S"((x86_reg)dstStride)\
+ );\
+ }while(--h);\
+ }\
+@@ -1494,8 +1488,8 @@
+ int h=16;\
+ __asm__ volatile(\
+ "pxor %%xmm15, %%xmm15 \n\t"\
+- "movdqa %6, %%xmm14 \n\t"\
+- "movdqa %7, %%xmm13 \n\t"\
++ "movdqa ff_pw_5, %%xmm14 \n\t"\
++ "movdqa ff_pw_16, %%xmm13 \n\t"\
+ "1: \n\t"\
+ "lddqu 3(%0), %%xmm1 \n\t"\
+ "lddqu -5(%0), %%xmm7 \n\t"\
+@@ -1549,9 +1543,7 @@
+ "decl %3 \n\t"\
+ "jg 1b \n\t"\
+ : "+a"(src), "+c"(dst), "+d"(src2), "+g"(h)\
+- : "D"((x86_reg)src2Stride), "S"((x86_reg)dstStride),\
+- "m"(ff_pw_5), "m"(ff_pw_16)\
+- : "memory"\
++ : "D"((x86_reg)src2Stride), "S"((x86_reg)dstStride)\
+ );\
+ }
+ #else // ARCH_X86_64
+@@ -1571,9 +1563,8 @@
+ static av_noinline void OPNAME ## h264_qpel8_h_lowpass_l2_ ## MMX(uint8_t *dst, uint8_t *src, uint8_t *src2, int dstStride, int src2Stride){\
+ int h=8;\
+ __asm__ volatile(\
+- "pxor %%xmm7, %%xmm7 \n\t"\
+- "movdqa %0, %%xmm6 \n\t"\
+- :: "m"(ff_pw_5)\
++ "pxor %xmm7, %xmm7 \n\t"\
++ "movdqa ff_pw_5, %xmm6 \n\t"\
+ );\
+ do{\
+ __asm__ volatile(\
+@@ -1596,7 +1587,7 @@
+ "psllw $2, %%xmm2 \n\t"\
+ "movq (%2), %%xmm3 \n\t"\
+ "psubw %%xmm1, %%xmm2 \n\t"\
+- "paddw %5, %%xmm5 \n\t"\
++ "paddw ff_pw_16,%%xmm5 \n\t"\
+ "pmullw %%xmm6, %%xmm2 \n\t"\
+ "paddw %%xmm5, %%xmm2 \n\t"\
+ "psraw $5, %%xmm2 \n\t"\
+@@ -1607,9 +1598,7 @@
+ "add %4, %1 \n\t"\
+ "add %3, %2 \n\t"\
+ : "+a"(src), "+c"(dst), "+d"(src2)\
+- : "D"((x86_reg)src2Stride), "S"((x86_reg)dstStride),\
+- "m"(ff_pw_16)\
+- : "memory"\
++ : "D"((x86_reg)src2Stride), "S"((x86_reg)dstStride)\
+ );\
+ }while(--h);\
+ }\
+@@ -1619,7 +1608,7 @@
+ int h=8;\
+ __asm__ volatile(\
+ "pxor %%xmm7, %%xmm7 \n\t"\
+- "movdqa %5, %%xmm6 \n\t"\
++ "movdqa ff_pw_5, %%xmm6 \n\t"\
+ "1: \n\t"\
+ "lddqu -5(%0), %%xmm1 \n\t"\
+ "movdqa %%xmm1, %%xmm0 \n\t"\
+@@ -1639,7 +1628,7 @@
+ "paddw %%xmm4, %%xmm1 \n\t"\
+ "psllw $2, %%xmm2 \n\t"\
+ "psubw %%xmm1, %%xmm2 \n\t"\
+- "paddw %6, %%xmm5 \n\t"\
++ "paddw ff_pw_16, %%xmm5 \n\t"\
+ "pmullw %%xmm6, %%xmm2 \n\t"\
+ "paddw %%xmm5, %%xmm2 \n\t"\
+ "psraw $5, %%xmm2 \n\t"\
+@@ -1650,9 +1639,7 @@
+ "decl %2 \n\t"\
+ " jnz 1b \n\t"\
+ : "+a"(src), "+c"(dst), "+g"(h)\
+- : "D"((x86_reg)srcStride), "S"((x86_reg)dstStride),\
+- "m"(ff_pw_5), "m"(ff_pw_16)\
+- : "memory"\
++ : "D"((x86_reg)srcStride), "S"((x86_reg)dstStride)\
+ );\
+ }\
+ static void OPNAME ## h264_qpel16_h_lowpass_ ## MMX(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
+--- a/libavcodec/x86/flacdsp_mmx.c
++++ b/libavcodec/x86/flacdsp_mmx.c
+@@ -108,10 +108,13 @@
+ "addsd %%xmm5, %%xmm2 \n\t"
+ "movsd %%xmm0, %1 \n\t"
+ "movsd %%xmm1, %2 \n\t"
+- "movsd %%xmm2, %3 \n\t"
+- :"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1]), "=m"(autoc[j+2])
++ :"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1])
+ :"r"(data1+len), "r"(data1+len-j)
+ );
++ __asm__ volatile(
++ "movsd %%xmm2, %0 \n\t"
++ :"=m"(autoc[j+2])
++ );
+ } else {
+ __asm__ volatile(
+ "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t"
diff --git a/debian/patches/i386-fpic-workaround.patch b/debian/patches/i386-fpic-workaround.patch
new file mode 100644
index 0000000..30ea952
--- /dev/null
+++ b/debian/patches/i386-fpic-workaround.patch
@@ -0,0 +1,21 @@
+Workaround to get ffmpeg packages built with i386 using -fPIC.
+This disables -fPIC for the problematic files.
+==========================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -83,6 +83,15 @@
+
+ VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
+
++# Disable use of -fPIC on problematic files for i386
++ifeq (,$(findstring i386 i486 i586 i686,$(shell uname -m)))
++I386CFLAGS += $(filter-out -fPIC -DPIC,$(CFLAGS))
++libavcodec/x86/dsputil_mmx.o: libavcodec/x86/dsputil_mmx.c
++ $(CC) $(I386CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
++libavcodec/x86/flacdsp_mmx.o: libavcodec/x86/flacdsp_mmx.c
++ $(CC) $(I386CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
++endif
++
+ BASEHOOKS = fish null watermark
+ ALLHOOKS = $(BASEHOOKS) drawtext imlib2 ppm
+ ALLHOOKS_SRCS = $(addprefix vhook/, $(addsuffix .c, $(ALLHOOKS)))
diff --git a/debian/patches/series b/debian/patches/series
index 2e7230a..c5f660a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
900_doxyfile
+fpic-fix.patch
diff --git a/debian/rules b/debian/rules
index 0f779c0..2d333a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,9 +116,11 @@ install: build
install -m 644 -D doc/ffserver.conf debian/tmp/etc/
install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
ifneq ($(DEB_SOURCE),ffmpeg-debian)
- dh_install --list-missing --sourcedir=debian/tmp
+ dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
+ --list-missing --sourcedir=debian/tmp
else
- dh_install --fail-missing --sourcedir=debian/tmp
+ dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
+ --fail-missing --sourcedir=debian/tmp
endif
formats.txt: install
@@ -137,7 +139,7 @@ binary-arch: build install formats.txt
dh_installdocs $(extradoc) doc/optimization.txt
dh_installdocs -A MAINTAINERS CREDITS doc/TODO
dh_installdocs -A debian/README.Debian
- dh_installdocs LICENSE RELEASE
+ dh_installdocs RELEASE
ifeq ($(DEB_SOURCE),ffmpeg)
dh_installdocs -p libavcodec-unstripped-52 formats.txt
else
@@ -165,8 +167,6 @@ else
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" \
- dh_shlibdeps
# target dependencies for external packages
ifeq ($(DEB_SOURCE),ffmpeg-debian)
for pkg in $(LIB_PKGS); do \
@@ -178,6 +178,8 @@ else
dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
done
endif
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
+ dh_shlibdeps
dh_installdeb
dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
dh_md5sums
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0eee025
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$//i,dversionmangle=s/[-.+~]?(cvs|svn|git|snapshot|pre|hg)(.*)$//i,pasv \
+http://www.ffmpeg.org/releases/ffmpeg-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2|) debian uupdate
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list