[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090119-48-g4412df3

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4412df36e38804d24bdaf72f39fcfbb478949282
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 20:41:49 2009 +0100

    simplify debian/confflags by doing autodetection of headers:
    
    * simplify debian/confflags by doing autodetection of headers:
       - xvid.h
       - lame/lame.h
       - faac.h
       - x264.h
       - vdpau/vdpau.h
      Also remove the setting externalcodecs from DEB_BUILD_OPTIONS. The codecs
      will be enabled as soon as the headers are installed on the filesystem,
      so there is no need in enabling that seperately.

diff --git a/debian/changelog b/debian/changelog
index 4eee2ab..02f490c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,15 @@ ffmpeg-debian (3:0.svn20090119-2) experimental; urgency=low
     to ffmpeg and may change on any new upstream revision. Please get in touch
     with the ffmpeg maintainers if you maintain packages that rely on that
     ffmpeg internal headers like this.
+  * simplify debian/confflags by doing autodetection of headers:
+     - xvid.h
+     - lame/lame.h
+     - faac.h
+     - x264.h
+     - vdpau/vdpau.h
+    Also remove the setting externalcodecs from DEB_BUILD_OPTIONS. The codecs 
+    will be enabled as soon as the headers are installed on the filesystem,
+    so there is no need in enabling that seperately.
   
   [ Fabian Greffrath ]
   * Enabled Speex decoding via libspeex.
diff --git a/debian/confflags b/debian/confflags
index 975b635..056cd5f 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -23,6 +23,10 @@ else ifeq ($(DEB_HOST_ARCH),sparc)
 FLAVORS += vis
 endif
 
+define cond_enable
+	$(shell stat $(1) >/dev/null 2>/dev/null && echo --enable-$(2) )
+endef
+
 # Configuration flags causing the libs to be GPL tainted
 gpl_confflags += --enable-gpl
 gpl_confflags += --enable-postproc
@@ -30,9 +34,7 @@ gpl_confflags += --enable-swscale
 gpl_confflags += --enable-x11grab
 
 # there is no libfaad in ubuntu/main, on in ubuntu/multiverse
-HAVE_LIBFAAD := $(shell stat /usr/include/faad.h >/dev/null 2>/dev/null && \
-                        echo --enable-libfaad )
-gpl_confflags += $(HAVE_LIBFAAD)
+gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
 
 # Common configuration flags; comment out following line for LGPL versions of
 # the libraries
@@ -49,23 +51,14 @@ confflags += --enable-libvorbis
 confflags += --enable-pthreads
 confflags += --disable-stripping
 confflags += --disable-vhook
-confflags += --enable-xvmc
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
-ifneq ($(DEB_SOURCE),ffmpeg-debian)
-confflags += --enable-libxvid
-confflags += --enable-libmp3lame
-confflags += --enable-libfaac
-confflags += --enable-libx264
-
-ifeq      ($(DEB_HOST_ARCH),i386)
-confflags += --enable-vdpau
-else ifeq ($(DEB_HOST_ARCH),amd64)
-confflags += --enable-xvmc
-confflags += --enable-vdpau
-endif
-
-endif
+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)
+confflags += $(call cond_enable,/usr/include/X11/extensions/XvMClib.h,xvmc)
+confflags += $(call cond_enable,/usr/include/vdpau/vdpau.h,vdpau)
 
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
@@ -83,25 +76,6 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   confflags += --disable-mmx
 endif
 
-# Support for additional external codecs
-ifneq (,$(findstring externalcodecs,$(DEB_BUILD_OPTIONS)))
-# Uncomment the following lines to allow the use of nonfree code,
-# the resulting packages will be unredistributable!
-# weak-build-deps += libamrnb-dev
-# confflags += --enable-nonfree --enable-libamr-nb
-# weak-build-deps += libamrwb-dev
-# confflags += --enable-nonfree --enable-libamr-wb
-  weak-build-deps += libmp3lame-dev | liblame-dev
-  confflags += --enable-libmp3lame
-  weak-build-deps += libfaac-dev
-  confflags += --enable-libfaac
-  weak-build-deps += libxvidcore-dev | libxvidcore4-dev
-  confflags += --enable-gpl --enable-libxvid
-  weak-build-deps += libx264-dev
-  confflags += --enable-gpl --enable-libx264
-  $(warning Make sure these packages are installed: $(weak-build-deps))
-endif
-
 # Disable architecture-specific optimizations for default shared build
 nooptflags += --disable-armv5te --disable-armv6
 nooptflags += --disable-altivec

-- 
FFmpeg packaging