[SCM] ffmpeg/master: call gpl_confflags macro properly
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jan 30 09:07:01 UTC 2011
The following commit has been merged in the master branch:
commit cc0b5f643d8a42a7efbf7e34d2f94755b51a02ee
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Jan 29 22:06:01 2011 +0100
call gpl_confflags macro properly
Git-Dch: ignore
diff --git a/debian/confflags b/debian/confflags
index e2b79b8..d56aa85 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -122,7 +122,7 @@ endif
confflags += $(extra_common_confflags)
# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
-gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h)
+gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list