[SCM] libav/ubuntu: drop build-dep on frei0r-plugins-dev

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 34fdbd86f42ee778730738721a47731e890b0a15
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 10 11:15:40 2012 +0200

    drop build-dep on frei0r-plugins-dev
    
    package is in universe and needs to be activated in
    libav-extra. Therfore, this patch converts the frei0r activation to a
    check if the frei0r.h 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 039d655..06a928d 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -99,7 +99,6 @@ confflags += --prefix=/usr
 confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 confflags += --enable-vdpau
 confflags += --enable-bzlib
-confflags += --enable-frei0r
 confflags += --enable-libgsm
 confflags += --enable-libschroedinger
 confflags += --enable-libspeex
@@ -131,6 +130,7 @@ gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 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)
 
 confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
 
diff --git a/debian/control b/debian/control
index 09d3142..86d4aec 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends-Indep:
  doxygen
 Build-Depends:
  debhelper (>= 8.1.3~),
- frei0r-plugins-dev,
  libasound2-dev [linux-any],
  libbz2-dev,
  libdc1394-22-dev [linux-any],

-- 
Libav/FFmpeg packaging