[SCM] ffmpeg/ubuntu: Merge commit 'debian/0.6.1-1' into ubuntu

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Nov 14 19:23:50 UTC 2010


update debian/changelog
remove 0004-cpp-hack.patch
add gitignore file
remove patches merged upstream
Merge commit 'upstream/0.6.1' into master.snapshot
Imported Upstream version 0.6.1
search for gzipped tarballs
neon: set arch via --cpu instead of --extra-cflags
Drop -marm; obsolete
Drop -fPIC -DPIC when CPU is arm; obsolete
confflags: only pass -mfloat-abi=softfp if needed
Use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_CPU
confflags: switch to DEB_HOST_GNU_CPU on arm
Force upgrades of pre-rc4 versions of the mplayer package (Closes: #595241)
confflags: Pass -marmv7-a for the NEON flavor if needed; closes: #594093
Move breaks declaration from libavformat to libavcodec to help the apt solver, Closes: #591881
remove notes about stripping encoders, we ship uncrippled packages now in main
disable AAC decoder and encoder on ia64
no longer disable encoders
fix dependency on libswscale-extra-0
cleanup confflags handling for 'soft' optional dependencies
weaken internal shlibs dependencies on -extra- packages
Debian specific hack to unbreak c++ applications naively including FFmpeg headers
prepare new upload
Merge branch 'master.snapshot' of git+ssh://git.debian.org/git/pkg-multimedia/ffmpeg into master.snapshot
Correct grammar error in README.Debian (Closes: #587898), thanks jidanni.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 7e55d9493bd67372b3965ed955b66ffb494b30a6
X-Git-Newrev: 873c92e8d235ef506ac1505c9c20f334d45440e7

The following commit has been merged in the ubuntu branch:
commit a6ae5fb03181a8ed3179cd21903846126704d55b
Merge: 7e55d9493bd67372b3965ed955b66ffb494b30a6 983ce436bc1e5559876013a55d7ed01ffa48d060
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 12:19:28 2010 +0100

    Merge commit 'debian/0.6.1-1' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/confflags
    	debian/control
    	debian/patches/series

diff --combined debian/changelog
index b3e6a94,7d16bb7..925dad3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,12 +1,50 @@@
+ ffmpeg (4:0.6.1-1) experimental; urgency=low
+ 
+   * Imported Upstream version 0.6.1
+   * prepare new upload
+   * remove patches merged upstream
+   * add gitignore file
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Mon, 01 Nov 2010 09:18:08 +0100
+ 
 +ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low
 +
 +  * fix dependency on libswscale-extra-0, LP: #637895
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 05 Oct 2010 21:25:53 +0200
 +
 +ffmpeg (4:0.6-2ubuntu5) maverick; urgency=low
 +
 +  * Add flic video patch. Fixes CVE-2010-3429
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 05 Oct 2010 21:11:41 +0200
 +
 +ffmpeg (4:0.6-2ubuntu4) maverick; urgency=low
 +
 +  * Configure with --enable-pic on powerpc. LP: #654666.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Mon, 04 Oct 2010 19:39:46 +0200
 +
 +ffmpeg (4:0.6-2ubuntu3) maverick; urgency=low
 +
 +  * add libxfixes-dev to build-depends, LP: #631103
 +
 + -- Dominic Evans <oldmanuk at gmail.com>  Fri, 10 Sep 2010 14:21:23 +0100
 +
 +ffmpeg (4:0.6-2ubuntu2) maverick; urgency=low
 +
 +  * weaken the dependencies for the -extra package
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jul 2010 20:38:27 -0400
 +
 +ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
 +
 +  * merge from debian/experimental. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jul 2010 11:00:54 -0400
 +
  ffmpeg (4:0.6-2) experimental; urgency=low
  
    [ Fabian Greffrath ]
@@@ -61,18 -32,6 +70,18 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Tue, 29 Jun 2010 09:07:56 +0200
  
 +ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low
 +
 +  * merge from debian/experimental. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac and libopenjpeg (all in universe)
 +  * new upstream release
 +    - internal vorbis encoder is disabled. LP: #585330
 +    - includes native AMR-NB decoder, LP: #93849
 +    - api-example is fixed: LP: #557319
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 12:53:24 +0200
 +
  ffmpeg (4:0.6-1) experimental; urgency=low
  
    * new upstream release
@@@ -82,21 -41,6 +91,21 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 09:25:28 +0200
  
 +ffmpeg (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
 +
 +  * add proper replaces, fixes: LP: #587369
 +  * fix typo in dependency on libavfilter-extra-1. LP: #587431
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Jun 2010 11:33:32 +0200
 +
 +ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
 +
 +  * merge from debian/experimental. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac and libopenjpeg (all in universe)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 May 2010 00:01:17 +0200
 +
  ffmpeg (4:0.6~svn20100505-1) experimental; urgency=low
  
    * update to new upstream. Closes: #569727
@@@ -114,63 -58,6 +123,63 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 24 Jan 2010 21:24:56 +0100
  
 +ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
 +
 +  * merge from debian. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac and libopenjpeg (all in universe)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 04 Mar 2010 10:34:37 +0100
 +
 +ffmpeg (4:0.5.1-1) unstable; urgency=low
 +
 +  * new upstream release:
 +    - clarifies documentation on metadata, Closes: #570050, LP: #501729
 +    - further security backports, Closes: #570713
 +  * adapt to new versioning scheme
 +  * use '<<' instead of '<' relationship for internal shlib file
 +  * merge changes from ubuntu packaging
 +  * drop wmapro backport again as discussed with upstream. The unrelated
 +    changes seem too risky for a stable release.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 03 Mar 2010 22:28:24 +0100
 +
 +ffmpeg (4:0.5+svn20090706-6) unstable; urgency=low
 +
 +  [ Fabian Greffrath ]
 +  * debian/patches/901-fix-misc-typos.patch: New patch taken from
 +    upstream GIT (slightly modified) to fix some spelling errors.
 +  * Document our calling of debhelper programs in an odd order in
 +    debian/rules.
 +
 +  [ Reinhard Tartler ]
 +  * document some unattributed patches
 +  * enable cpu autodetection in libswscale, Closes: #567725, LP: #386397
 +
 +  [ Christopher Martin ]
 +  * backport wmapro codec from ffmpeg trunk
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 31 Jan 2010 16:53:47 +0100
 +
 +ffmpeg (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
 +
 +  * tighten build dependency on new x264 package
 +  * add x264 backport for ffmpeg 0.5
 +  * install presets in 'libavcodec package' instead of 'ffmpeg' binary,
 +    see git history for rationale of this change
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 17 Feb 2010 08:37:17 +0100
 +
 +ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
 +
 +  * 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, 16 Jan 2010 10:12:15 +0100
 +
  ffmpeg (4:0.5+svn20090706-5) unstable; urgency=medium
  
    * Upload to unstable
@@@ -197,7 -84,10 +206,7 @@@ ffmpeg (4:0.5+svn20090706-4) experiment
      --enable-armvfp on ARM since the upstream configure script will do the
      right thing when the proper flags are set.
  
 -  [ Reinhard Tartler ]
 -  * build with PIC on powerpc (Closes: #561956)
 -
 - -- Reinhard Tartler <siretart at tauware.de>  Fri, 15 Jan 2010 21:46:49 +0100
 + -- Loïc Minier <lool at dooz.org>  Wed, 13 Jan 2010 12:57:32 +0100
  
  ffmpeg (4:0.5+svn20090706-3) experimental; urgency=low
  
@@@ -242,73 -132,6 +251,73 @@@
    * 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 23:37:21 +0100
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa1) lucid; urgency=low
 +
 +  * Imported Debian patch 0.5+svn20090706-2ubuntu4
 +  * revert gbp.conf to point to lucid branch
 +  * enable symbol versioning
 +  * bump shlibs version
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 02 Jan 2010 15:03:09 +0100
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
 +
 +  * add build dependency on 'yasm', since it is now moved to main.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 21 Dec 2009 23:57:34 +0100
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
 +
 +  * security backports from ffmpeg trunk (Closes: #550442)
 +   - libavcodec/mpegaudiodec
 +   - libavcodec/vorbis_dec
 +   - libavcodec/ffv1
 +   - libavcodec/vp3
 +   - libavcodec/h264
 +   - libavformat/mov
 +   - libavformat/oggdec
 +   - libavformat/oggparsevorbis
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Nov 2009 20:31:29 +0100
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
 +
 +  [ Reinhard Tartler ]
 +  * 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
 +
 +  [ Loïc Minier ]
 +  * Update config for karmic's armel toolchain.
 +  * Enable neon flavour; LP: #383240.
 +  * Update NEON confflags to assume v7 and VFP.
 +  * Add backported NEON patches from ffmpeg trunk; see debian/patches/neon/.
 +  * 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
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
 +
 +  * merge from debian. Remaining changes:
 +    - disabled output decoders: faad, openjpeg, dirac (all not in main)
 +    - build arm vfp variant
 +    - don't build depend on yasm.
 +  * fix dependencies on -extra packages: LP: #418705, #416348
 +  * no need to remove mpeg encoders in the ubuntu package, unless we hear
 +    otherwise from some patent owner. This brings back the mpeg2video
 +    encoder is available. cf. formats.txt.gz LP: #416585
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 Aug 2009 11:20:03 +0200
  
  ffmpeg (4:0.5+svn20090706-2) unstable; urgency=low
  
@@@ -325,30 -148,6 +334,30 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 Aug 2009 09:12:49 +0200
  
 +ffmpeg (4:0.5+svn20090706-1ubuntu3) karmic; urgency=low
 +
 +  * update the dependencies of the -dev packages for the
 +    unstripped -> extra renaming
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 25 Aug 2009 16:37:23 +0200
 +
 +ffmpeg (4:0.5+svn20090706-1ubuntu2) karmic; urgency=low
 +
 +  * really drop libopenjpeg from build depends.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 25 Aug 2009 08:17:17 +0200
 +
 +ffmpeg (4:0.5+svn20090706-1ubuntu1) karmic; urgency=low
 +
 +  * merge from debian. Remaining changes:
 +    - don't build-depend on libfaad-dev, disabling faad decoder.
 +    - build arm vfp variant
 +    - don't build libopenjpeg support (not in main)
 +  * change shlibs file to make applications depend on the -extra- packages.
 +  * don't build depend on yasm.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Aug 2009 18:18:23 +0200
 +
  ffmpeg (4:0.5+svn20090706-1) unstable; urgency=low
  
    * preparing new upstream version, 0.5 release branch, rev 19352
@@@ -409,31 -208,6 +418,31 @@@ ffmpeg-debian (4:0.5+svn20090609-2) uns
  
   -- Reinhard Tartler <siretart at tauware.de>  Thu, 13 Aug 2009 12:46:46 +0200
  
 +ffmpeg-debian (4:0.5+svn20090609-1ubuntu3) karmic; urgency=low
 +
 +  * do not forcefully enable objenjpeg, it is not avaiable in this build
 +    anyway
 +  * don't build against faac in any case, it is deemed non-free
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 25 Jul 2009 09:15:12 +0200
 +
 +ffmpeg-debian (4:0.5+svn20090609-1ubuntu2) karmic; urgency=low
 +
 +  * remove libopenjpeg-dev from build depends (fixes FTBFS)
 +  * remove duplicate libxvmc-dev build-dependency
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 24 Jul 2009 21:53:47 +0200
 +
 +ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low
 +
 +  * merge from debian. Remaining changes:
 +    - don't build-depend on libfaad-dev, disabling faad decoder.
 +    - build arm vfp variant
 +  * update gbp.conf
 +  * move gbp.conf to debian/
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 18 Jul 2009 10:55:24 +0200
 +
  ffmpeg-debian (4:0.5+svn20090609-1) unstable; urgency=low
  
    [ Andres Mejia ]
@@@ -548,49 -322,6 +557,49 @@@ ffmpeg-debian (4:0.5+svn20090420-1) uns
    
   -- Reinhard Tartler <siretart at tauware.de>  Sat, 02 May 2009 09:09:54 +0200
  
 +ffmpeg-debian (3:0.svn20090303-1ubuntu6) jaunty; urgency=low
 +
 +  * vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp".
 +
 + -- Loic Minier <lool at dooz.org>  Fri, 10 Apr 2009 21:34:29 +0200
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu5) jaunty; urgency=low
 +
 +  * Disable more autodetected ARM arch features.
 +  * Add neon and vfp flavors to armel disabled for now.
 +  * Enable vfp pass on armel; leave the neon disabled.
 +
 + -- Loïc Minier <lool at dooz.org>  Fri, 10 Apr 2009 17:58:52 +0200
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu4) jaunty; urgency=low
 +
 +  * brown paperbag upload. Actually include the patch intended for the
 +    last upload.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Mar 2009 14:55:46 +0100
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu3) jaunty; urgency=low
 +
 +  * don't disable ffserver in specialised flavors. Fixes LP: #345370
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Mar 2009 14:52:25 +0100
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu2) jaunty; urgency=low
 +
 +  * No-change rebuild to fix lpia shared library dependencies.
 +
 + -- Colin Watson <cjwatson at ubuntu.com>  Thu, 19 Mar 2009 17:26:36 +0000
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low
 +
 +  * FFE granted in LP: #340303.
 +
 +  * merge from debian/unstable.
 +  * remaining changes to debian:
 +    - don't build-depend on libfaad-dev, disabling faad decoder.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 13 Mar 2009 08:54:33 +0100
 +
  ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
  
    * New Upstream Version (svn revision 17737 libswscale revision 28799)
@@@ -629,13 -360,6 +638,13 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 22 Feb 2009 09:32:49 +0100
  
 +ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian. Remaining changes:
 +    - don't build depend on libfaad-dev
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Feb 2009 21:22:01 +0100
 +
  ffmpeg-debian (3:0.svn20090204-2) experimental; urgency=low
  
    * add libxvmc-dev to build-depends in the 'ffmpeg' variant
@@@ -686,13 -410,6 +695,13 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 01 Feb 2009 19:54:27 +0100
  
 +ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian. LP: #318501
 +  * new version fixes CVE-2008-3230, LP: #253767
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 20 Jan 2009 09:20:53 +0100
 +
  ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
  
    * New Upstream Version (svn revision 16681 libswscale revision 28341)
@@@ -723,16 -440,6 +732,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jan 2009 20:55:48 +0100
  
 +ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian.
 +  * keep myself in the maintainer field. If you are touching this or the
 +    'ffmpeg' package in multiverse, please get in touch with me. Both
 +    source packages come from the same packaging branch.
 +  * drop dependency on faad.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Nov 2008 19:44:29 +0100
 +
  ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
  
    * new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
@@@ -742,31 -449,6 +751,31 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 21:37:16 +0100
  
 +ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
 +
 +  * really disable faad support completely.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 10:58:01 +0100
 +
 +ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
 +
 +  * drop the patch to dlopen faad at runtime for now. it needs more
 +    polishing, and we can have that functionality easier with the 'ffmpeg'
 +    source package that will appear in multiverse.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 10:31:47 +0100
 +
 +ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian.
 +  * keep myself in the maintainer field. If you are touching this or the
 +    'ffmpeg' package in multiverse, please get in touch with me. Both
 +    source packages come from the same packaging branch.
 +  * drop dependency on faad.
 +  * import patches from old packaging to dlopen libfaad at runtime.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 07:31:16 +0100
 +
  ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
  
    * upstream svn snapshot (svn revision 15786, libswscale revision 27900).
diff --combined debian/confflags
index e7be834,ecc533f..da57f23
--- a/debian/confflags
+++ b/debian/confflags
@@@ -7,40 -7,58 +7,58 @@@ FLAVORS := stati
  # shared is generic, i.e. without arch specific opcodes
  FLAVORS += shared
  
- export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
  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)
