[SCM] ffmpeg/ubuntu.extra: Merge branch 'ubuntu' into ubuntu.extra

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


update debian/changelog
remove fix-CVE-2010-3429.patch, applied upstream
remove unnecessary replaces/breaks
Merge commit 'debian/0.6.1-1' into ubuntu
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.extra
X-Git-Reftype: branch
X-Git-Oldrev: 9c6b5aa9b091df9d2785fb09826628c3f147a674
X-Git-Newrev: 77e3fd2b00d8e254ea1322d4e9b74d1af96872ae

The following commit has been merged in the ubuntu.extra branch:
commit 941dc9414a70b2b173e7a32e6cc77bbddebd1106
Merge: 9c6b5aa9b091df9d2785fb09826628c3f147a674 873c92e8d235ef506ac1505c9c20f334d45440e7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 20:30:14 2010 +0100

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 5a37a54,9b835b6..c80c092
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,21 +1,41 @@@
+ ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
+ 
+   * Merge from debian. Remaining changes:
+     - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+     - explicitly --enable-pic on powerpc, cf. LP: #654666
+   * remove fix-CVE-2010-3429.patch, applied upstream
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Nov 2010 12:19:50 +0100
+ 
+ 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-extra (4:0.6-2ubuntu5) natty; urgency=low
 +
 +  * Remove dummy packages with 'unstripped' notation
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Nov 2010 11:35:26 +0100
 +
 +ffmpeg-extra (4:0.6-2ubuntu4) natty; urgency=low
 +
 +  * sort build-deps alphabetically
 +  * build against librtmp-dev, closes LP: #673850
 +  * Bump Standards Version
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 12 Nov 2010 17:50:19 +0100
 +
 +ffmpeg-extra (4:0.6-2ubuntu3) maverick; urgency=low
 +
 +  * merge changes from 'ffmpeg' package
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 05 Oct 2010 21:40:28 +0200
 +
  ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low
  
    * fix dependency on libswscale-extra-0, LP: #637895
@@@ -48,20 -46,6 +66,20 @@@ ffmpeg (4:0.6-2ubuntu2) maverick; urgen
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jul 2010 20:38:27 -0400
  
 +ffmpeg-extra (4:0.6-2ubuntu2) maverick; urgency=low
 +
 +  * Add libxfixes-dev to build-depends, LP: #631103. Thanks to
 +    Dominic Evans for the initial patch against ffmpeg.
 +
 + -- Stefan Potyra <sistpoty at ubuntu.com>  Sun, 19 Sep 2010 13:55:05 +0200
 +
 +ffmpeg-extra (4:0.6-2ubuntu1) maverick; urgency=low
 +
 +  * merge from 'main' package. Changes:
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 13:04:08 +0200
 +
  ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
  
    * merge from debian/experimental. remaining changes:
@@@ -95,13 -79,6 +113,13 @@@ ffmpeg (4:0.6-2) experimental; urgency=
  
   -- Reinhard Tartler <siretart at tauware.de>  Tue, 29 Jun 2010 09:07:56 +0200
  
 +ffmpeg-extra (4:0.6-1ubuntu1) maverick; urgency=low
 +
 +  * merge from 'main' package. Changes:
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 13:04:08 +0200
 +
  ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low
  
    * merge from debian/experimental. remaining changes:
@@@ -130,40 -107,6 +148,40 @@@ ffmpeg (4:0.6~svn20100505-1ubuntu2) mav
  
   -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Jun 2010 11:33:32 +0200
  
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu5) maverick; urgency=low
 +
 +  * install files into libavfilter-extra-1.install. LP: #587424
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Jun 2010 22:07:30 +0200
 +
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu4) maverick; urgency=low
 +
 +  * bump soname for package libavutil49->libavutil50
 +  * fix installation rule, LP: #587424
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Jun 2010 11:42:48 +0200
 +
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu3) maverick; urgency=low
 +
 +  * remove all install rules that are related to non-library packages
 +    Fixes FTBFS
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 28 May 2010 15:09:06 +0200
 +
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
 +
 +  * don't try install html files, we don't build ffmpeg-doc in ffmpeg-extra
 +    Fixes FTBFS
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 28 May 2010 13:34:02 +0200
 +
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
 +
 +  * merge from 'main' package. Changes
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 May 2010 07:49:18 +0200
 +
  ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
  
    * merge from debian/experimental. remaining changes:
@@@ -189,26 -132,6 +207,26 @@@ ffmpeg (4:0.6~svn20100505-1) experiment
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 24 Jan 2010 21:24:56 +0100
  
 +ffmpeg-extra (4:0.5.1-2) unstable; urgency=low
 +
 +  [ Andres Mejia ]
 +  * Prepare new upload for Debian.
 +  * Update gbp.conf for master.extra branch.
 +  * Bump Standards-Version to 3.8.4.
 +  * Don't include build-depends-indep when only building arch-dependent
 +    packages.
 +  * Include ${misc:Depends} for all packages.
 +  * Set the team as maintainers.
 +
 + -- Andres Mejia <mcitadel at gmail.com>  Sat, 08 May 2010 02:46:46 -0400
 +
 +ffmpeg-extra (4:0.5.1-1ubuntu1) lucid; urgency=low
 +
 +  * merge from 'main' package. Changes
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 04 Mar 2010 13:08:25 +0100
 +
  ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
  
    * merge from debian. remaining changes:
@@@ -247,33 -170,15 +265,33 @@@ ffmpeg (4:0.5+svn20090706-6) unstable; 
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 31 Jan 2010 16:53:47 +0100
  
 -ffmpeg (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
 +ffmpeg-extra (4:0.5+svn20090706-5ubuntu4) lucid; urgency=low
  
    * tighten build dependency on new x264 package
 -  * add x264 backport for ffmpeg 0.5
 +  * add libx264 wrapper 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-extra (4:0.5+svn20090706-5ubuntu3) lucid; urgency=low
 +
 +  * rebuild for ffmpeg versioned symbols
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 19 Jan 2010 20:55:30 +0100
 +
 +ffmpeg-extra (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
 +
 +  * No-change rebuild against new dirac package synced from Debian 
 +
 + -- Iain Lane <laney at ubuntu.com>  Sun, 17 Jan 2010 17:41:48 +0000
 +
 +ffmpeg-extra (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
 +
 +  * merge from 'ubuntu' branch
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 17 Jan 2010 09:34:54 +0100
 +
  ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
  
    * merge from debian, remaining changes:
@@@ -377,12 -282,6 +395,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)
@@@ -397,27 -296,14 +415,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.
@@@ -427,19 -313,7 +445,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
  
@@@ -568,15 -442,6 +586,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:
@@@ -782,24 -647,6 +800,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:
@@@ -857,21 -704,6 +875,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
@@@ -909,16 -741,6 +927,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 954cddb,da57f23..b68a983
--- 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)
@@@ -82,9 -100,7 +100,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
@@@ -95,21 -111,25 +113,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)
@@@ -150,19 -170,25 +172,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

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list