[SCM] vlc/master: Rewrite v4l kfreebsd patch.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit aa98f0b491200928108a46a15f780a145d959db9
Author: Benjamin Drung <bdrung at debian.org>
Date:   Wed Feb 29 22:57:44 2012 +0100

    Rewrite v4l kfreebsd patch.

diff --git a/debian/patches/v4l-kfreebsd.patch b/debian/patches/v4l-kfreebsd.patch
index b4db916..2c819b8 100644
--- a/debian/patches/v4l-kfreebsd.patch
+++ b/debian/patches/v4l-kfreebsd.patch
@@ -4,17 +4,14 @@ 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
+@@ -39,6 +39,10 @@
+ #  define V4L2_CTRL_TYPE_BITMASK 8
+ # endif
  #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 */
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++/* FreeBSD 10 and earlier does not have V4L2_CTRL_TYPE_BITMASK */
 +# define V4L2_CTRL_TYPE_BITMASK 8
- #endif
++#endif
  #ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */
  # define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38)
+ # define V4L2_CID_ILLUMINATORS_2 (V4L2_CID_BASE+37)

-- 
VLC media player packaging