Date: Fri, 26 Mar 2004 10:09:43 +0300 (MSK) From: Igor Pokrovsky <tiamat@comset.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64790: Update port: graphics/irit bento fix Message-ID: <200403260709.i2Q79hwo013456@doom.homeunix.org> Resent-Message-ID: <200403270330.i2R3UJ6p016115@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64790 >Category: ports >Synopsis: Update port: graphics/irit bento fix >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Mar 26 19:30:19 PST 2004 >Closed-Date: >Last-Modified: >Originator: Igor Pokrovsky >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD doom.homeunix.org 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Feb 26 21:34:55 MSK 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386 >Description: Removed fp stuff for !i386 machines (fixes compilation errors). >How-To-Repeat: >Fix: --- irit.diff begins here --- diff -ru /usr/ports/graphics/irit/Makefile irit/Makefile --- /usr/ports/graphics/irit/Makefile Fri Mar 19 18:31:51 2004 +++ irit/Makefile Fri Mar 26 09:04:24 2004 @@ -52,12 +52,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message -.include <bsd.port.pre.mk> - -.if ${ARCH} != "i386" -BROKEN= "Does not compile on !i386" -.endif - .ifndef (WITH_MOTIF) pre-everything:: @${ECHO_CMD} "" @@ -99,4 +93,4 @@ @(${SED} -e 's|%%DATADIR%%|${DATADIR}|' \ <pkg-message >${PKGMESSAGE} && ${CAT} ${PKGMESSAGE}) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ru /usr/ports/graphics/irit/files/patch-irender_main.c irit/files/patch-irender_main.c --- /usr/ports/graphics/irit/files/patch-irender_main.c Tue Feb 24 01:10:39 2004 +++ irit/files/patch-irender_main.c Fri Mar 26 09:04:46 2004 @@ -1,15 +1,19 @@ ---- irender/main.c.orig Mon Feb 2 13:53:42 2004 -+++ irender/main.c Mon Feb 2 14:05:03 2004 -@@ -13,7 +13,7 @@ +--- irender/main.c.orig Thu Dec 25 18:34:39 2003 ++++ irender/main.c Fri Mar 26 08:51:39 2004 +@@ -12,9 +12,9 @@ + #include "parser.h" #include "config.h" - #ifdef __FreeBSD__ +-#ifdef __FreeBSD__ -#include <floatingpoint.h> +-#endif ++#if (defined(__FreeBSD__) && defined(__i386__)) +#include <ieeefp.h> - #endif ++#endif /* __FreeBSD__ && __i386__ */ /* Contains all configuration options. Subject to change by config file and */ -@@ -48,15 +48,15 @@ + /* and command line parameters. */ +@@ -48,16 +48,16 @@ *****************************************************************************/ int main(int argc, char *argv[]) { @@ -22,10 +26,24 @@ *MatrixFiles[] = {NULL, NULL}; IRndrPtrType Rend; BoolType DoClipping; -+ -+#ifdef __FreeBSD__ -+ fpsetmask(FP_X_INV | FP_X_DZ); -+#endif /* __FreeBSD__ */ ++#if (defined(__FreeBSD__) && defined(__i386__)) ++ fpsetmask(FP_X_INV | FP_X_DZ); ++#endif /* __FreeBSD__ && __i386__ */ ++ DoClipping = TRUE; GlblLastTime = IritCPUTime(FALSE); + InitOptions(); +@@ -129,10 +129,10 @@ + IRndrDestroy(Rend); + TakeTime("Z-Buffer dump"); + +-#ifdef __FreeBSD__ ++#if (defined(__FreeBSD__) && defined(__i386__)) + fpresetsticky(FP_X_INV | FP_X_OFL | FP_X_UFL | + FP_X_DZ | FP_X_IMP | FP_X_DNML); +-#endif /* __FreeBSD__ */ ++#endif /* __FreeBSD__ && __i386__ */ + + return 0; + } --- irit.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403260709.i2Q79hwo013456>