diff options
| author | mjl <mjl> | 2003-01-10 01:27:42 +0000 |
|---|---|---|
| committer | mjl <mjl> | 2003-01-10 01:27:42 +0000 |
| commit | 7114d81005e3089ac1b40c38e71147381483cc18 (patch) | |
| tree | 54343091dec77686194054a7dc473bf3b5a1210d /graphics | |
| parent | db460ffb394a627fdb3dce699bd2fdbbf93862b3 (diff) | |
| download | pkgsrc-7114d81005e3089ac1b40c38e71147381483cc18.tar.gz | |
Make fxtv compile even on platforms without machine/mouse.h by building
just the necessary stub routines. This makes fxtv compile (and work) on
at least macppc.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/fxtv/Makefile | 11 | ||||
| -rw-r--r-- | graphics/fxtv/distinfo | 3 | ||||
| -rw-r--r-- | graphics/fxtv/patches/patch-ba | 50 |
3 files changed, 60 insertions, 4 deletions
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile index 5bfff5b0c0c..27799d293e4 100644 --- a/graphics/fxtv/Makefile +++ b/graphics/fxtv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/12/21 11:09:59 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2003/01/10 01:27:42 mjl Exp $ DISTNAME= fxtv-1.03 PKGREVISION= 2 @@ -10,8 +10,8 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://people.freebsd.org/~rhh/fxtv/ COMMENT= TV display application for Brooktree 848 compatible TV cards -ONLY_FOR_PLATFORM= NetBSD-1.[5-9]*-arm32 NetBSD-1.[5-9]*-atari \ - NetBSD-1.[5-9]*-i386 +#ONLY_FOR_PLATFORM= NetBSD-1.[5-9]*-arm32 NetBSD-1.[5-9]*-atari \ +# NetBSD-1.[5-9]*-i386 USE_BUILDLINK2= YES USE_X11BASE= YES @@ -38,6 +38,11 @@ post-patch: $${file} > $${file}.fixed; \ ${MV} -f $${file}.fixed $${file}; \ done + if [ -e /usr/include/machine/mouse.h ] ; then \ + echo '#define HAVE_MOUSE_H 1' > ${WRKSRC}/netbsdconf.h; \ + else \ + echo '#define HAVE_MOUSE_H 0' > ${WRKSRC}/netbsdconf.h; \ + fi .include "../../graphics/png/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" diff --git a/graphics/fxtv/distinfo b/graphics/fxtv/distinfo index cf70590e754..f2f08c200fd 100644 --- a/graphics/fxtv/distinfo +++ b/graphics/fxtv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/12/21 11:09:59 wiz Exp $ +$NetBSD: distinfo,v 1.7 2003/01/10 01:27:43 mjl Exp $ SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9 Size (fxtv-1.03.tgz) = 198669 bytes @@ -14,3 +14,4 @@ SHA1 (patch-ai) = 85baa4b457dede91bf74ce0d8e4655fae9da2d96 SHA1 (patch-aj) = 35ffa80ed5484c0d23a5f4fbe5657217c715e6e7 SHA1 (patch-ak) = 4f32ae6c6eea2b8b1c26c6861e9bff1429976024 SHA1 (patch-al) = d60ac498f40cd9ec833ca436708cb140856826f1 +SHA1 (patch-ba) = 20efae40631bdb5be57e12445bf2135a47952763 diff --git a/graphics/fxtv/patches/patch-ba b/graphics/fxtv/patches/patch-ba new file mode 100644 index 00000000000..4440615903f --- /dev/null +++ b/graphics/fxtv/patches/patch-ba @@ -0,0 +1,50 @@ +--- remote.c.orig Fri Jan 10 02:18:28 2003 ++++ remote.c Fri Jan 10 02:18:32 2003 +@@ -33,6 +33,8 @@ + + /* ******************** Include Files ************** */ + ++#include "netbsdconf.h" ++ + #include <stdio.h> + #include <stdlib.h> + #include <errno.h> +@@ -53,8 +55,10 @@ + # include <machine/mouse.h> + # endif + #else ++#if HAVE_MOUSE_H + # include <machine/mouse.h> + #endif ++#endif + #include <X11/Intrinsic.h> + #include "tvdebug.h" + #include "tvutil.h" +@@ -62,6 +66,8 @@ + #include "haup_remote.h" + #include "pixelview_remote.h" + ++#if HAVE_MOUSE_H ++ + /* ******************** Local defines ************** */ + + /* FIXME: Remove this old code someday */ +@@ -847,3 +853,18 @@ + case REMOTE_TYPE_PIXELVIEW : TVPIXELVIEWREMOTEFlush(); break; + } + } ++ ++#else /* HAVE_MOUSE_H */ ++void ++TVREMOTEOpen( XtAppContext app_ctx, ++ char rem_type[], ++ TVREMOTE_CB_FUNCT *cb ) ++ { ++ } ++ ++void ++TVREMOTEFlush( void ) ++ { ++ } ++ ++#endif /* HAVE_MOUSE_H */ |