+ export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
  
  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
+ CROSS :=
+ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+     CROSS :=  $(DEB_HOST_GNU_TYPE)-
  endif
  
+ # this outputs 0 or 1 depending on whether a macro appears in the *default* cpp
+ # -dM -P output; this is used to test the toolchain *default* configuration
+ check_cpp = $(shell $(CROSS)cpp -dM -P /dev/null | grep -q '^\#define $(1)' && echo 1 || echo 0)
+ 
  # 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)
+ check_asm = $(shell echo 'void foo(void) { __asm__ volatile("$(1)"); }' | $(CROSS)gcc -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)
-     # whether the toolchain *default* configuration includes vfp and neon
+ ifeq ($(DEB_HOST_ARCH_CPU),arm)
+     # whether the toolchain *default* configuration includes vfp
      vfp_asm := fadds s0, s0, s0
      has_vfp := $(call check_asm, $(vfp_asm))
+     # whether the toolchain *default* configuration includes neon
      neon_asm := vadd.i16 q0, q0, q0
      has_neon := $(call check_asm, $(neon_asm))
+     # whether the toolchain *default* configuration enables ARMv7
+     v7_asm := dmb
+     has_v7 := $(call check_asm, $(v7_asm))
+     # whether the toolchain *default* configuration uses -mfloat-abi=soft
+     has_soft := $(call check_cpp,__SOFTFP__ 1)
  
