1 files changed, 26 insertions, 36 deletions
diff --git a/devel/pwlib152/files/patch-videoio b/devel/pwlib152/files/patch-videoio
index 74d8a5c43c02..7e86b99f5bca 100644
--- a/devel/pwlib152/files/patch-videoio
+++ b/devel/pwlib152/files/patch-videoio
@@ -1,36 +1,26 @@
-*** include/ptlib/unix/ptlib/videoio.h.orig	Mon Jan  6 18:41:08 2003
---- include/ptlib/unix/ptlib/videoio.h	Tue Dec  2 09:42:10 2003
-***************
-*** 106,112 ****
-  #include <linux/videodev.h>     /* change this to "videodev2.h" for v4l2 */
-  #endif
-  
-! #if defined(P_FREEBSD)
-  #include <machine/ioctl_meteor.h>
-  #endif
-  
---- 106,112 ----
-  #include <linux/videodev.h>     /* change this to "videodev2.h" for v4l2 */
-  #endif
-  
-! #if defined(P_FREEBSD) && !defined(NO_VIDEO_CAPTURE)
-  #include <machine/ioctl_meteor.h>
-  #endif
-  
-***************
-*** 186,192 ****
-      struct video_mmap frameBuffer[2];
-  #endif
-  
-! #if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)
-      struct video_capability
-      {
-          int channels;   /* Num channels */
---- 186,192 ----
-      struct video_mmap frameBuffer[2];
-  #endif
-  
-! #if (defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)) && !defined(NO_VIDEO_CAPTURE)
-      struct video_capability
-      {
-          int channels;   /* Num channels */
+--- include/ptlib/unix/ptlib/videoio.h.orig	Mon Jan  6 10:41:08 2003
++++ include/ptlib/unix/ptlib/videoio.h	Sun Feb 15 23:42:39 2004
+@@ -106,9 +106,13 @@
+ #include <linux/videodev.h>     /* change this to "videodev2.h" for v4l2 */
+ #endif
+ 
+-#if defined(P_FREEBSD)
++#if defined(P_FREEBSD) && !defined(NO_VIDEO_CAPTURE)
++#if P_FREEBSD >= 502101
++#include <dev/bktr/ioctl_meteor.h>
++#else
+ #include <machine/ioctl_meteor.h>
+ #endif
++#endif
+ 
+ #if defined(P_OPENBSD) || defined(P_NETBSD)
+ #if P_OPENBSD >= 200105
+@@ -186,7 +190,7 @@
+     struct video_mmap frameBuffer[2];
+ #endif
+ 
+-#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)
++#if (defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)) && !defined(NO_VIDEO_CAPTURE)
+     struct video_capability
+     {
+         int channels;   /* Num channels */