[SCM] FFmpeg packaging branch, master.unstripped, updated. debian/0.5+svn20090420-1-24-g304f73b

Thu May 7 20:54:57 UTC 2009

The following commit has been merged in the master.unstripped branch:
commit 304f73bf06b603a19175dc32b95f73db268ab171
Merge: bc41f08d7a508295ac97bc9ef1bc70cc5be7e90a 19a82c9fe63893e120ae5b29d0fce06b0dd5c613
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 3 22:23:14 2009 +0200

    merge from the 'master' branch

diff --combined debian/changelog
index 76da80f,55e074c..1207193

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,43 +1,58 @@@
- ffmpeg (3:0.svn20090303-1unstripped1) unstable; urgency=low
++ffmpeg (4:0.5+svn20090420-1unstripped1) unstable; urgency=low
 +
 +  * this upload is targeted for and build with packages from
 +    http://debian-multimedia.org 
 +
 +  * rebuild using a clean, uncrippled ffmpeg tarball
 +  * additionally enabled external libraries:
 +    - libmp3lame
 +    - libx264
 +    - libamrwb
 +    - libamrnb
 +    - libfaac
 +
-  -- Reinhard Tartler <siretart at tauware.de>  Tue, 03 Feb 2009 09:23:00 +0100
++ -- Reinhard Tartler <siretart at tauware.de>  Sun, 03 May 2009 22:15:04 +0200
++
+ ffmpeg-debian (4:0.5+svn20090420-1) unstable; urgency=low
+ 
+   [ Fabian Greffrath ]
+   * Merge the contents of patents.txt into README.Debian and change some
+     paragraphs to (hopefully) add some more clarity on the removed encoders
+     and the package naming scheme. Based on suggestions by Xavier Douville
+     <debian at douville.org>, thank you very much for the review. (Closes: #519025)
+   * Reorder some confflags to account for GPL licensed libraries.
+   * Remove patents.txt
+   * Explicitely mention that no decoders are disabled in our packages.
+   
+   [ Loïc Minier ]
+   * Disable more autodetecter ARM arch features
+   * Add neon and vfp flavors to armel disabled for now
+   * vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp"
+ 
+   [ Reinhard Tartler ]
+   * New Upstream Version (svn revision 18630)
+   * bump epoch as 0.5 was released. Future version will use '+' to indicate 
+     that the package is based on a release branch and '~' to indicate that
+     the package is based on the 'trunk' branch.
+   * update from the upstream release branch to generate a new upstream
+     tarball.
+   * add a git-buildpackage config file at debian/gbp.conf
+   * beautify identification string
+   * debian/rules: bump epoch to '4'
+   * update section names in control file
+   * update upstream svn server url
+   * fixup get-orig-source rules in debian/rules
+   * create right filenames for the orig.tar.gz files
+   * update README.upstream-upgrate for new versioning scheme
+   * remove debian/005_release_branch_changes.diff
+   * remove reference to 020_visibility_patch
+   * install the upstream license file and release notes
+   * allow -dev packages be installed with the unstripped variants
+     Closes: #526007, LP: #312898
+   * be more careful with svn:externals in debian/get-orig-source.sh.
+     (Closes: #525348)
+   
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 02 May 2009 09:09:54 +0200
  
  ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
  
diff --combined debian/confflags
index d269603,676554b..36e7d7c
--- a/debian/confflags
+++ b/debian/confflags
@@@ -15,7 -15,10 +15,10 @@@ export DEB_HOST_ARCH      ?= $(shell dp
  SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN")
  
  # the other flavors always build dynamic versions
- ifeq      ($(DEB_HOST_ARCH),i386)
+ ifeq      ($(DEB_HOST_ARCH),armel)
+ # disabled for now as we need hwcaps support in glibc first
+ #FLAVORS += neon vfp
+ else ifeq ($(DEB_HOST_ARCH),i386)
  FLAVORS += cmov
  else ifeq ($(DEB_HOST_ARCH),powerpc)
  FLAVORS += altivec
@@@ -27,11 -30,6 +30,11 @@@ define cond_enabl
  	$(shell test -r $(1) && echo --enable-$(2) )
  endef
  
 +# variant that also require --enable-nonfree
 +define cond_enable_nf
 +	$(shell test -r $(1) && echo --enable-$(2) --enable-nonfree )
 +endef
 +
  # Configuration flags causing the libs to be GPL tainted
  gpl_confflags += --enable-gpl
  gpl_confflags += --enable-postproc
@@@ -41,10 -39,8 +44,8 @@@ 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)
  
- # Common configuration flags; comment out following line for LGPL versions of
- # the libraries
- confflags += $(gpl_confflags)
- confflags += --extra-version='svn$(SVNREVISION)+$(DEB_VERSION)'
+ # Common configuration flags
+ confflags += --extra-version='$(DEB_VERSION)'
  confflags += --prefix=/usr
  confflags += --enable-avfilter
  confflags += --enable-avfilter-lavf
@@@ -58,15 -54,15 +59,18 @@@ confflags += --disable-strippin
  confflags += --disable-vhook
  
  # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
- confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
+ gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
  confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
  confflags += $(call cond_enable,/usr/include/faac.h,libfaac)
- confflags += $(call cond_enable,/usr/include/x264.h,libx264)
+ gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
  confflags += $(call cond_enable,/usr/include/vdpau/vdpau.h,vdpau)
  
 +confflags += $(call cond_enable_nf,/usr/include/amrnb/sp_dec.h,libamr-nb)
 +confflags += $(call cond_enable_nf,/usr/include/amrwb/dec.h,libamr-wb)
 +
+ # comment out following line for LGPL versions of the libraries
+ confflags += $(gpl_confflags)
+ 
  # Enable IEEE 1394 (FireWire) support on Linux only
  ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
    confflags += --enable-libdc1394
@@@ -84,7 -80,7 +88,7 @@@ ifneq (,$(findstring noopt,$(DEB_BUILD_
  endif
  
  # Disable architecture-specific optimizations for default shared build
- nooptflags += --disable-armv5te --disable-armv6
+ nooptflags += --disable-armv5te --disable-armv6 --disable-armv6t2 --disable-armvfp --disable-neon
  nooptflags += --disable-altivec
  nooptflags += --disable-vis
  
@@@ -103,6 -99,24 +107,24 @@@ endi
  shared_build_confflags += --enable-shared
  shared_build_confflags += --disable-static
  
+ ## armel architecture specific
+ # 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"
+ vfp_build_confflags += --disable-ffmpeg
+ vfp_build_confflags += --disable-ffplay
+ neon_build_confflags += $(confflags)
+ neon_build_confflags += --shlibdir=/usr/lib/neon
+ neon_build_confflags += --enable-neon
+ neon_build_confflags += --enable-shared
+ neon_build_confflags += --disable-static
+ neon_build_confflags += --disable-ffmpeg
+ neon_build_confflags += --disable-ffplay
+ 
  ## i386 architecture specific
  # Configuration flags for the optimized shared libraries
  cmov_build_confflags += $(confflags)
diff --combined debian/control.common
index a99c916,a99c916..0000000
deleted file mode 100644,100644
--- a/debian/control.common
+++ /dev/null
diff --combined debian/control.ffmpeg
index a94a866,b68b1e6..0000000
deleted file mode 100644,100644
--- a/debian/control.ffmpeg
+++ /dev/null
diff --combined debian/control.ffmpeg-debian
index 1000358,7a6a935..0000000
deleted file mode 100644,100644
--- a/debian/control.ffmpeg-debian
+++ /dev/null
diff --combined debian/gbp.conf
index e68368c,1615f89..e68368c
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,6 -1,6 +1,6 @@@
  [DEFAULT]
 -upstream-branch = upstream
 -debian-branch = master
 +upstream-branch = upstream.unstripped
 +debian-branch = master.unstripped
  upstream-tag = upstream/%(version)s
  debian-tag = debian/%(version)s
  pristine-tar = True

-- 
FFmpeg packaging

