[SCM] libav/ubuntu: drop build-dep on libcv-dev and libopencv-dev

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 0759b8d95cc69c9cc5ea3f4156ced75ff691b971
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 10 11:30:19 2012 +0200

    drop build-dep on libcv-dev and libopencv-dev
    
    The package is in universe and needs to be activated in
    libav-extra. Therfore, this patch converts its activation to a check if
    the corresponding header is present. This minimizes the diff in the
    libav-extra package to an extra build-dependency.

diff --git a/debian/confflags b/debian/confflags
index cfb8b0f..9a3183a 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -102,7 +102,6 @@ confflags += --enable-bzlib
 confflags += --enable-gnutls
 confflags += --enable-libcdio
 confflags += --enable-libgsm
-confflags += --enable-libopencv
 confflags += --enable-libschroedinger
 confflags += --enable-libspeex
 confflags += --enable-libtheora
@@ -134,6 +133,7 @@ gpl_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)
 gpl_confflags += $(call cond_enable,/usr/include/frei0r.h,frei0r)
+gpl_confflags += $(call cond_enable,/usr/include/opencv/cv.h,libopencv)
 
 confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
 
diff --git a/debian/control b/debian/control
index ee68a30..e41b035 100644
--- a/debian/control
+++ b/debian/control
@@ -24,14 +24,12 @@ Build-Depends:
  libcdio-cdda-dev,
  libcdio-dev,
  libcdio-paranoia-dev,
- libcv-dev,
  libdc1394-22-dev [linux-any],
  libfreetype6-dev,
  libgnutls-dev,
  libgsm1-dev,
  libimlib2-dev,
  libjack-dev [!hurd-i386],
- libopencv-dev,
  libraw1394-dev [linux-any],
  libschroedinger-dev,
  libsdl1.2-dev,

-- 
Libav/FFmpeg packaging