[PATCH 7/9] Update list of optional dependencies.

[Jon Severinsson]

Removed explicit --enable-swscale, no as it no longer requires --enable-gpl and thus is enabled by default.
Added direct dependancy on liblzo2-dev (currenly required directly but only depended on indirectly)
Dropped libxvid dependency, it is superseded by the internal mpeg4 encoder.
Dropped libfaac dependency, it is superseded by the libvo_aacenc encoder.
Added versioned dependency on libmp3lame-dev (>= 3.98.3), libvpx-dev (>= 0.9.6), and libx264-dev (>= 2:0.118), matching the requirements in ./configure.
Dropped versioned dependency on ancient (pre squeeze/lucid) librtmp-dev and libtheora-dev.
---
 debian/confflags |   24 +++++-------------------
 debian/control   |   14 +++++++-------
 2 filer ändrade, 12 tillägg(+), 26 borttagningar(-)

diff --git a/debian/confflags b/debian/confflags
index 66fe53c7..fa0fae8b 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -84,16 +84,6 @@ define cond_enable
 	$(shell test -r $(1) && echo --enable-$(2) )
 endef
 
-# variant that also requires --enable-version3
-define cond_enable_v3
-	$(shell test -r $(1) && echo --enable-$(2) --enable-version3 )
-endef
-
-# variant that also requires --enable-nonfree
-define cond_enable_nf
-	$(shell test -r $(1) && echo --enable-$(2) --enable-nonfree )
-endef
-
 # Common configuration flags
 confflags += --arch='$(DEB_HOST_ARCH_CPU)'
 confflags += --enable-pthreads
@@ -137,22 +127,18 @@ confflags += $(call cond_enable,/usr/include/zlib.h,zlib)
 
 # Configuration flags causing the libs to be GPL tainted
 gpl_confflags += --enable-gpl
-gpl_confflags += --enable-swscale
 gpl_confflags += $(call cond_enable,/usr/include/cdio/paranoia.h,libcdio)
 gpl_confflags += $(call cond_enable,/usr/include/X11/extensions/XShm.h,x11grab)
 gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
-gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
 # comment out following line for LGPL versions of the libraries
 confflags += $(gpl_confflags)
 
 # Features that require (L)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)
-v3_confflags += $(call cond_enable_v3,/usr/include/vo-aacenc/voAAC.h,libvo-aacenc)
-v3_confflags += $(call cond_enable_v3,/usr/include/vo-amrwbenc/enc_if.h,libvo-amrwbenc)
-
-# FAAC is considered non-free
-confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
+v3_confflags += --enable-version3
+v3_confflags += $(call cond_enable,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
+v3_confflags += $(call cond_enable,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)
+v3_confflags += $(call cond_enable,/usr/include/vo-aacenc/voAAC.h,libvo-aacenc)
+v3_confflags += $(call cond_enable,/usr/include/vo-amrwbenc/enc_if.h,libvo-amrwbenc)
 
 # 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 f9500d84..684f27b9 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,8 @@ Build-Depends:
  libgsm1-dev,
  libimlib2-dev,
  libjack-dev,
- libmp3lame-dev,
+ liblzo2-dev,
+ libmp3lame-dev (>= 3.98.3),
  libopencore-amrnb-dev,
  libopencore-amrwb-dev,
  libopencv-dev,
@@ -37,23 +38,22 @@ Build-Depends:
  libopus-dev (>= 1.0.1),
  libpulse-dev,
  libraw1394-dev [linux-any],
- librtmp-dev (>= 2.2e-4),
+ librtmp-dev,
  libschroedinger-dev,
  libsdl1.2-dev,
  libspeex-dev,
- libtheora-dev (>> 0.0.0.alpha4),
- libtiff4-dev | libtiff-dev,
+ libtheora-dev,
+ libtiff-dev | libtiff4-dev | libtiff5-dev,
  libva-dev [!hurd-any],
  libvdpau-dev,
  libvo-aacenc-dev,
  libvo-amrwbenc-dev,
  libvorbis-dev,
- libvpx-dev,
+ libvpx-dev (>= 0.9.6),
  libx11-dev,
- libx264-dev,
+ libx264-dev (>= 2:0.118),
  libxext-dev,
  libxfixes-dev,
- libxvidcore-dev,
  libxvmc-dev,
  texi2html,
  yasm [any-amd64 any-i386],
-- 
1.7.10.4