[SCM] FFmpeg packaging branch, master.unstripped, updated. debian/0.svn20090303-1-20-g1843098

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.unstripped branch:
commit 25fc70e09b9fe85c17e0848251f8bf008b5ce723
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 4 01:10:47 2009 +0100

    conditionally enable amr libs
    
    since the amr produce an actually unredistributable package, configure
    also requires the switch 'enable-non-free'. Therefore we need another
    variante of the enable_cond macro that also adds --enable-nonfree.
    
    Caveats: This approach adds the line --enable-nonfree twice. This is
    however only cosmetics, and not a real problem

diff --git a/debian/confflags b/debian/confflags
index 39cbed7..e4208a2 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -27,6 +27,11 @@ define cond_enable
 	$(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
@@ -59,6 +64,9 @@ confflags += $(call cond_enable,/usr/include/faac.h,libfaac)
 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/amr/sp_dec.h,libamr-nb)
+confflags += $(call cond_enable_nf,/usr/include/amrwb/dec.h,libamr-wb)
+
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-libdc1394

-- 
FFmpeg packaging