[SCM] FFmpeg packaging branch, master, updated. debian/0.svn20090303-1-3-g1b87bf2

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1b87bf258060ea0928e856351ad1bed91cef8877
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Mar 12 15:32:56 2009 +0100

    Reorder some confflags to account for GPL licensed libraries.

diff --git a/debian/changelog b/debian/changelog
index 51065b6..53ff621 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ffmpeg-debian (3:0.svn20090303-2) unstable; urgency=low
     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.
+  * Reorder some confflags to account for GPL licensed libraries.
 
  -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 12 Mar 2009 14:41:49 +0100
 
diff --git a/debian/confflags b/debian/confflags
index 39cbed7..cce0c7e 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -36,9 +36,7 @@ gpl_confflags += --enable-x11grab
 # 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)
+# Common configuration flags
 confflags += --extra-version='svn$(SVNREVISION)+$(DEB_VERSION)'
 confflags += --prefix=/usr
 confflags += --enable-avfilter
@@ -53,12 +51,15 @@ confflags += --disable-stripping
 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)
 
+# 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

-- 
FFmpeg packaging