[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090609-2-12-gcd842cb

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 180e98438de9851d3f390a12701a7b9a98e496d9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 13:34:09 2009 +0200

    merge cond_enable_nf flag from master.extra branch
    
    port "support" for the faac to that macro

diff --git a/debian/confflags b/debian/confflags
index 6bd0830..49f982d 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -41,6 +41,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
@@ -86,11 +91,14 @@ confflags += $(extra_common_confflags)
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
-confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
 
-# AAC is considered non-free upstream, disable it for now
-# confflags += $(call cond_enable,/usr/include/faac.h,libfaac)
+confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
+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)
+
+# AAC is considered non-free upstream
+confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
 
 # comment out following line for LGPL versions of the libraries
 confflags += $(gpl_confflags)

-- 
FFmpeg packaging