[SCM] vlc/master: Fix v4l2 build failure on kfreebsd.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f4daac51a078f3d8081c84ef581323f498526e4c
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Feb 26 14:41:49 2012 +0100

    Fix v4l2 build failure on kfreebsd.
    
    Closes: #660935

diff --git a/debian/patches/series b/debian/patches/series
index b5bd676..84ce1d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 bp-monotonic-clock.patch
 altivec-cflags.patch
+v4l-kfreebsd.patch
diff --git a/debian/patches/v4l-kfreebsd.patch b/debian/patches/v4l-kfreebsd.patch
new file mode 100644
index 0000000..b4db916
--- /dev/null
+++ b/debian/patches/v4l-kfreebsd.patch
@@ -0,0 +1,20 @@
+Description: Fix v4l2 build failure on kfreebsd.
+Author: Benjamin Drung <bdrung at debian.org>
+Bug-Debian: http://bugs.debian.org/660935
+
+--- a/modules/access/v4l2/v4l2.h
++++ b/modules/access/v4l2/v4l2.h
+@@ -33,11 +33,8 @@
+ # warning Please update Video4Linux2 headers!
+ # define V4L2_CTRL_FLAG_VOLATILE 0x0080
+ #endif
+-#ifdef __linux__
+-# include <linux/version.h>
+-# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
+-#  define V4L2_CTRL_TYPE_BITMASK 8
+-# endif
++#ifndef V4L2_CTRL_TYPE_BITMASK /* 3.1 */
++# define V4L2_CTRL_TYPE_BITMASK 8
+ #endif
+ #ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */
+ # define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38)

-- 
VLC media player packaging