diff options
| author | krion <krion@FreeBSD.org> | 2005-01-08 20:38:10 +0800 |
|---|---|---|
| committer | krion <krion@FreeBSD.org> | 2005-01-08 20:38:10 +0800 |
| commit | 6bef7865e39b397b080241bd7074f1496ac19ac1 (patch) | |
| tree | 406dcef2c25a226c4d79a9184f94cab6f9b785d9 /multimedia | |
| parent | 8b13397c7fadc4eaa012d086ad99abcd98c3c2b5 (diff) | |
| download | freebsd-ports-graphics-6bef7865e39b397b080241bd7074f1496ac19ac1.tar.gz freebsd-ports-graphics-6bef7865e39b397b080241bd7074f1496ac19ac1.tar.zst freebsd-ports-graphics-6bef7865e39b397b080241bd7074f1496ac19ac1.zip | |
Fix build on ia64.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/fxtv/files/patch-haup__remote.c | 24 | ||||
| -rw-r--r-- | multimedia/fxtv/files/patch-pixelview__remote.c | 24 | ||||
| -rw-r--r-- | multimedia/fxtv/files/patch-tvcapture.c | 21 | ||||
| -rw-r--r-- | multimedia/fxtv/files/patch-tvcapture.h | 21 |
4 files changed, 87 insertions, 3 deletions
diff --git a/multimedia/fxtv/files/patch-haup__remote.c b/multimedia/fxtv/files/patch-haup__remote.c new file mode 100644 index 00000000000..198567f1b7e --- /dev/null +++ b/multimedia/fxtv/files/patch-haup__remote.c @@ -0,0 +1,24 @@ + +$FreeBSD$ + +--- haup_remote.c.orig ++++ haup_remote.c +@@ -38,9 +38,16 @@ + #include <sys/fcntl.h> + #ifdef __NetBSD__ + # include <dev/ic/bt8xx.h> ++#endif ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#if __FreeBSD_version > 500000 ++#include <dev/bktr/ioctl_meteor.h> ++#include <dev/bktr/ioctl_bt848.h> + #else +-# include <machine/ioctl_meteor.h> +-# include <machine/ioctl_bt848.h> ++#include <machine/ioctl_bt848.h> ++#include <machine/ioctl_meteor.h> ++#endif + #endif + #include "haup_remote.h" + diff --git a/multimedia/fxtv/files/patch-pixelview__remote.c b/multimedia/fxtv/files/patch-pixelview__remote.c new file mode 100644 index 00000000000..a6be8213c55 --- /dev/null +++ b/multimedia/fxtv/files/patch-pixelview__remote.c @@ -0,0 +1,24 @@ + +$FreeBSD$ + +--- pixelview_remote.c.orig ++++ pixelview_remote.c +@@ -39,9 +39,16 @@ + #include <sys/fcntl.h> + #ifdef __NetBSD__ + # include <dev/ic/bt8xx.h> ++#endif ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#if __FreeBSD_version > 500000 ++#include <dev/bktr/ioctl_bt848.h> ++#include <dev/bktr/ioctl_meteor.h> + #else +-# include <machine/ioctl_meteor.h> +-# include <machine/ioctl_bt848.h> ++#include <machine/ioctl_meteor.h> ++#include <machine/ioctl_bt848.h> ++#endif + #endif + #include "pixelview_remote.h" + diff --git a/multimedia/fxtv/files/patch-tvcapture.c b/multimedia/fxtv/files/patch-tvcapture.c index 5786aad643c..5d9e182246a 100644 --- a/multimedia/fxtv/files/patch-tvcapture.c +++ b/multimedia/fxtv/files/patch-tvcapture.c @@ -1,6 +1,9 @@ ---- tvcapture.c.orig Tue Nov 26 19:30:12 2002 -+++ tvcapture.c Tue Nov 26 19:30:27 2002 -@@ -34,6 +34,7 @@ + +$FreeBSD$ + +--- tvcapture.c.orig ++++ tvcapture.c +@@ -34,11 +34,18 @@ #include <stdlib.h> #include <fcntl.h> #include <errno.h> @@ -8,3 +11,15 @@ #include <sys/mman.h> #ifdef __NetBSD__ # include <dev/ic/bt8xx.h> ++#endif ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#if __FreeBSD_version > 500000 ++#include <dev/bktr/ioctl_bt848.h> + #else +-# include <machine/ioctl_bt848.h> ++#include <machine/ioctl_bt848.h> ++#endif + #endif + #include <signal.h> + #include <sys/ioctl.h> diff --git a/multimedia/fxtv/files/patch-tvcapture.h b/multimedia/fxtv/files/patch-tvcapture.h new file mode 100644 index 00000000000..43044afb32a --- /dev/null +++ b/multimedia/fxtv/files/patch-tvcapture.h @@ -0,0 +1,21 @@ + +$FreeBSD$ + +--- tvcapture.h.orig ++++ tvcapture.h +@@ -34,8 +34,14 @@ + #include <X11/Intrinsic.h> + #ifdef __NetBSD__ + # include <dev/ic/bt8xx.h> ++#endif ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#if __FreeBSD_version > 500000 ++#include <dev/bktr/ioctl_meteor.h> + #else +-# include <machine/ioctl_meteor.h> ++#include <machine/ioctl_meteor.h> ++#endif + #endif + #include "tvtypes.h" + |