-     # only build 
+     # only build a VFP flavour if the toolchain doesn't enable VFP by default
      ifneq ($(has_vfp),1)
      FLAVORS += vfp
      endif
+     # only build a NEON flavour if the toolchain doesn't enable NEON by default
      ifneq ($(has_neon),1)
      FLAVORS += neon
      endif
+     # calling-conventions for VFP and NEON flavours: if the toolchain uses
+     # -mfloat-abi=soft, we want to use softfp, otherwise we want to use the
+     # toolchain default (either softfp or hardfp)
+     ifeq ($(has_soft),1)
+     float_abi := -mfloat-abi=softfp
+     else
+     float_abi :=
+     endif
  else ifeq ($(DEB_HOST_ARCH),i386)
      FLAVORS += cmov
  else ifeq ($(DEB_HOST_ARCH),powerpc)
@@@ -72,9 -90,6 +90,9 @@@ gpl_confflags += --enable-gp
  gpl_confflags += --enable-postproc
  gpl_confflags += --enable-x11grab
  
 +# there is no libfaad in ubuntu/main, on in ubuntu/multiverse
 +gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
 +
  # Common configuration flags
  confflags += --extra-version='$(DEB_VERSION)'
  confflags += --prefix=/usr
@@@ -82,7 -97,9 +100,7 @@@ 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
@@@ -93,21 -110,21 +111,25 @@@ confflags += --enable-zli
  confflags += --enable-libvpx
  confflags += --disable-stripping
  confflags += --enable-runtime-cpudetect
