[SCM] FFmpeg packaging branch, ubuntu.karmic.extra, updated. debian/0.5+svn20090706-2ubuntu1-18-g04af716

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Oct 14 07:56:40 UTC 2009


The following commit has been merged in the ubuntu.karmic.extra branch:
commit 454d2cb299142d0a02293bdff7e7549ba41cb2d7
Merge: 12610922d8b4312d418dd5976f67d0c3b0c000e5 484f32331a9720ce8a7fd5e6bcc56ed00498bf62
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 07:37:21 2009 +0200

    Merge branch 'ubuntu.karmic' into ubuntu.karmic.extra
    
    Conflicts:
    	debian/changelog
    	debian/patches/issue1245.patch
    	debian/patches/series

diff --combined debian/changelog
index d3780b2,af293f0..0f8dc33
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,22 +1,41 @@@
++ffmpeg-extra (4:0.5+svn20090706-2ubuntu2) unstable; urgency=low
++
++  * prepare new upload
++  * merge from the 'ffmpeg' package
++
++ -- Reinhard Tartler <siretart at tauware.de>  Wed, 14 Oct 2009 07:35:30 +0200
++
+ 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-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
  
    * merge from debian. Remaining changes:
@@@ -137,15 -144,6 +163,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:
@@@ -351,24 -349,6 +377,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:
@@@ -426,21 -406,6 +452,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
@@@ -478,16 -443,6 +504,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 0478f13,be114f7..db7757d
--- a/debian/confflags
+++ b/debian/confflags
@@@ -16,11 -16,11 +16,11 @@@ SVNREVISION=$(shell cat .svnrevision 2>
  # the other flavors always build dynamic versions
  # Also, disable architecture-specific optimizations for default shared build
  ifeq      ($(DEB_HOST_ARCH),armel)
- nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2
- nooptflags += --disable-armvfp --disable-neon
- # disabled for now as NEON support deadlocks the Babbage
- #FLAVORS += neon
- FLAVORS += vfp
+ # 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
@@@ -64,9 -64,7 +64,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
@@@ -133,9 -131,11 +133,11 @@@ vfp_build_confflags += --disable-stati
  vfp_build_confflags += --extra-cflags="-mfpu=vfp -mfloat-abi=softfp"
  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
- neon_build_confflags += --enable-neon
+ 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
  neon_build_confflags += --disable-ffmpeg

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list