[SCM] libav/experimental: Use the cond_enable() macro for all additional features in debian/confflags.

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

The following commit has been merged in the experimental branch:
commit 87e78dfd575a7f669fb5f554280297623a74f96a
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Jun 19 15:25:27 2012 +0200

    Use the cond_enable() macro for all additional features in debian/confflags.
    
    Conflicts:
    	debian/confflags

diff --git a/debian/confflags b/debian/confflags
index 071ec99..ccc5e3e 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -89,30 +89,30 @@ endef
 # Configuration flags causing the libs to be GPL tainted
 gpl_confflags += --enable-gpl
 gpl_confflags += --enable-swscale
-gpl_confflags += --enable-x11grab
+gpl_confflags += $(call cond_enable,/usr/include/X11/extensions/XShm.h,x11grab)
 
 # Common configuration flags
-confflags += --extra-version='$(DEB_VERSION)'
 confflags += --arch='$(DEB_HOST_ARCH_CPU)'
-confflags += --prefix=/usr
-confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
-confflags += --enable-vdpau
-confflags += --enable-bzlib
-confflags += --enable-frei0r
-confflags += --enable-gnutls
-confflags += --enable-libcdio
-confflags += --enable-libgsm
-confflags += --enable-libopencv
-confflags += --enable-libschroedinger
-confflags += --enable-libspeex
-confflags += --enable-libtheora
-confflags += --enable-libvorbis
 confflags += --enable-pthreads
-confflags += --enable-zlib
-confflags += --enable-libvpx
 confflags += --enable-runtime-cpudetect
-confflags += --enable-libfreetype
-confflags += --enable-libpulse
+confflags += --extra-version='$(DEB_VERSION)'
+confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+confflags += --prefix=/usr
+confflags += $(call cond_enable,/usr/include/vdpau/vdpau.h,vdpau)
+confflags += $(call cond_enable,/usr/include/bzlib.h,bzlib)
+confflags += $(call cond_enable,/usr/include/frei0r.h,frei0r)
+confflags += $(call cond_enable,/usr/include/gnutls/gnutls.h,gnutls)
+gpl_confflags += $(call cond_enable,/usr/include/cdio/paranoia.h,libcdio)
+confflags += $(call cond_enable,/usr/include/gsm/gsm.h,libgsm)
+confflags += $(call cond_enable,/usr/include/opencv/cv.hpp,libopencv)
+confflags += $(call cond_enable,/usr/include/schroedinger-1.0/schroedinger/schro.h,libschroedinger)
+confflags += $(call cond_enable,/usr/include/speex/speex.h,libspeex)
+confflags += $(call cond_enable,/usr/include/theora/theoraenc.h,libtheora)
+confflags += $(call cond_enable,/usr/include/vorbis/vorbisenc.h,libvorbis)
+confflags += $(call cond_enable,/usr/include/zlib.h,zlib)
+confflags += $(call cond_enable,/usr/include/vpx/vpx_encoder.h,libvpx)
+confflags += $(call cond_enable,/usr/include/freetype2/freetype/freetype.h,libfreetype)
+confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
 # plenty of incompatible assembly; not sure how to detect that properly
@@ -129,8 +129,9 @@ confflags += $(extra_common_confflags)
 confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
 
 # this part below is intended for the 'Libav' package in ubuntu/multiverse
-gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
-gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
+confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
+confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
+confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
 gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
 gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
 
@@ -149,10 +150,7 @@ confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
 confflags += $(gpl_confflags)
 
 # Enable IEEE 1394 (FireWire) support on Linux only
-ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
-  confflags += --enable-libdc1394
-  lib1394-dev += libraw1394-dev, libdc1394-22-dev
-endif
+confflags += $(call cond_enable,/usr/include/dc1394/dc1394.h,libdc1394)
 
 # Enable hardened build flags through dpkg-buildflags
 CFLAGS := $(filter-out -g -O2,$(shell dpkg-buildflags --get CFLAGS))
diff --git a/debian/control b/debian/control
index 760df6b..438eacf 100644
--- a/debian/control
+++ b/debian/control
@@ -298,16 +298,17 @@ Depends:
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Suggests:
+ libdc1394-22-dev [linux-any],
  libgsm1-dev,
  libogg-dev,
+ libraw1394-dev [linux-any],
  libschroedinger-dev,
  libspeex-dev,
  libtheora-dev (>> 0.0.0.alpha4),
  libvorbis-dev,
  libx11-dev,
  libxext-dev,
- zlib1g-dev,
- ${lib1394-dev}
+ zlib1g-dev
 Description: Development files for libavcodec
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.

-- 
Libav/FFmpeg packaging