[SCM] FFmpeg packaging branch, ubuntu.extra, updated. extra/debian/0.5+svn20090706-5ubuntu1
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jan 17 08:40:13 UTC 2010
The following commit has been merged in the ubuntu.extra branch:
commit 325a204c0504ee2ca301b7d4cbea67499dd29300
Merge: f1db80bda75c82a0faf3a9999687c874f08b0487 047264a9a7bf1602f378a965ab3a77982354f6b3
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Jan 17 09:34:12 2010 +0100
Merge branch 'ubuntu' into ubuntu.extra
diff --combined debian/changelog
index 7da002d,b427726..ebcd24f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,83 +1,83 @@@
- ffmpeg-extra (4:0.5+svn20090706-2ubuntu5~ppa2) lucid; urgency=low
+ ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
- * export *all* symbols of libswscale, should unbreak mplayer
+ * merge from debian, remaining changes:
+ - dont disable internal encoders
+ - disabled extra depedencies (come with ffmpeg-extra)
+ - libdirac
+ - libopenjpeg
- -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 23:47:08 +0100
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 16 Jan 2010 10:12:15 +0100
- ffmpeg-extra (4:0.5+svn20090706-2ubuntu5~ppa1) lucid; urgency=low
+ ffmpeg (4:0.5+svn20090706-4) unstable; urgency=low
- * merge from 'ffmpeg' package
+ [ Loïc Minier ]
+ * Use default toolchain setup on ARM flavors for noopt and only add FPU
+ CFLAGS in the VFP and NEON flavors; this is ok since internally, cpu will
+ be set to "generic" but -march=generic or -mcpu=generic will NOT be added
+ to the build flags.
+ * Build all armel flavours with -marm since ffmpeg has a lot of hand crafted
+ assembly which doesn't build in the new lucid default mode (Thumb 2);
+ LP: #488267
+ * Build all armel flavours with -fPIC -DPIC instead of just the neon flavour
+ as the new flags/toolchain require this in Ubuntu lucid.
+ * Build some assembly test code -- just like configure -- to decide whether
+ the *default* toolchain uses vfp or neon to decided whether to build the
+ vfp and neon flavors.
+ * Drop --disable/--enable opt flags such as --disable-neon or
+ --enable-armvfp on ARM since the upstream configure script will do the
+ right thing when the proper flags are set.
+
+ -- Loïc Minier <lool at dooz.org> Wed, 13 Jan 2010 12:57:32 +0100
+
+ ffmpeg (4:0.5+svn20090706-3) experimental; urgency=low
+
+ [ Loïc Minier ]
+ * Disable more autodetecter ARM arch features
+ * Enable neon flavour
+ * Update NEON confflags to assume v7 and VFP
+ * Add backported NEON patches from ffmpeg trunk
+ * Pass proper --cpu and --extra-flags on armel
+ * Pass -fPIC -DPIC to neon pass
+
+ [ Fabian Greffrath ]
+ * Initialize the FLAVORS variable to static instead of appending to
+ it. Also, we do not support the internalencoders variable anymore.
+
+ [ Andres Mejia ]
+ * Remove unused patches from packaging.
+ * Update Vcs-* entries to new location.
+ * Bump Standards-Version to 3.8.3.
+
+ [ Reinhard Tartler ]
+ * change shlibs file to make applications depend on the -extra- packages
+ * loosen dependencies further, so that the -dev packages remain
+ installable even if ffmpeg-extra is 'out-of-date'
+ * add patch for issue1245: Make arguments of av_set_pts_info() unsigned.
+ * Support constant-quant encoding for libtheora, LP: #356322
+ * increase swscale compile time width (VOF/VOFW), LP: #443264
+ * Backports of various security patches, Closes: #550442, including:
+ - backport fixes for vorbis_dec
+ - backport oggparsevorbis fix
+ - backport vp3 fixes
+ - backport ffv1 fix
+ - libavcodec/mpegaudiodec.c backports
+ - h264 security backports
+ - backported libavformat/mov.c security fixes
+ - backported libavformat/oggdec.c security fixes
+ - backport svn r18016 aka 'MOV-Support-stz2-Compact-Sample-Size-Box'
+ to fix FTBFS
+ * enable symbol versioning
+ * bump shlibs version
+ * add README.source describing how this source package manages patches
+ * make sure the ${misc:Depends} substvar is used for each binary package
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jan 2010 16:27:40 +0100
+
+ ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa2) lucid; urgency=low
+
+ * export *all* symbols of libswscale, fixes FTBFS in mplayer
- -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 18:28:57 +0100
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 23:37:21 +0100
ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa1) lucid; urgency=low
@@@ -25,12 -94,6 +94,12 @@@ ffmpeg (4:0.5+svn20090706-2ubuntu4) luc
-- Reinhard Tartler <siretart at tauware.de> Mon, 21 Dec 2009 23:57:34 +0100
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
+
+ * merge from 'ffmpeg' package
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 10 Nov 2009 13:18:24 +0100
+
ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
* security backports from ffmpeg trunk (Closes: #550442)
@@@ -45,27 -108,14 +114,27 @@@
-- Reinhard Tartler <siretart at tauware.de> Thu, 05 Nov 2009 20:31:29 +0100
-ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu3) karmic; urgency=low
+
+ * make the conflicts/replaces on the former -unstripped- variants
+ versioned so the -unstripped- and -extra- variants can actually be
+ coinstalled.
+ * remove references to obsolete 'cvs' packages. these have never existed
+ in ubuntu after all.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 16 Oct 2009 10:29:16 +0200
+
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
[ Reinhard Tartler ]
+ * merge from the 'ffmpeg' package
* Make arguments of av_set_pts_info() unsigned.
* update debian/changelog
* use patch for issue1245 from git.ffmpeg.org
* Support constant-quant encoding for libtheora, LP: #356322
* increase swscale compile time width (VOF/VOFW), LP: #443264
+ * Add missing Conflicts/Replaces to ensure a working upgrade patch from
+ intrepid/jaunty. LP: #418785
[ Loïc Minier ]
* Update config for karmic's armel toolchain.
@@@ -75,19 -125,7 +144,19 @@@
* Pass proper --cpu and --extra-flags on armel.
* Pass -fPIC -DPIC to neon pass.
- -- Loïc Minier <loic.minier at ubuntu.com> Tue, 13 Oct 2009 23:56:04 +0200
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 14 Oct 2009 09:15:50 +0200
+
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
+
+ * merge from the 'ffmpeg' package
+ * enable dirac, libopenjpeg
+ * reintroduce the formats.txt file
+ * reintroduce "missing" codecs: LP: #419103
+ * is co-installable with the -dev packages LP: #416436, #418168
+ * should now have the proper replaces lines: LP: #418789, #418799, #418807, #323789
+ * don't build doxygen documentation, it is not installed anyway
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 11:50:32 +0200
ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
@@@ -216,15 -254,6 +285,15 @@@ ffmpeg-debian (4:0.5+svn20090609-1ubunt
-- 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:
@@@ -430,24 -459,6 +499,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:
@@@ -505,21 -516,6 +574,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
@@@ -557,16 -553,6 +626,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.
diff --combined debian/confflags
index db7757d,1fe25de..46c75fc
--- a/debian/confflags
+++ b/debian/confflags
@@@ -1,8 -1,8 +1,8 @@@
# -*- mode: makefile -*-
# vim:syntax=make
- #
+
# build a static version on every architecture in the 'debian' ffmpeg package
- FLAVORS += static
+ FLAVORS := static
# shared is generic, i.e. without arch specific opcodes
FLAVORS += shared
@@@ -13,27 -13,46 +13,46 @@@ export DEB_HOST_ARCH ?= $(shell dp
SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN")
+ # this is only used for the check_asm macro
+ ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ CC := gcc
+ else
+ CC := $(DEB_HOST_GNU_TYPE)-gcc
+ endif
+
+ # this outputs 0 or 1 depending on whether a piece of assembly can be compiled
+ # with the *default* gcc flags; this is used to test the toolchain *default*
+ # configuration
+ check_asm = $(shell echo 'void foo(void) { __asm__ volatile("$(1)"); }' | $(CC) -x c -c - -o /dev/null 2>/dev/null && echo 1 || echo 0)
+
# the other flavors always build dynamic versions
# Also, disable architecture-specific optimizations for default shared build
- ifeq ($(DEB_HOST_ARCH),armel)
- # Ubuntu karmic and later assume v6 + VFP; just override CPU since it defaults
- # to uname -m
- nooptflags += --cpu=armv6 --extra-cflags="-mfpu=vfp -mfloat-abi=softfp"
- #FLAVORS += vfp
- FLAVORS += neon
- else ifeq ($(DEB_HOST_ARCH),arm)
- nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2
- nooptflags += --disable-armvfp --disable-neon
+ ifeq ($(DEB_HOST_ARCH),armel)
+ # whether the toolchain *default* configuration includes vfp and neon
+ vfp_asm := fadds s0, s0, s0
+ has_vfp := $(call check_asm, $(vfp_asm))
+ neon_asm := vadd.i16 q0, q0, q0
+ has_neon := $(call check_asm, $(neon_asm))
+
+ # only build
+ ifneq ($(has_vfp),1)
+ FLAVORS += vfp
+ endif
+ ifneq ($(has_neon),1)
+ FLAVORS += neon
+ endif
else ifeq ($(DEB_HOST_ARCH),i386)
- FLAVORS += cmov
+ FLAVORS += cmov
else ifeq ($(DEB_HOST_ARCH),powerpc)
- FLAVORS += altivec
- nooptflags += --disable-altivec
+ FLAVORS += altivec
+ nooptflags += --disable-altivec
else ifeq ($(DEB_HOST_ARCH),sparc)
- FLAVORS += vis
- nooptflags += --disable-vis
+ FLAVORS += vis
+ nooptflags += --disable-vis
endif
+ $(info Building FLAVORS=$(FLAVORS))
+
define cond_enable
$(shell test -r $(1) && echo --enable-$(2) )
endef
@@@ -52,11 -71,6 +71,6 @@@ gpl_confflags += --enable-x11gra
# there is no libfaad in ubuntu/main, on in ubuntu/multiverse
gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
- # don't disable encoders if internalencoders is set in DEB_BUILD_OPTIONS
- ifeq (,$(filter internalencoders,$(DEB_BUILD_OPTIONS)))
- confflags += $(disable_encoders)
- endif
-
# Common configuration flags
confflags += --extra-version='$(DEB_VERSION)'
confflags += --prefix=/usr
@@@ -64,9 -78,7 +78,9 @@@ confflags += --enable-avfilte
confflags += --enable-avfilter-lavf
confflags += --enable-vdpau
confflags += --enable-bzlib
+confflags += --enable-libdirac
confflags += --enable-libgsm
+confflags += --enable-libopenjpeg
confflags += --enable-libschroedinger
confflags += --enable-libspeex
confflags += --enable-libtheora
@@@ -75,6 -87,11 +89,11 @@@ confflags += --enable-pthread
confflags += --enable-zlib
confflags += --disable-stripping
confflags += --disable-vhook
+ ifeq ($(DEB_HOST_ARCH),armel)
+ # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
+ # plenty of incompatible assembly; not sure how to detect that properly
+ confflags += --extra-cflags="-marm -fPIC -DPIC"
+ endif
confflags += $(extra_common_confflags)
# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
@@@ -98,9 -115,6 +117,6 @@@ 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 :=
@@@ -127,7 -141,6 +143,6 @@@ shared_build_confflags += --disable-sta
# Configuration flags for the optimised shared libraries
vfp_build_confflags += $(confflags)
vfp_build_confflags += --shlibdir=/usr/lib/vfp
- vfp_build_confflags += --enable-armvfp
vfp_build_confflags += --enable-shared
vfp_build_confflags += --disable-static
vfp_build_confflags += --extra-cflags="-mfpu=vfp -mfloat-abi=softfp"
@@@ -136,7 -149,6 +151,6 @@@ vfp_build_confflags += --disable-ffpla
# NB: NEON always implies v7+ and ffmpeg's NEON implementation requires VFP
neon_build_confflags += $(confflags)
neon_build_confflags += --shlibdir=/usr/lib/neon/vfp
- neon_build_confflags += --cpu=armv7-a
neon_build_confflags += --extra-cflags="-mfpu=neon -mfloat-abi=softfp -fPIC -DPIC"
neon_build_confflags += --enable-shared
neon_build_confflags += --disable-static
@@@ -161,7 -173,6 +175,6 @@@ altivec_build_confflags += --shlibdir=/
altivec_build_confflags += --cpu='g4'
altivec_build_confflags += --enable-shared
altivec_build_confflags += --disable-static
- altivec_build_confflags += --extra-cflags="-fPIC -DPIC"
altivec_build_confflags += --enable-altivec
altivec_build_confflags += --disable-ffmpeg
altivec_build_confflags += --disable-ffplay
diff --combined debian/control
index 7858edb,ebed89b..705e522
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
-Source: ffmpeg
+Source: ffmpeg-extra
Section: libs
Priority: optional
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
@@@ -6,31 -6,21 +6,31 @@@ XSBC-Original-Maintainer: Debian multim
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>,
+ Fabian Greffrath <fabian+debian at greffrath.com>,
Andres Mejia <mcitadel at gmail.com>
DM-Upload-Allowed: yes
- Standards-Version: 3.8.2
- 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
+ Standards-Version: 3.8.3
+ 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.org/
Build-Depends-Indep: doxygen
Build-Depends: debhelper (>= 7),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libavcodec-dev,
+ libavfilter-dev,
+ libavformat-dev,
+ libavutil-dev,
libbz2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdirac-dev,
+ libfaad-dev | libfaad2-dev,
libfreetype6-dev,
libgsm1-dev,
+ libopenjpeg-dev,
libimlib2-dev,
+ libmp3lame-dev,
+ libopenjpeg-dev,
+ libpostproc-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libschroedinger-dev,
libsdl1.2-dev,
@@@ -38,145 -28,224 +38,146 @@@
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
libx11-dev,
+ libx264-dev,
libxext-dev,
+ libxvidcore-dev | libxvidcore4-dev,
+ libvdpau-dev,
libxvmc-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}),
- ${misc:Depends}
-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-extra-49
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libavutil49, libavutil-unstripped-49 (<< ${binary:Version})
+Replaces: libavutil49, libavutil-unstripped-49 (<< ${binary:Version})
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: libavutil-unstripped-49
+Architecture: any
+Depends: libavutil-extra-49 (= ${binary:Version})
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
+
+Package: libavcodec-extra-52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Suggests: libfaad0
+Conflicts: libavcodec52, libavcodec-unstripped-52 (<< ${binary:Version})
+Replaces: libavcodec52, libavcodec-unstripped-52 (<< ${binary:Version})
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: libavcodec-unstripped-52
+Architecture: any
+Depends: libavcodec-extra-52 (= ${binary:Version})
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
+
+Package: libavdevice-extra-52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libavdevice52, libavdevice-unstripped-52 (<< ${binary:Version})
+Replaces: libavdevice52, libavdevice-unstripped-52 (<< ${binary:Version})
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: libavdevice-unstripped-52
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
- object that should only be used by Debian packages.
+Depends: libavdevice-extra-52 (= ${binary:Version})
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
-Package: libavfilter0
+Package: libavfilter-extra-0
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libavfilter0, libavfilter-unstripped-0 (<< ${binary:Version})
+Replaces: libavfilter0, libavfilter-unstripped-0 (<< ${binary:Version})
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: libavfilter-unstripped-0
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-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
- object that should only be used by Debian packages.
+Conflicts: libavfilter0
+Replaces: libavfilter0
+Depends: libavfilter-extra-0 (= ${binary:Version})
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
-Package: libswscale0
+Package: libpostproc-extra-51
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Description: ffmpeg video scaling library
- This is the video scaling library from the ffmpeg project.
+Conflicts: libpostproc51, libpostproc-unstripped-51 (<< ${binary:Version})
+Replaces: libpostproc51, libpostproc-unstripped-51 (<< ${binary:Version})
+Description: ffmpeg video postprocessing library
+ This is the video postprocessing library from the ffmpeg project.
.
- This package contains a Debian-specific version of the libswscale shared
+ This package contains a unrestricted version of the libpostproc shared
object that should only be used by Debian packages.
-Package: libavutil-dev
-Section: libdevel
+Package: libpostproc-unstripped-51
Architecture: any
-Depends: libavutil49 (>= ${binary:Version}) | libavutil-extra-49 (>= ${source:Upstream-Version}),
- libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-extra-49 (<= ${source:Upstream-Version}-99),
- ${misc:Depends}
-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-extra-52 (>= ${source:Upstream-Version}),
- libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-extra-52 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
- ${misc:Depends}
-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-extra-52 (>= ${source:Upstream-Version}),
- libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-extra-52 (<= ${source:Upstream-Version}-99),
- libavformat-dev (= ${binary:Version}),
- ${misc:Depends}
-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.
+Depends: libpostproc-extra-51 (= ${binary:Version})
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
-Package: libavformat-dev
-Section: libdevel
+Package: libavformat-extra-52
Architecture: any
-Depends: libavformat52 (>= ${binary:Version}) | libavformat-extra-52 (>= ${source:Upstream-Version}),
- libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-extra-52 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: development files for libavformat
+Conflicts: libavformat52, libavformat-unstripped-52 (<< ${binary:Version})
+Replaces: libavformat52, libavformat-unstripped-52 (<< ${binary:Version})
+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.
+ This package contains a unrestricted version of the libavformat shared
+ object that should only be used by Debian packages.
-Package: libavfilter-dev
-Section: libdevel
+Package: libavformat-unstripped-52
Architecture: any
-Depends: libavfilter0 (>= ${binary:Version}) | libavfilter-extra-0 (>= ${source:Upstream-Version}),
- libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-extra-0 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version}),
- ${misc:Depends}
-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.
+Depends: libavformat-extra-52 (= ${binary:Version})
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
-Package: libpostproc-dev
-Section: libdevel
+Package: libswscale-extra-0
Architecture: any
-Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-extra-51 (>= ${source:Upstream-Version}),
- libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-extra-51 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: development files for libpostproc
- This is the video postprocessing library from the ffmpeg project.
+Conflicts: libswscale0, libswscale-unstripped-0 (<< ${binary:Version})
+Replaces: libswscale0, libswscale-unstripped-0 (<< ${binary:Version})
+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 libpostproc.
+ This package contains a unrestricted version of the libswscale 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-extra-0 (>= ${source:Upstream-Version}),
- libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-0 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
- ${misc:Depends}
-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.
+Depends: libswscale-extra-0 (= ${binary:Version})
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
+
diff --combined debian/rules
index 6512aea,1aa1b74..3921b6b
--- 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 := 4:0.5+svn20090706-2ubuntu5~
+ SHLIBS_VERSION := 4:0.5+svn20090706-3
ifeq ($(SVN_VERSION),)
$(error UPSTREAM_VERSION: $(UPSTREAM_VERSION) - but SVN_VERSION is empty! - check debian/rules)
@@@ -96,13 -96,13 +96,13 @@@ install: buil
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
dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
- --fail-missing --sourcedir=debian/tmp
+ --list-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 $@
-binary-indep: build-doxy install
+binary-indep: install
binary-arch: build install formats.txt
dh_testdir
@@@ -112,7 -112,7 +112,7 @@@
dh_installdocs -A MAINTAINERS CREDITS doc/TODO
dh_installdocs -A debian/README.Debian
dh_installdocs RELEASE
- dh_installdocs -p libavcodec52 formats.txt
+ dh_installdocs -p libavcodec-extra-52 formats.txt
dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
dh_installchangelogs Changelog
@@@ -120,17 -120,19 +120,17 @@@
dh_link
dh_compress
dh_fixperms
- dh_strip --dbg-package=ffmpeg-dbg
+ dh_strip
# strict internal dependencies
for pkg in $(LIB_PKGS); do \
- upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(DEB_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
done
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 \
- upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
done
dh_installdeb
dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list