[SCM] libav/squeeze-backports: Merge commit '783821539' into squeeze-backports
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Mar 17 16:49:11 UTC 2012
Bump shlibs
update debian/changelog
Bugfix: expects wrong preset file extension
Merge remote-tracking branch 'origin/hardening'
add missing post 0.8 patches
Import post 0.8 patches
Set CPPFLAGS separately.
Filter out system-wide setting of -Bsymbolic-functions to avoid FTBFS.
Fix format string vulnerability detected by -Wformat-security.
Enable hardened build flags through dpkg-buildflags (Closes: #658929).
Fix maintainer's name.
confflags: use --enable-pic instead of manually messing with cflags
prepare new upload
update debian/changelog
Bump shlibs for addition of GSM parser
provide compatibility links for ffserver, ffplay and ffprobe
Drop post-0.8b2 patches
prepare new upload
Merge commit 'upstream/0.8'
Imported Upstream version 0.8
debian/watch: fix mangling of '_' characters.
Remove the last remainders of explicit quilt usage in pre-3.0 source formats.
update debian/changelog
add additional post-0.8b2 patches
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/libav
Fix debian/*.install file generation on archs (e.g. armel) that build more than only one optimized shared library (Closes: #656184).
update debian/changelog
drop unused lintian override in debian/control
place transitional packages in oldlibs/extra section to assist package managers
extend package description to include a note what libav actuall is
Bump shlibs for addition of new audio encoding API
Sync post v0.8b2 commits
Fix upgrade path from earlier versions of the 'ffmpeg' package
normalize fields with wrap-and-sort -s
start new upload
Properly set the library paths for multiarch and shared libs in debian/*.install instead of using brace expansion and asterisks.
update debian/changelog
Fix dependencies in libav-dbg package
Refresh patches
Drop patch from upstream to fix a segfault in libswscale, merged upstream
Merge commit 'upstream/0.8_beta2'
Imported Upstream version 0.8~beta2
Rename package libav to libav-tools
Disable configuration mismatch warnings
Apply a patch from upstream to fix a segfault in libswscale
update debian/changelog
debian/confflags: replace references to ffmpeg to libav
fix build failures by dropping unnecessary configure flags
rename the package 'ffmpeg' -> 'libav'
bump shlibs version
update debian/changelog
drop merged upstream patches
Merge commit 'upstream/0.8_beta1'
Imported Upstream version 0.8~beta1
update debian/changelog
forcefully disable v4l on kfreebsd
finalize upload
Bump shlibs for backported avcodec_open2() API
update version number
Merge commit 'upstream/0.7.3'
Imported Upstream version 0.7.3
Enable drawtext filter (Closes: #647132)
Prepare new upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/squeeze-backports
X-Git-Reftype: branch
X-Git-Oldrev: 3eca43f9af40f2ba7a193c6349c6f57a481c39dd
X-Git-Newrev: 0dc53855a3ceaeedd8d523832c893587325bf3fb
The following commit has been merged in the squeeze-backports branch:
commit f4e2fb2c4d8ae45b9e69560b0410e4f3f5b5e352
Merge: 3eca43f9af40f2ba7a193c6349c6f57a481c39dd 783821539608741ebe514baa2c8ead837d20915b
Author: Julien Cristau <julien.cristau at logilab.fr>
Date: Sat Mar 17 13:33:49 2012 +0100
Merge commit '783821539' into squeeze-backports
Conflicts:
debian/changelog
debian/confflags
debian/control
debian/libavcodec-dev.install
debian/libavcodec53.install
debian/libavdevice-dev.install
debian/libavdevice53.install
debian/libavfilter-dev.install
debian/libavfilter2.install
debian/libavformat-dev.install
debian/libavformat53.install
debian/libavutil-dev.install
debian/libavutil51.install
debian/libpostproc-dev.install
debian/libpostproc52.install
debian/libswscale-dev.install
debian/libswscale2.install
debian/rules
diff --combined debian/changelog
index db788ed,6931893..00ce52b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,129 +1,136 @@@
+ libav (4:0.8-2) unstable; urgency=low
+
+ [ Reinhard Tartler ]
+ * confflags: use --enable-pic instead of manually messing with cflags
+ * Import post 0.8 patches
+ * Bugfix: expects wrong preset file extension (Closes: #660978)
+ Thanks to Laurento <laurento.frittella at gmail.com> for spotting this.
+
+ [ Alessio Treglia ]
+ * Fix maintainer's name.
+
+ [ Fabian Greffrath ]
+ * Enable hardened build flags through dpkg-buildflags (Closes: #658929).
+ * Fix format string vulnerability detected by -Wformat-security.
+ * Filter out system-wide setting of -Bsymbolic-functions to avoid FTBFS.
+ * Set CPPFLAGS separately.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 05 Mar 2012 19:47:54 +0100
+
+ libav (4:0.8-1) unstable; urgency=medium
+
+ [ Fabian Greffrath ]
+ * Remove the last remainders of explicit quilt usage in
+ pre-3.0 source formats.
+ * Urgency bumped to medium because of RC bugs and unfixed security
+ issues in testing.
+ * Imported Upstream version 0.8
+ - Bug fix: "Segfaults when using vaapi", thanks to Andrey Rahmatullin
+ (Closes: #656572). That crash is most likely caused by auto-enabling
+ multi-threading. This behavior got reverted just before this release.
+ * Drop post-0.8b2 patches
+ * Bump shlibs for addition of new audio encoding API
+ * Extend package descriptions to include a note what libav actually is
+ * debian/watch: fix mangling of '_' characters.
+ * drop unused lintian override in debian/control
+ * provide compatibility links for ffserver, ffplay and ffprobe
+ (Closes: #655683)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 22 Jan 2012 21:24:22 +0100
+
+ libav (4:0.8~beta2-3) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Fix debian/*.install file generation on archs (e.g. armel) that build
+ more than only one optimized shared library (Closes: #656184).
+
+ [ Reinhard Tartler ]
+ * add additional post-0.8b2 patches
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 17 Jan 2012 22:31:32 +0100
+
+ libav (4:0.8~beta2-2) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Properly set the library paths for multiarch and shared libs in
+ debian/*.install instead of using brace expansion and asterisks.
+
+ [ Reinhard Tartler ]
+ * Fix upgrade path from earlier versions of the 'ffmpeg' package
+ (Closes: #655917)
+ * Sync post v0.8b2 commits
+ * extend package description to include a note what libav actuall is
+ * place transitional packages in oldlibs/extra section to assist package
+ managers
+ * drop unused lintian override in debian/control
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 15 Jan 2012 16:19:41 +0100
+
+ libav (4:0.8~beta2-1) unstable; urgency=low
+
+ * New Upstream version 0.8~beta2:
+ - Confirm that this release does not inhibit the following security issues:
+ - DoS in MKV demuxer,
+ - CVE-2011-3893, Closes: #654572
+ - Double free vuln in the Theora decoder,
+ - CVE-2011-3892, Closes: #654571
+ - heap-based buffer overflow in vorbis decoder:
+ - CVE-2011-3895, Closes: #654573
+ - Closes: #654534
+ - Bug fix: "libswscale crashes when upscaling pictures using
+ hyscale_fast2, MMX variant on amd64 with gcc-4.6 and later",
+ thanks to Harald Dunkel (Closes: #647824).
+ - Clarify that libavutil/avutil.h doesn't include mathematics.h any more in
+ APIchanges documentation. Thanks: Jonathan Nieder <jrnieder at gmail.com>,
+ Closes: #654303
+ * Disable configuration mismatch warnings (Closes: #619530)
+ * Rename package libav to libav-tools (Closes: #654984)
+ * Refresh patches
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 11 Jan 2012 16:45:28 +0100
+
+ libav (4:0.8~beta1-2) experimental; urgency=low
+
+ * fix build failures by dropping unnecessary configure flags
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 01 Jan 2012 08:48:06 +0100
+
+ libav (4:0.8~beta1-1) experimental; urgency=low
+
+ * New upstream release.
+ - too many changes to list, please refer to upstream's Changelog file
+ for details
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 30 Dec 2011 23:45:34 +0100
+
+ libav (4:0.7.3-2) unstable; urgency=low
+
+ * forcefully disable v4l on kfreebsd, fixes an FTBFS on kFreeBSD
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 26 Dec 2011 10:50:36 +0100
+
+ libav (4:0.7.3-1) unstable; urgency=high
+
+ * New upstream version. Includes fixes for:
+ - VP3 decoder (CVE-2011-4352)
+ - svq1 decoder (CVE-2011-4579)
+ - DoS in the VP5/VP6 decoders (CVE-2011-4353)
+ - QDM2 decoder (CVE-2011-4351)
+ - Sierra VMD decoder (CVE-2011-4364)
+ * Bumped urgency.
+ * Enable drawtext filter (Closes: #647132)
+ * Imported Upstream version 0.7.3
+ * Bump shlibs for backported avcodec_open2() API
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 25 Dec 2011 22:04:54 +0100
+
+libav (4:0.7.2-1~bpo50+1) squeeze-backports; urgency=low
+
+ * Rebuild for squeeze-backports.
+ * Revert "Convert package to include multiarch support."
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 06 Oct 2011 21:13:19 +0200
+
libav (4:0.7.2-1) unstable; urgency=low
* New upstream release: 0.7.2
diff --combined debian/confflags
index eee98ea,bd26216..9bd8003
--- a/debian/confflags
+++ b/debian/confflags
@@@ -1,12 -1,13 +1,12 @@@
# -*- mode: makefile -*-
# vim:syntax=make
- # build a static version on every architecture in the 'debian' ffmpeg package
+ # build a static version on every architecture in the 'debian' Libav package
FLAVORS := static
# shared is generic, i.e. without arch specific opcodes
FLAVORS += shared
-export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@@ -95,6 -96,7 +95,6 @@@ gpl_confflags += --enable-x11gra
confflags += --extra-version='$(DEB_VERSION)'
confflags += --arch='$(DEB_HOST_ARCH_CPU)'
confflags += --prefix=/usr
-confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
confflags += --enable-vdpau
confflags += --enable-bzlib
confflags += --enable-libgsm
@@@ -106,10 -108,11 +106,11 @@@ confflags += --enable-pthread
confflags += --enable-zlib
confflags += --enable-libvpx
confflags += --enable-runtime-cpudetect
+ confflags += --enable-libfreetype
ifeq ($(DEB_HOST_ARCH),armel)
- # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
+ # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
# plenty of incompatible assembly; not sure how to detect that properly
- confflags += --extra-cflags="-marm -fPIC -DPIC"
+ confflags += --enable-pic
endif
ifeq ($(DEB_HOST_ARCH),powerpc)
@@@ -121,7 -124,7 +122,7 @@@ confflags += $(extra_common_confflags
# vaapi is not available on s390 and on the hurd
confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
- # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
+ # this part below is intended for the 'Libav' package in ubuntu/multiverse
gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
@@@ -147,12 -150,13 +148,13 @@@ ifneq (,$(findstring linux,$(DEB_HOST_G
lib1394-dev += libraw1394-dev, libdc1394-22-dev
endif
- # Sanitize injected compiler in linker flags
- CFLAGS :=
- LDFLAGS :=
+ # Enable hardened build flags through dpkg-buildflags
+ CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+ CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+ LDFLAGS := $(filter-out %-Bsymbolic-functions,$(shell dpkg-buildflags --get LDFLAGS))
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- # Various parts of ffmpeg (and swscale) FTBFS when compiling with -fPIC
+ # Various parts of Libav (and swscale) FTBFS when compiling with -fPIC
# and with mmx code enabled.
confflags += --disable-optimizations
confflags += --disable-mmx
@@@ -162,7 -166,7 +164,7 @@@ endi
static_build_confflags += $(confflags)
# Configuration flags for the non-optimized shared libraries
-shared_build_confflags += $(confflags) --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+shared_build_confflags += $(confflags)
# amd64 has no problems with optimized shared libs. i386 and arm do.
ifneq ($(DEB_HOST_ARCH),amd64)
shared_build_confflags += $(nooptflags)
@@@ -172,16 -176,16 +174,16 @@@ shared_build_confflags += --disable-sta
## specific to arm architectures
# Configuration flags for the optimised shared libraries
+ vfp_shlibdir := vfp
vfp_build_confflags += $(confflags)
- vfp_build_confflags += --shlibdir=/usr/lib/vfp
+ vfp_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/$(vfp_shlibdir)
vfp_build_confflags += --enable-shared
vfp_build_confflags += --disable-static
vfp_build_confflags += --extra-cflags="-mfpu=vfp $(float_abi)"
- vfp_build_confflags += --disable-ffmpeg
- vfp_build_confflags += --disable-ffplay
- # NB: NEON always implies v7+ and ffmpeg's NEON implementation requires VFP
+ # NB: NEON always implies v7+ and Libav's NEON implementation requires VFP
+ neon_shlibdir := neon/vfp
neon_build_confflags += $(confflags)
- neon_build_confflags += --shlibdir=/usr/lib/neon/vfp
+ neon_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/$(neon_shlibdir)
# the NEON pass now requires ubfx which was introduced in armv6t2; we need to
# enable at least armv6t2 for the NEON pass to build, but NEON implies armv7-a
# so pass armv7-a if it's not already enabled
@@@ -191,38 -195,33 +193,33 @@@ endi
neon_build_confflags += --extra-cflags="-mfpu=neon $(float_abi) -fPIC -DPIC"
neon_build_confflags += --enable-shared
neon_build_confflags += --disable-static
## i386 architecture specific
# Configuration flags for the optimized shared libraries
+ cmov_shlibdir := i686/cmov
cmov_build_confflags += $(confflags)
cmov_build_confflags += $(nooptflags)
- cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
+ cmov_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/$(cmov_shlibdir)
cmov_build_confflags += --cpu='i686'
cmov_build_confflags += --enable-shared
cmov_build_confflags += --disable-static
## powerpc architecture specific
# Configuration flags for the optimized shared libraries
+ altivec_shlibdir := altivec
altivec_build_confflags += $(confflags)
- altivec_build_confflags += --shlibdir=/usr/lib/altivec
+ altivec_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/$(altivec_shlibdir)
altivec_build_confflags += --cpu='g4'
altivec_build_confflags += --enable-shared
altivec_build_confflags += --disable-static
altivec_build_confflags += --enable-altivec
## sparc architecture specific
# Configuration flags for the optimized shared libraries
+ vis_shlibdir := v9
vis_build_confflags += $(confflags)
- vis_build_confflags += --shlibdir=/usr/lib/v9
+ vis_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/$(vis_shlibdir)
vis_build_confflags += --cpu='sparc64'
vis_build_confflags += --enable-shared
vis_build_confflags += --disable-static
vis_build_confflags += --extra-cflags="-fPIC -DPIC"
- vis_build_confflags += --disable-ffmpeg
- vis_build_confflags += --disable-ffplay
diff --combined debian/control
index 807fe82,f1d8c48..70269d5
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,9 +1,9 @@@
Source: libav
Section: libs
Priority: optional
- Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
- Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+ 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+debian at greffrath.com>,
@@@ -13,8 -14,10 +14,9 @@@ Standards-Version: 3.9.
Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
Homepage: http://libav.org/
- Build-Depends-Indep: doxygen
+ Build-Depends-Indep:
+ doxygen
-Build-Depends:
- debhelper (>= 8.1.3~),
+Build-Depends: debhelper (>= 7),
libasound2-dev [linux-any],
libbz2-dev,
libdc1394-22-dev [linux-any],
@@@ -39,34 -42,63 +41,63 @@@
libx11-dev,
libx264-dev,
libxext-dev,
- libxfixes-dev,
+ libxfixes-dev,
libxvidcore-dev,
libxvmc-dev,
texi2html,
yasm,
zlib1g-dev
- Package: ffmpeg
+ Package: libav-tools
Section: video
Architecture: any
- Replaces: libavcodec53 (<< ${source:Version}),
- libavcodec-extra-53 (<< 4:0.6~)
- Depends: ${shlibs:Depends},
- ${misc:Depends}
- Conflicts: ffprobe
+ Replaces:
+ ffmpeg (<< 4:0.8~),
+ libavcodec-extra-53 (<< 4:0.6~),
+ libavcodec53 (<< ${source:Version})
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+ Breaks:
+ ffmpeg (<< 4:0.8~)
+ Conflicts:
+ ffprobe
Description: Multimedia player, server, encoder and transcoder
- 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...).
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package contains the avplay multimedia player, the avserver
+ streaming server, the avconv audio and video encoder, and the avprobe
+ stream analyzer. They support most existing file formats (AVI, MPEG,
+ OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
+ DV...).
+
+ Package: ffmpeg
+ Section: oldlibs
+ Priority: extra
+ Architecture: all
+ Depends:
+ libav-tools,
+ ${misc:Depends},
+ ${shlibs:Depends}
+ Description: Multimedia player, server, encoder and transcoder (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
Package: ffmpeg-dbg
- Section: debug
+ Section: oldlibs
Priority: extra
Architecture: any
- Depends: libav-dbg,
+ Depends:
+ libav-dbg,
${misc:Depends}
- Description: Debug symbols for Libav related packages
+ Description: Debug symbols for Libav related packages (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This package contains debug data of the Libav related shared libraries.
.
Most people will not need this package. Please install it to produce useful
@@@ -79,15 -111,19 +110,19 @@@ Package: libav-db
Section: debug
Priority: extra
Architecture: any
- Depends: libavutil51 (= ${binary:Version}),
+ Depends:
+ libav-tools (= ${binary:Version}),
libavcodec53 (= ${binary:Version}),
libavdevice53 (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
libavformat53 (= ${binary:Version}),
+ libavutil51 (= ${binary:Version}),
+ libpostproc52 (= ${binary:Version}),
libswscale2 (= ${binary:Version}),
- ffmpeg (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for Libav related packages
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This package contains debug data of the Libav related shared libraries.
.
Most people will not need this package. Please install it to produce useful
@@@ -96,8 -132,12 +131,12 @@@
Package: libav-source
Architecture: all
Section: devel
- Depends: ${misc:Depends}
+ Depends:
+ ${misc:Depends}
Description: Patched Libav sources
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This package contains a tarball the source file that were used to produce
this package, containing all modifications that have been applied inline.
.
@@@ -105,11 -145,16 +144,16 @@@
the "extra" variants of libav.
Package: ffmpeg-doc
- Section: doc
+ Section: oldlibs
+ Priority: extra
Architecture: all
- Depends: libav-doc,
+ Depends:
+ libav-doc,
${misc:Depends}
Description: Documentation of the Libav API (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This package contains the html doxygen documentation of the Libav API.
.
Only application developers will find this package useful.
@@@ -120,43 -165,73 +164,69 @@@
Package: libav-doc
Section: doc
Architecture: all
- Depends: ${misc:Depends}
- Breaks: ffmpeg-doc (<< ${binary:Version})
- Replaces: ffmpeg-doc (<< ${binary:Version})
+ Depends:
+ ${misc:Depends}
+ Breaks:
+ ffmpeg-doc (<< ${binary:Version})
+ Replaces:
+ ffmpeg-doc (<< ${binary:Version})
Description: Documentation of the Libav API
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This package contains the html doxygen documentation of the Libav API.
.
Only application developers will find this package useful.
Package: libavutil51
Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
-Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Libav utility library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the common utility library from Libav. It contains shared code
used by all other Libav libraries.
Package: libavcodec53
Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
-Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Libav codec library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the codec library from Libav (both encoding and decoding).
.
It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
Package: libavdevice53
Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
-Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Libav device handling library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the device handling library from Libav.
Package: libavformat53
Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
-Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Libav file format library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the library for handling file formats from Libav.
.
It supports most existing file formats (AVI, MPEG, OGG, Matroska,
@@@ -164,32 -239,54 +234,51 @@@
Package: libavfilter2
Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
-Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Libav video filtering library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the video filtering library from Libav.
Package: libpostproc52
Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
-Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Libav video postprocessing library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the video postprocessing library from Libav.
Package: libswscale2
Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
-Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Libav video scaling library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the video software scaling library from Libav.
Package: libavutil-dev
Section: libdevel
Architecture: any
- Depends: libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
+ Depends:
libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}.99),
+ libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
${misc:Depends}
Description: Development files for libavutil
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the common utility library from Libav.
.
This package contains the header files and static libraries needed to
@@@ -198,11 -295,13 +287,13 @@@
Package: libavcodec-dev
Section: libdevel
Architecture: any
- Depends: libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
+ Depends:
libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}.99),
+ libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
- Suggests: libfaad-dev,
+ Suggests:
+ libfaad-dev,
libgsm1-dev,
libogg-dev,
libschroedinger-dev,
@@@ -214,6 -313,9 +305,9 @@@
zlib1g-dev,
${lib1394-dev}
Description: Development files for libavcodec
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the codec library from Libav. It supports most existing
encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
.
@@@ -223,11 -325,15 +317,15 @@@
Package: libavdevice-dev
Section: libdevel
Architecture: any
- Depends: libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
+ Depends:
libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}.99),
+ libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
libavformat-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavdevice
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the device handling library from Libav.
.
This package contains the header files and static libraries needed to
@@@ -236,11 -342,16 +334,16 @@@
Package: libavformat-dev
Section: libdevel
Architecture: any
- Depends: libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
+ Depends:
+ libavcodec-dev (= ${binary:Version}),
libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}.99),
- libavcodec-dev (= ${binary:Version}), libavutil-dev (= ${binary:Version}),
+ libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
+ libavutil-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavformat
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the demuxer library from Libav. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
.
@@@ -250,11 -361,15 +353,15 @@@
Package: libavfilter-dev
Section: libdevel
Architecture: any
- Depends: libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
- libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}.99),
+ Depends:
libavcodec-dev (= ${binary:Version}),
+ libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}.99),
+ libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
${misc:Depends}
Description: Development files for libavfilter
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the video filtering library from Libav.
.
This package contains the header files and static libraries needed to
@@@ -263,11 -378,15 +370,15 @@@
Package: libpostproc-dev
Section: libdevel
Architecture: any
- Depends: libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
- libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}.99),
+ Depends:
libavutil-dev (= ${binary:Version}),
+ libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}.99),
+ libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
${misc:Depends}
Description: Development files for libpostproc
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the video postprocessing library from Libav.
.
This package contains the header files and static libraries needed to
@@@ -276,11 -395,15 +387,15 @@@
Package: libswscale-dev
Section: libdevel
Architecture: any
- Depends: libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${source:Upstream-Version}),
- libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}.99),
+ Depends:
libavutil-dev (= ${binary:Version}),
+ libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}.99),
+ libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${source:Upstream-Version}),
${misc:Depends}
Description: Development files for libswscale
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
This is the video scaling library from Libav.
.
This package contains the header files and static libraries needed to
diff --combined debian/rules
index 5002070,3b79db3..a6fc2d9
--- a/debian/rules
+++ b/debian/rules
@@@ -4,9 -4,10 +4,10 @@@ EPOCH=4
DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
- SHLIBS_VERSION := 4:0.7-1
+ SHLIBS_VERSION := 4:0.8-2~
LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+ DEV_PKGS := $(shell echo $(LIB_PKGS) | sed 's/[0-9]\+\>/-dev/g')
# Support multiple makes at once
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@@ -21,17 -22,30 +22,30 @@@ endi
endif
include debian/confflags
+ OPT_FLAVORS := $(filter-out static shared, $(FLAVORS))
$(info FLAVORS = $(FLAVORS))
$(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
$(info CFLAGS = $(CFLAGS))
+ $(info CPPFLAGS = $(CPPFLAGS))
$(info LDFLAGS = $(LDFLAGS))
+ define dh_install_file_opt_flavor
+ grep @DEB_HOST_MULTIARCH_OPT@ < $(1).in | \
+ sed 's:@DEB_HOST_MULTIARCH_OPT@:$(DEB_HOST_MULTIARCH)/$($(2)_shlibdir):g' >> $(1)
+
+ endef
+
+ DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(DEV_PKGS), debian/$(pkg).install)
+ $(DH_INSTALL_FILES):
+ sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
+ $(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
+
configure-%: configure-stamp-%
- configure-stamp-%: $(QUILT_STAMPFN)
+ configure-stamp-%:
dh_testdir
mkdir -p debian-$*
- cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
+ cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
$($*_build_confflags) $(extra_$*_build_confflags)
touch $@
@@@ -45,7 -59,7 +59,7 @@@ debian-shared/tools/qt-faststart: build
$(MAKE) -C debian-shared tools/qt-faststart V=1
build-doxy: build-doxy-stamp
- build-doxy-stamp: $(QUILT_STAMPFN)
+ build-doxy-stamp:
dh_testdir
doxygen
touch $@
@@@ -60,7 -74,7 +74,7 @@@ clean
$(addprefix configure-stamp-, $(FLAVORS)) \
build-doxy-stamp
rm -rf $(addprefix debian-, $(FLAVORS)) doxy
- dh_clean
+ dh_clean $(DH_INSTALL_FILES)
get-orig-source:
dh_testdir
@@@ -73,7 -87,7 +87,7 @@@ define install_flavo
endef
- install: build
+ install: build $(DH_INSTALL_FILES)
dh_testdir
dh_testroot
dh_prep
@@@ -81,33 -95,32 +95,32 @@@
tar czvf debian/tmp/usr/src/libav-source.tar.gz . \
--exclude 'debian*' --exclude .git --exclude .pc --exclude '*-stamp' \
--transform 's,^./,libav/,'
- dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
+ dh_installdirs -ptmp usr/share/doc/libav/html etc
dh_installdirs -ptmp usr/share/doc/libav-doc/html
$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
# don't fail on binary-indep only builds.
[ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/libav-doc
- install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
- install -m 644 -D doc/ffserver.conf debian/tmp/etc/
+ install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
+ install -m 644 -D doc/avserver.conf debian/tmp/etc/
install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
- dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/ffmpeg \
+ dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/libav \
--fail-missing --sourcedir=debian/tmp
formats.txt: install
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
- debian/tmp/usr/bin/ffmpeg -formats | tee $@
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ debian/tmp/usr/bin/avconv -formats | tee $@
codecs.txt: install
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
- debian/tmp/usr/bin/ffmpeg -codecs | tee $@
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ debian/tmp/usr/bin/avconv -codecs | tee $@
binary-indep: build-doxy install
binary-arch: build install codecs.txt formats.txt
dh_testdir
dh_testroot
- dh_installman -pffmpeg debian/qt-faststart.1
+ dh_installman -plibav debian/qt-faststart.1
dh_installdocs doc/optimization.txt
- dh_installdocs -A CREDITS doc/TODO
dh_installdocs -A debian/README.Debian
dh_installdocs -p libavcodec53 codecs.txt
dh_installdocs -p libavformat53 formats.txt
@@@ -115,8 -128,8 +128,8 @@@
-plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
-plibswscale-dev -plibavutil-dev -plibav-doc \
doc/APIchanges
- dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
- dh_installexamples -plibavcodec-dev libavcodec/api-example.c
+ dh_installexamples -p libav doc/avserver.conf debian/recordshow.sh
+ dh_installexamples -p libavcodec-dev libavcodec/api-example.c
dh_installchangelogs Changelog
dh_lintian
dh_link
@@@ -129,7 -142,7 +142,7 @@@
upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION).99)"; \
done
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
dh_shlibdeps
# target dependencies for external packages
for pkg in $(LIB_PKGS); do \
diff --combined debian/source.lintian-overrides
index ba6ab02,0000000..91f4401
mode 100644,000000..100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@@ -1,5 -1,0 +1,2 @@@
- # The dependencies for packages within ffmpeg are different than the
- # dependencies for packages that depend on the ffmpeg libraries.
- libav source: debian-rules-calls-debhelper-in-odd-order
+# ffmpeg-dbg is an empty, transitional package
+libav source: dbg-package-missing-depends ffmpeg-dbg
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list