[SCM] ffmpeg/master: forcefully disable v4l on kfreebsd

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 865ede09aa0b3dc63c1ca6fcb3ac2882a8731c8d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Dec 26 10:50:24 2011 +0100

    forcefully disable v4l on kfreebsd
    
    This avoids a FTBFS on kfreebsd:
    https://buildd.debian.org/status/fetch.php?pkg=libav&arch=kfreebsd-amd64&ver=4%3A0.7.3-1&stamp=1324858573
    https://buildd.debian.org/status/fetch.php?pkg=libav&arch=kfreebsd-i386&ver=4%3A0.7.3-1&stamp=1324859233
    
    While fixing the build failure would be preferred, AFAIUI v4l is of
    rather limited use on kfreebsd anyways.

diff --git a/debian/patches/03-disable-v4l-on-kfreebsd.patch b/debian/patches/03-disable-v4l-on-kfreebsd.patch
new file mode 100644
index 0000000..8a5763c
--- /dev/null
+++ b/debian/patches/03-disable-v4l-on-kfreebsd.patch
@@ -0,0 +1,25 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Description: forcefully disable v4l on kfreebsd
+Forwarded: not-yet
+
+This avoids a FTBFS:
+https://buildd.debian.org/status/fetch.php?pkg=libav&arch=kfreebsd-amd64&ver=4%3A0.7.3-1&stamp=1324858573
+https://buildd.debian.org/status/fetch.php?pkg=libav&arch=kfreebsd-i386&ver=4%3A0.7.3-1&stamp=1324859233
+
+While fixing the build failure would be preferred, AFAIUI v4l is of rather limited use on kfreebsd anyways.
+
+diff --git a/configure b/configure
+index f4c3274..db29b77 100755
+--- a/configure
++++ b/configure
+@@ -2929,8 +2929,8 @@ fi
+ texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+ 
+ check_header linux/fb.h
+-check_header linux/videodev.h
+-check_header linux/videodev2.h
++test $target_os = 'linux' && check_header linux/videodev.h
++test $target_os = 'linux' && check_header linux/videodev2.h
+ check_header sys/videoio.h
+ 
+ check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
diff --git a/debian/patches/series b/debian/patches/series
index e3f4b76..b5c9d41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 
 01-Tweak-doxygen-config.patch
 02-make-MAP_ANONYMOUS_AVAILABLE.patch
+03-disable-v4l-on-kfreebsd.patch

-- 
Libav/FFmpeg packaging