diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2005-01-08 12:38:10 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2005-01-08 12:38:10 +0000 |
| commit | 54e7a93b9ad82f4050a8fa111a5dc02d0e3ae166 (patch) | |
| tree | 73ef14d4646eb642a45445173aba1b084163493e /multimedia/fxtv | |
| parent | f9d05bd97084d1bc04c1560cc039ab97f01a811e (diff) | |
| download | ports-54e7a93b9ad82f4050a8fa111a5dc02d0e3ae166.tar.gz ports-54e7a93b9ad82f4050a8fa111a5dc02d0e3ae166.zip | |
Fix build on ia64.
Notes
Notes:
svn path=/head/; revision=125791
Diffstat (limited to 'multimedia/fxtv')
| -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 000000000000..198567f1b7e5 --- /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 000000000000..a6be8213c55b --- /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 5786aad643ca..5d9e182246aa 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 000000000000..43044afb32a6 --- /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" + |