diff options
author | jschauma <jschauma@pkgsrc.org> | 2005-02-17 00:38:37 +0000 |
---|---|---|
committer | jschauma <jschauma@pkgsrc.org> | 2005-02-17 00:38:37 +0000 |
commit | 6f458e98ae5b408e67dfcf98e41f52da536cb1e3 (patch) | |
tree | d1ac5ac857284518e79f3063c4849e6e8e7254d0 /graphics/radiance | |
parent | 892028f6a6e57a24fda035e33b1827b55e7c5a32 (diff) | |
download | pkgsrc-6f458e98ae5b408e67dfcf98e41f52da536cb1e3.tar.gz |
Make this work on IRIX.
Diffstat (limited to 'graphics/radiance')
-rw-r--r-- | graphics/radiance/Makefile | 11 | ||||
-rw-r--r-- | graphics/radiance/PLIST | 15 | ||||
-rw-r--r-- | graphics/radiance/distinfo | 7 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-aa | 2 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-ac | 2 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-ae | 2 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-ah | 74 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-ai | 2 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-al | 2 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-am | 11 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-an | 2 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-as | 13 |
12 files changed, 48 insertions, 95 deletions
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile index 995abbfd85b..ec2e72922d5 100644 --- a/graphics/radiance/Makefile +++ b/graphics/radiance/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +# $NetBSD: Makefile,v 1.3 2005/02/17 00:38:37 jschauma Exp $ # DISTNAME= rad3R6P1 @@ -33,8 +33,13 @@ PATCHEES= makeall ./src/rt/Rmakefile ./src/util/Rmakefile \ .if ${OPSYS} == "NetBSD" PKGSRC_ARCH= 9 +PLIST_SUBST+= USE_GL="@comment " .elif ${OPSYS} == "FreeBSD" PKGSRC_ARCH= 8 +PLIST_SUBST+= USE_GL="@comment " +.elif ${OPSYS} == "IRIX" +PKGSRC_ARCH= 3 +PLIST_SUBST+= USE_GL="" .endif MAKE_ENV+= MV="${MV}" RM="${RM}" CP="${CP}" \ @@ -52,15 +57,19 @@ do-configure: ${WRKSRC}/${patchee} > ${WRKSRC}/${patchee}.tmp && \ ${MV} ${WRKSRC}/${patchee}.tmp ${WRKSRC}/${patchee} .endfor + ${RM} ${WRKSRC}/lib/.gdb_history do-build: cd ${WRKSRC} && ${MAKE_ENV} csh ./makeall install + @${RM} -f ${WRKSRC}/radiance/bin/wish* do-install: ${INSTALL_DATA_DIR} ${PREFIX}/radiance cd ${WRKSRC}/radiance && ${PAX} -rw . ${PREFIX}/radiance/ ${INSTALL_DATA_DIR} ${PREFIX}/radiance/obj cd ${WRKSRC}/obj && ${PAX} -rw . ${PREFIX}/radiance/obj/ + ${INSTALL_DATA_DIR} ${PREFIX}/radiance/lib + cd ${WRKSRC}/lib && ${PAX} -rw . ${PREFIX}/radiance/lib/ ${INSTALL_DATA_DIR} ${PREFIX}/radiance/man cd ${WRKSRC}/doc/man && ${PAX} -rw . ${PREFIX}/radiance/man/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiance diff --git a/graphics/radiance/PLIST b/graphics/radiance/PLIST index da7fc86d3fe..465e0bfa713 100644 --- a/graphics/radiance/PLIST +++ b/graphics/radiance/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/02/17 00:38:37 jschauma Exp $ radiance/bin/arch2rad radiance/bin/bgraph radiance/bin/cnt @@ -26,6 +26,7 @@ radiance/bin/getinfo radiance/bin/glare radiance/bin/glarendx radiance/bin/glaze +${USE_GL}radiance/bin/glrad radiance/bin/histo radiance/bin/icalc radiance/bin/ies2rad @@ -122,6 +123,16 @@ radiance/bin/xglaresrc radiance/bin/ximage radiance/bin/xshowtrace radiance/bin/xyzimage +${USE_GL}radiance/dev/glx1.hdi +${USE_GL}radiance/dev/glx1h.hdi +${USE_GL}radiance/dev/ogl.hdi +${USE_GL}radiance/dev/oglh.hdi +${USE_GL}radiance/dev/oglo.hdi +${USE_GL}radiance/dev/ogloh.hdi +${USE_GL}radiance/dev/ogls.hdi +${USE_GL}radiance/dev/oglsh.hdi +${USE_GL}radiance/dev/oglso.hdi +${USE_GL}radiance/dev/oglsoh.hdi radiance/dev/x11.hdi radiance/dev/x11h.hdi radiance/lib/Earth.cal @@ -709,8 +720,8 @@ share/doc/radiance/ray.pdf @dirrm radiance/lib/source/zumtobel @dirrm radiance/lib/source @dirrm radiance/lib/meta -@dirrm radiance/lib/lib @dirrm radiance/lib/tcl +@dirrm radiance/lib/lib @dirrm radiance/lib @dirrm radiance/obj/alpha @dirrm radiance/obj/cabin/anim1 diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo index 929e0b670a4..8fd8fa4a7a5 100644 --- a/graphics/radiance/distinfo +++ b/graphics/radiance/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +$NetBSD: distinfo,v 1.3 2005/02/17 00:38:37 jschauma Exp $ SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99 Size (rad3R6P1.tar.gz) = 7115997 bytes @@ -11,14 +11,15 @@ SHA1 (patch-ad) = f3f7c68305964965851c9caeca53f0e534014085 SHA1 (patch-ae) = eaeba41315973013676bf400e5acff29ff61946a SHA1 (patch-af) = 9a4c265a18a138166c8a041730cd5818430f9186 SHA1 (patch-ag) = e7f8944d96aa51ce8dfdec5abb6d498c3ca193cc -SHA1 (patch-ah) = a33746e1daae8f7dc6efabb1d73f85eecafb5152 +SHA1 (patch-ah) = be320a6b9b8b6b2153a31ea9218eb7d41aa43b0e SHA1 (patch-ai) = 02c6c3109c8e425d394980e1d223169dd6a3e7ae SHA1 (patch-aj) = 5242f18c523bbebcfdd886fa20501434f07b74c0 SHA1 (patch-ak) = 438bd7e9ad397663ddac09543ac484610b13086b SHA1 (patch-al) = c215a209fccd3d1d2e64d09018bce87291efc880 -SHA1 (patch-am) = bf4a456d905fbd5c9a9cabd3c32b1bb1c6c26620 +SHA1 (patch-am) = 705a3f62c5688f593fd5c5a1a71b22e4652b1c77 SHA1 (patch-an) = d0c388a5aaea622b220e3ef4c0f52956ecca5470 SHA1 (patch-ao) = 22e3e8f3b593bca0423390f696324f42e8b52098 SHA1 (patch-ap) = 42bb1691b2c1d76bf5d19872d70ca50332d31987 SHA1 (patch-aq) = 338ca0df287e797fbc784158e7d622f70ddcd35e SHA1 (patch-ar) = e2afaad398d61f152ce9a7f3ddf451547c359e13 +SHA1 (patch-as) = 9b7c6bef44a4f9640b7a30253522ffab425ffbac diff --git a/graphics/radiance/patches/patch-aa b/graphics/radiance/patches/patch-aa index b50a17e41fa..e40960fd3db 100644 --- a/graphics/radiance/patches/patch-aa +++ b/graphics/radiance/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +$NetBSD: patch-aa,v 1.3 2005/02/17 00:38:37 jschauma Exp $ Make this script run non-interactively. diff --git a/graphics/radiance/patches/patch-ac b/graphics/radiance/patches/patch-ac index d0f33278749..ff7c27bee1b 100644 --- a/graphics/radiance/patches/patch-ac +++ b/graphics/radiance/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +$NetBSD: patch-ac,v 1.3 2005/02/17 00:38:37 jschauma Exp $ Make this script run non-interactively. diff --git a/graphics/radiance/patches/patch-ae b/graphics/radiance/patches/patch-ae index 7c780ff55aa..b063e4774ea 100644 --- a/graphics/radiance/patches/patch-ae +++ b/graphics/radiance/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +$NetBSD: patch-ae,v 1.3 2005/02/17 00:38:37 jschauma Exp $ --- src/common/Rmakefile.orig 2004-10-27 19:36:09.000000000 -0400 +++ src/common/Rmakefile 2005-02-16 18:10:50.000000000 -0500 diff --git a/graphics/radiance/patches/patch-ah b/graphics/radiance/patches/patch-ah index f65a040f291..c273f36a41a 100644 --- a/graphics/radiance/patches/patch-ah +++ b/graphics/radiance/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $ +$NetBSD: patch-ah,v 1.2 2005/02/17 00:38:37 jschauma Exp $ --- src/hd/Rmakefile.orig 2004-10-27 19:23:47.000000000 -0400 +++ src/hd/Rmakefile 2005-02-15 17:24:20.000000000 -0500 @@ -23,75 +23,3 @@ $NetBSD: patch-ah,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $ PROGS = rholo rhpict rhcopy genrhgrid rhoptimize rhinfo -@@ -119,7 +117,7 @@ - rhd_qtree.o rhd_qtree2c.o holo.o - rm -f $(DEVDIR)/glx1.hdi - $(CC) $(CFLAGS) -o $(DEVDIR)/glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \ --viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o -lrt -lGLU -lGL -lX11 -lm -+viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o -lrt -lX11 -lm - - $(DEVDIR)/glx.hdi: rhd_glx0.o rhdisp.o rhdisp2.o viewbeams.o \ - sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \ -@@ -127,7 +125,7 @@ - rm -f $(DEVDIR)/glx.hdi - $(CC) $(CFLAGS) -o $(DEVDIR)/glx.hdi rhd_glx0.o rhdisp.o rhdisp2.o \ - viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \ --sm_ogl.o sm.o sm_usets.o -lrt -lGLU -lGL -lX11 -lm -+sm_ogl.o sm.o sm_usets.o -lrt -lX11 -lm - - $(DEVDIR)/glxo.hdi: rhd_glxo.o rhdisp.o rhdisp2.o viewbeams.o \ - sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \ -@@ -135,7 +133,7 @@ - rm -f $(DEVDIR)/glxo.hdi - $(CC) $(CFLAGS) -o $(DEVDIR)/glxo.hdi rhd_glxo.o rhdisp.o rhdisp2.o \ - viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \ --sm_ogl.o sm_usets.o sm.o rhdobj.o -lrgl -lrt -lGLU -lGL -lX11 -lm -+sm_ogl.o sm_usets.o sm.o rhdobj.o -lrgl -lrt -lX11 -lm - - $(DEVDIR)/glxs.hdi: rhd_glxs.o rhdisp.o rhdisp2.o viewbeams.o \ - sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \ -@@ -143,7 +141,7 @@ - rm -f $(DEVDIR)/glxs.hdi - $(CC) $(CFLAGS) -o $(DEVDIR)/glxs.hdi rhd_glxs.o rhdisp.o rhdisp2.o \ - viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \ --sm_ogl.o sm_usets.o sm.o -lrt -lGLU -lGL -lX11 -lXext -lm -+sm_ogl.o sm_usets.o sm.o -lrt -lX11 -lXext -lm - - $(DEVDIR)/glxso.hdi: rhd_glxso.o rhdisp.o rhdisp2.o viewbeams.o \ - sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \ -@@ -152,30 +150,30 @@ - $(CC) $(CFLAGS) -o $(DEVDIR)/glxso.hdi rhd_glxso.o rhdisp.o rhdisp2.o \ - viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \ - sm_ogl.o sm_usets.o sm.o rhdobj.o \ ---lrgl -lrt -lGLU -lGL -lX11 -lXext -lm -+-lrgl -lrt -lX11 -lXext -lm - - $(DEVDIR)/ogl.hdi: rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \ - rhd_odraw.o rhd_geom.o holo.o - $(CC) $(CFLAGS) -o $(DEVDIR)/ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \ --viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrt -lGLU -lGL -lX11 -lm -+viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrt -lX11 -lm - - $(DEVDIR)/oglo.hdi: rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \ - rhd_odraw.o rhd_geom.o holo.o rhdobj.o - $(CC) $(CFLAGS) -o $(DEVDIR)/oglo.hdi rhd_oglo.o rhdisp.o \ - rhdisp2.o viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \ ---lrgl -lrt -lGLU -lGL -lX11 -lm -+-lrgl -lrt -lX11 -lm - - $(DEVDIR)/ogls.hdi: rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \ - rhd_odraw.o rhd_geom.o holo.o - $(CC) $(CFLAGS) -o $(DEVDIR)/ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \ - viewbeams.o holo.o rhd_odraw.o rhd_geom.o \ ---lrgl -lrt -lGLU -lGL -lX11 -lXext -lm -+-lrgl -lrt -lX11 -lXext -lm - - $(DEVDIR)/oglso.hdi: rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \ - rhd_odraw.o rhd_geom.o holo.o rhdobj.o - $(CC) $(CFLAGS) -o $(DEVDIR)/oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \ - viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \ ---lrgl -lrt -lGLU -lGL -lX11 -lXext -lm -+-lrgl -lrt -lX11 -lXext -lm - - rhd_glx0.o: rhd_glx.c - $(CC) $(CFLAGS) -c rhd_glx.c diff --git a/graphics/radiance/patches/patch-ai b/graphics/radiance/patches/patch-ai index 02baeb59f0a..f9b99c9e8d1 100644 --- a/graphics/radiance/patches/patch-ai +++ b/graphics/radiance/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +$NetBSD: patch-ai,v 1.3 2005/02/17 00:38:37 jschauma Exp $ --- src/meta/Rmakefile.orig 2003-10-21 22:15:07.000000000 -0400 +++ src/meta/Rmakefile 2005-02-16 18:10:01.000000000 -0500 diff --git a/graphics/radiance/patches/patch-al b/graphics/radiance/patches/patch-al index ce1f7ee95dc..848ce97760a 100644 --- a/graphics/radiance/patches/patch-al +++ b/graphics/radiance/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +$NetBSD: patch-al,v 1.3 2005/02/17 00:38:37 jschauma Exp $ --- src/rt/Rmakefile.orig 2004-10-27 19:23:48.000000000 -0400 +++ src/rt/Rmakefile 2005-02-16 18:10:40.000000000 -0500 diff --git a/graphics/radiance/patches/patch-am b/graphics/radiance/patches/patch-am index a01ad6f5879..5a6791b807c 100644 --- a/graphics/radiance/patches/patch-am +++ b/graphics/radiance/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $ +$NetBSD: patch-am,v 1.2 2005/02/17 00:38:37 jschauma Exp $ --- src/util/Rmakefile.orig 2004-10-27 19:23:48.000000000 -0400 +++ src/util/Rmakefile 2005-02-15 17:23:01.000000000 -0500 @@ -21,12 +21,3 @@ $NetBSD: patch-am,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $ PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \ vwrays xglaresrc -@@ -96,7 +94,7 @@ - $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt - - glrad: glrad.o -- $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \ -+ $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt \ - -lX11 -lXext -lm - - contour: contour.o diff --git a/graphics/radiance/patches/patch-an b/graphics/radiance/patches/patch-an index 9d18c8a5f6a..e1a60ff2e6d 100644 --- a/graphics/radiance/patches/patch-an +++ b/graphics/radiance/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.2 2005/02/16 23:20:24 jschauma Exp $ +$NetBSD: patch-an,v 1.3 2005/02/17 00:38:37 jschauma Exp $ --- src/cv/mgflib/Makefile.orig 2003-06-06 15:38:57.000000000 -0400 +++ src/cv/mgflib/Makefile 2005-02-16 18:10:56.000000000 -0500 diff --git a/graphics/radiance/patches/patch-as b/graphics/radiance/patches/patch-as new file mode 100644 index 00000000000..1fc95c02d2b --- /dev/null +++ b/graphics/radiance/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1 2005/02/17 00:38:37 jschauma Exp $ + +--- ./src/hd/rhd_ogl.c.orig Wed Feb 16 18:41:22 2005 ++++ ./src/hd/rhd_ogl.c Wed Feb 16 18:42:11 2005 +@@ -321,6 +321,8 @@ + register VIEW *nv + ) + { ++ double d; ++ + if (nv->type != VT_PER || /* check view legality */ + nv->horiz > 160. || nv->vert > 160.) { + error(COMMAND, "illegal view type/angle"); |