[SCM] FFmpeg packaging branch, ubuntu.extra, updated. extra/debian/0.5+svn20090706-5ubuntu1-3-g4d02f94

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jan 31 18:45:17 UTC 2010


The following commit has been merged in the ubuntu.extra branch:
commit 4d02f941ed99a1e5e3402bc410734efff21a1421
Author: Lionel Le Folgoc <mrpouit at gmail.com>
Date:   Sun Jan 24 19:18:04 2010 +0100

    add auto-detection of libopencore-amr{n,w}b

diff --git a/debian/confflags b/debian/confflags
index 46c75fc..155c0b9 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -57,6 +57,11 @@ define cond_enable
 	$(shell test -r $(1) && echo --enable-$(2) )
 endef
 
+# variant that also require --enable-version3
+define cond_enable_v3
+	$(shell test -r $(1) && echo --enable-$(2) --enable-version3 )
+endef
+
 # variant that also require --enable-nonfree
 define cond_enable_nf
 	$(shell test -r $(1) && echo --enable-$(2) --enable-nonfree )
@@ -105,11 +110,16 @@ 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)
 
+# Opencore-amr requires GPL v3
+v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
+v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)
+
 # 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)
+confflags += $(v3_confflags)
 
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list