diff options
| author | itetcu <itetcu@FreeBSD.org> | 2006-05-15 08:02:20 +0800 |
|---|---|---|
| committer | itetcu <itetcu@FreeBSD.org> | 2006-05-15 08:02:20 +0800 |
| commit | b52fa0f8c19e14dd114d410c04f36c2bbe4a4d2a (patch) | |
| tree | 9d192e6a91674a577257f7e9980c7a3e9042a9a3 /devel/pwlib | |
| parent | ec89c673d4903c91cd8b891b8b90aba4fc00b8b9 (diff) | |
| download | freebsd-ports-gnome-b52fa0f8c19e14dd114d410c04f36c2bbe4a4d2a.tar.gz freebsd-ports-gnome-b52fa0f8c19e14dd114d410c04f36c2bbe4a4d2a.tar.zst freebsd-ports-gnome-b52fa0f8c19e14dd114d410c04f36c2bbe4a4d2a.zip | |
Fix build on 4.x
PR: ports/97258
Submitted by: Tod McQuillin <devin@spamcop.net>
Approved by: maintainer, lawrance (mentor)
Diffstat (limited to 'devel/pwlib')
| -rw-r--r-- | devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h b/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h index 968b4d0e4142..e3e6d99d5b32 100644 --- a/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h +++ b/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.h @@ -1,6 +1,6 @@ ---- plugins/vidinput_bsd/vidinput_bsd.h.orig Tue Aug 9 11:08:09 2005 -+++ plugins/vidinput_bsd/vidinput_bsd.h Thu Apr 6 09:37:11 2006 -@@ -1,13 +1,24 @@ +--- plugins/vidinput_bsd/vidinput_bsd.h.orig Tue Aug 9 05:08:09 2005 ++++ plugins/vidinput_bsd/vidinput_bsd.h Sun May 14 13:42:28 2006 +@@ -1,15 +1,29 @@ +#ifndef _PVIDEOIOBSDCAPTURE -//#include <sys/mman.h> @@ -10,8 +10,6 @@ +#ifdef __GNUC__ +#pragma interface +#endif -+ -+#include <sys/mman.h> #include <ptlib.h> #include <ptlib/videoio.h> @@ -19,6 +17,9 @@ #if defined(P_FREEBSD) +#include <sys/param.h> ++#if __FreeBSD_version <= 500000 ++#include <sys/types.h> ++#endif +# if __FreeBSD_version >= 502100 +#include <dev/bktr/ioctl_meteor.h> +# else @@ -26,8 +27,12 @@ +# endif #endif ++#include <sys/mman.h> ++ #if defined(P_OPENBSD) || defined(P_NETBSD) -@@ -20,19 +30,24 @@ + #if P_OPENBSD >= 200105 + #include <dev/ic/bt8xx.h> +@@ -20,19 +34,24 @@ #endif #endif @@ -59,7 +64,7 @@ BOOL IsOpen(); -@@ -43,11 +58,24 @@ +@@ -43,11 +62,24 @@ BOOL IsCapturing(); @@ -87,7 +92,7 @@ BOOL GetFrameSizeLimits(unsigned int&, unsigned int&, unsigned int&, unsigned int&); -@@ -99,3 +127,5 @@ +@@ -99,3 +131,5 @@ int mmap_size; }; |