- 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"
+ 
+ # for mysterical reasons, the aac decoder seem to cause the bss segment
+ # to grow to big on ia64, disable it until the toolchain gets fixed
+ ifeq      ($(DEB_HOST_ARCH),ia64)
+ confflags += --disable-decoder=aac --disable-encoder=aac
  endif
+ 
 +ifeq      ($(DEB_HOST_ARCH),powerpc)
 +confflags += --enable-pic
 +endif
++
  confflags += $(extra_common_confflags)
  
  # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
+ gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
  gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
  gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
  gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
- confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
+ gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
  
  # Opencore-amr requires GPL v3
  v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
@@@ -148,19 -165,25 +170,25 @@@ endi
  shared_build_confflags += --enable-shared
  shared_build_confflags += --disable-static
  
- ## armel architecture specific
+ ## specific to arm architectures
  # Configuration flags for the optimised shared libraries
  vfp_build_confflags += $(confflags)
  vfp_build_confflags += --shlibdir=/usr/lib/vfp
  vfp_build_confflags += --enable-shared
  vfp_build_confflags += --disable-static
- vfp_build_confflags += --extra-cflags="-mfpu=vfp -mfloat-abi=softfp"
+ 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
  neon_build_confflags += $(confflags)
  neon_build_confflags += --shlibdir=/usr/lib/neon/vfp
- neon_build_confflags += --extra-cflags="-mfpu=neon -mfloat-abi=softfp -fPIC -DPIC"
+ # 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
+ ifneq ($(has_v7),1)
+ neon_build_confflags += --cpu='armv7-a'
+ endif
+ neon_build_confflags += --extra-cflags="-mfpu=neon $(float_abi) -fPIC -DPIC"
  neon_build_confflags += --enable-shared
  neon_build_confflags += --disable-static
  neon_build_confflags += --disable-ffmpeg
diff --combined debian/control
index d681069,a650136..4b4a15b
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
  Source: ffmpeg
  Section: libs
  Priority: optional
 -Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian multimedia packages 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>,
@@@ -18,10 -17,14 +18,10 @@@ Build-Depends: debhelper (>= 7)
                 libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libbz2-dev,
                 libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libfreetype6-dev,
                 libgsm1-dev,
                 libimlib2-dev,
 -               libopenjpeg-dev,
                 libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 -               librtmp-dev (>= 2.2e-4),
                 libschroedinger-dev,
                 libsdl1.2-dev,
                 libspeex-dev,
@@@ -29,7 -32,6 +29,7 @@@
                 libvorbis-dev,
                 libx11-dev,
                 libxext-dev,
 +               libxfixes-dev,
                 libvdpau-dev,
                 libvpx-dev,
                 libxvmc-dev,
@@@ -93,7 -95,7 +93,8 @@@ Package: libavcodec5
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
 +Replaces: ffmpeg (<< 4:0.5.1-1)
+ Breaks: libavcodec51 (<< 3:0.svn20090303-1)
  Description: ffmpeg codec library
   This is the codec library from the ffmpeg project. It supports most existing
   encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
@@@ -115,7 -117,7 +116,7 @@@ Package: libavformat5
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
- Breaks: libavcodec51 (<< 3:0.svn20090303-1)
 -Breaks: mplayer (<< 2:1.0~rc4)
++Breaks: libavcodec51 (<< 3:0.svn20090303-1), mplayer (<< 2:1.0~rc4)
  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...).
diff --combined debian/patches/series
index fca1d65,3949993..bf06e9d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,1 +1,2 @@@
- 0001-Add-VP80-fourcc.patch
  0002-Tweak-doxygen-config.patch
- 0003-Backport-AAC-HE-v2.patch
 +fix-CVE-2010-3429.patch

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list