diff options
author | dholland <dholland@pkgsrc.org> | 2012-04-30 01:59:12 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2012-04-30 01:59:12 +0000 |
commit | ceb1ac43d5d3b392cb8f65346b1b163d4c825daa (patch) | |
tree | d796558ea4808c8125e76407ad947f14b6b1da76 | |
parent | 061938ef4907c77379d1c10030b8d2f27c11823d (diff) | |
download | pkgsrc-ceb1ac43d5d3b392cb8f65346b1b163d4c825daa.tar.gz |
Update to 1.8.1. Changes: 10 years of development.
Add missing DESTDIR support.
Restriction: so far the GUI parts, which require qt4, are not built
by default, and probably won't build yet if enabled.
-rw-r--r-- | graphics/aqsis/Makefile | 167 | ||||
-rw-r--r-- | graphics/aqsis/PLIST | 322 | ||||
-rw-r--r-- | graphics/aqsis/distinfo | 26 | ||||
-rw-r--r-- | graphics/aqsis/options.mk | 14 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-aa | 21 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ab | 16 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ac | 16 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ad | 257 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ae | 10 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-af | 13 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ag | 23 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ah | 34 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ai | 34 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-aj | 139 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ak | 13 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-al | 204 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-am | 13 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-an | 13 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ao | 13 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-ap | 49 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-aq | 24 | ||||
-rw-r--r-- | graphics/aqsis/patches/patch-cmake_modules_FindPNG_cmake | 15 |
22 files changed, 416 insertions, 1020 deletions
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index bb786b7c17f..f6648d2f702 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -1,27 +1,170 @@ -# $NetBSD: Makefile,v 1.36 2012/02/06 12:40:16 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2012/04/30 01:59:12 dholland Exp $ # -DISTNAME= aqsis-0.6.4 -PKGREVISION= 9 +DISTNAME= aqsis-1.8.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqsis/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.aqsis.org/ COMMENT= Renderman clone -LICENSE= gnu-gpl-v1 +LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND modified-bsd -MAKE_JOBS_SAFE= no +PKG_DESTDIR_SUPPORT= user-destdir -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= gmake lex - -GCC_REQD+= 2.95.3 +USE_CMAKE= yes USE_LANGUAGES= c c++ +USE_TOOLS+= pkg-config flex bison + +# +# Insists on being built in a separate directory. +# + +CONFIGURE_DIRS= build +CMAKE_ARG_PATH= .. + +pre-configure: + mkdir ${WRKSRC}/build + +# +# Something in cmake issues -ldl regardless of whether it's appropriate. +# Kludge around it. +# + +# This does not work; it sets CMAKE_DL_LIBS which the cmake documentation +# says is where -ldl comes from, but this does not apparently prevent +# cmake from issuing -ldl. +#CMAKE_ARGS+= -D CMAKE_DL_LIBS:STRING='${DL_LIBS}' + +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "NetBSD" +BUILDLINK_TRANSFORM+= rm:-ldl +.endif + +# +# Forcibly reprogram cmake's rpath substitution. +# + +BLDIR= ${WRKDIR}/.buildlink/lib + +SUBST_CLASSES+= rpath +SUBST_STAGE.rpath= post-configure +SUBST_FILES.rpath+= build/libs/math/cmake_install.cmake +SUBST_FILES.rpath+= build/libs/util/cmake_install.cmake +SUBST_FILES.rpath+= build/libs/riutil/cmake_install.cmake +SUBST_FILES.rpath+= build/libs/slcomp/cmake_install.cmake +SUBST_FILES.rpath+= build/libs/tex/cmake_install.cmake +SUBST_FILES.rpath+= build/libs/shadervm/cmake_install.cmake +SUBST_FILES.rpath+= build/libs/slxargs/cmake_install.cmake +SUBST_FILES.rpath+= build/libs/ri2rib/cmake_install.cmake +SUBST_FILES.rpath+= build/libs/core/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/aqsl/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/aqsltell/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/aqsis/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/miqser/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/teqser/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/displays/exr/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/displays/file/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/displays/piqsl/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/displays/sdcBMP/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/displays/xpm/cmake_install.cmake +SUBST_FILES.rpath+= build/tools/procedurals/hairgen/cmake_install.cmake +SUBST_SED.rpath= -e '/OLD_RPATH/s,"::*","${PREFIX}/lib",' +SUBST_SED.rpath+= -e '/OLD_RPATH/s,${BLDIR},${PREFIX}/lib,' +SUBST_SED.rpath+= -e '/OLD_RPATH/s,:",",' +SUBST_SED.rpath+= -e '/NEW_RPATH/s,"${PREFIX}/.*","${PREFIX}/lib",' +SUBST_MESSAGE.rpath= Fixing broken rpath mangling. + +# +# Scripts. +# + +REPLACE_PYTHON+= examples/features/occlusion/occlmap.py + +# This script wants to run something called 'hython', which is +# apparently a Python embedding inside something called Houdini, +# which appears to be payware. So let's let it slide. +CHECK_INTERPRETER_SKIP+= share/aqsis/plugins/houdini/slx2otl.py + +# These are all ostensibly bash scripts but I see no bashisms in any of them. +REPLACE_SH+= examples/features/archives/render.sh +REPLACE_SH+= examples/features/bake/render.sh +REPLACE_SH+= examples/features/curves/render.sh +REPLACE_SH+= examples/features/layeredshaders/render.sh +REPLACE_SH+= examples/features/levelofdetail/render.sh +REPLACE_SH+= examples/features/motionblur/render_camera.sh +REPLACE_SH+= examples/features/motionblur/render_deformation.sh +REPLACE_SH+= examples/features/multipass/render.sh +REPLACE_SH+= examples/features/objectinstance/render.sh +REPLACE_SH+= examples/features/occlusion/render.sh +REPLACE_SH+= examples/features/pointcloud/render.sh +REPLACE_SH+= examples/features/shadows/render_autoshadow.sh +REPLACE_SH+= examples/features/shadows/render_softshadow.sh +REPLACE_SH+= examples/features/solidmodeling/render.sh +REPLACE_SH+= examples/features/subdivision/render.sh +REPLACE_SH+= examples/features/textures/render.sh +REPLACE_SH+= examples/procedurals/menger/render.sh +REPLACE_SH+= examples/scenes/fisheye/render.sh +REPLACE_SH+= examples/scenes/microbe/render.sh +REPLACE_SH+= examples/scenes/vase/render.sh +REPLACE_SH+= tools/neqsus/houdini/post.sh +REPLACE_SH+= distribution/linux/aqsis.sh +REPLACE_SH+= distribution/linux/aqsl.sh +REPLACE_SH+= distribution/linux/aqsltell.sh + +# +# Handle the config file. +# +# XXX the post-install rule will result in an overwritten config file +# if using a non-DESTDIR build. However, I can't get it to install the +# thing anywhere else; the setting cmake documents that ought to move +# it does not work. +# + +PKG_SYSCONFSUBDIR= aqsis +CONF_FILES+= share/examples/aqsis/aqsisrc ${PKG_SYSCONFDIR}/aqsisrc +INSTALLATION_DIRS+= share/examples/aqsis + +post-install: + mv ${DESTDIR}${PREFIX}/etc/aqsis/aqsisrc \ + ${DESTDIR}${PREFIX}/share/examples/aqsis/aqsisrc + rmdir ${DESTDIR}${PREFIX}/etc/aqsis || ${TRUE} + rmdir ${DESTDIR}${PREFIX}/etc || ${TRUE} + +# +# Depends. The package says: +# +# CMake (v2.6.3+) +# Boost (v1.34.1+) +# libtiff.lib (v3.7.1+) +# flex (v2.5.4) (2.5.31 causes problems, see FAQ 2.2) +# bison (v1.35+) +# Qt (v4.6+) - optional, for framebuffer rendering and other GUI components +# libzlib (v1.1.4+) +# libjpeg (v6b+) +# libilmbase (v1.6+) +# OpenEXR - if you want to read and write OpenEXR HDR image files +# +# and in practice it also needs png. +# +# Qt is optional and, for the time being, doesn't work - will need at +# least PLIST additions. +# +# From what I can tell it may react to py-sphinx and/or doxygen by +# installing more docs or other material. Not sure how to beat on +# cmake to make sure this doesn't happen. +# + +.include "options.mk" -.include "../../devel/libargparse/buildlink3.mk" -.include "../../graphics/Mesa/buildlink3.mk" +.include "../../devel/boost-libs/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../graphics/ilmbase/buildlink3.mk" +.include "../../graphics/openexr/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/aqsis/PLIST b/graphics/aqsis/PLIST index d141f0d165b..b4519e659d6 100644 --- a/graphics/aqsis/PLIST +++ b/graphics/aqsis/PLIST @@ -1,99 +1,231 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:59:06 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2012/04/30 01:59:12 dholland Exp $ bin/aqsis -bin/aqsis_framebuffer_glut -bin/aqsis_framebuffer_glut_z bin/aqsl -bin/aqslcomp bin/aqsltell -bin/ddmsock.ini -bin/filebuffer -bin/ri2ribtest -bin/shadowmap +bin/miqser bin/teqser -include/aqsis.h -include/aqsis_types.h -include/bitvector.h -include/color.h -include/exception.h -include/file.h -include/librib.h -include/librib2ri.h -include/librib2stream.h -include/list.h -include/matrix.h -include/memorypool.h -include/random.h -include/refcount.h -include/ri.h -include/sstring.h -include/vector2d.h -include/vector3d.h -include/vector4d.h -lib/libaqsis.la -lib/libaqsistypes.la -lib/libcodegenvm.la -lib/libdd.la -lib/libddmsimple.la -lib/libddmsock.la -lib/libplatform.la -lib/libri2rib.la -lib/librib2.la -lib/librib2ri.la -lib/librib2stream.la -lib/libshaderexecenv.la -lib/libshadervm.la -lib/libslparse.la -lib/libslxargs.la -shaders/DPBlueMarble.slx -shaders/DPProctext.h -shaders/SpaceTest.slx -shaders/ambientlight.sl -shaders/ambientlight.slx -shaders/borg_metal.sl -shaders/borg_metal.slx -shaders/brickbump.sl -shaders/brickbump.slx -shaders/bumpy.sl -shaders/bumpy.slx -shaders/cellnoisetest.sl -shaders/cellnoisetest.slx -shaders/constant.sl -shaders/constant.slx -shaders/debug.sl -shaders/debug.slx -shaders/dented.sl -shaders/dented.slx -shaders/depthcue.sl -shaders/depthcue.slx -shaders/distantlight.sl -shaders/distantlight.slx -shaders/dpbluemarble.sl -shaders/fog.sl -shaders/fog.slx -shaders/matte.sl -shaders/matte.slx -shaders/metal.sl -shaders/metal.slx -shaders/noises.h -shaders/paintedplastic.sl -shaders/paintedplastic.slx -shaders/patterns.h -shaders/plastic.sl -shaders/plastic.slx -shaders/pointlight.sl -shaders/pointlight.slx -shaders/randgrid.sl -shaders/randgrid.slx -shaders/shadowspot.sl -shaders/shadowspot.slx -shaders/shinymetal.sl -shaders/shinymetal.slx -shaders/show_st.sl -shaders/show_st.slx -shaders/spacetest.sl -shaders/spotlight.sl -shaders/spotlight.slx -shaders/uvtest.sl -shaders/uvtest.slx -shaders/wavy.sl -shaders/wavy.slx +include/aqsis/aqsis.h +include/aqsis/config.h +include/aqsis/inttype.h +include/aqsis/ri/ndspy.h +include/aqsis/ri/ri.h +include/aqsis/ri/rif.h +include/aqsis/ri/ritypes.h +include/aqsis/ri/shadeop.h +include/aqsis/ri/slo.h +include/aqsis/ri/slx.h +include/aqsis/version.h +lib/aqsis/bmp_dspy.so +lib/aqsis/exr_dspy.so +lib/aqsis/file_dspy.so +lib/aqsis/hairgen.so +lib/aqsis/piqsl_dspy.so +lib/aqsis/xpm_dspy.so +lib/libaqsis_core.so +lib/libaqsis_core.so.1 +lib/libaqsis_core.so.1.8 +lib/libaqsis_math.so +lib/libaqsis_math.so.1 +lib/libaqsis_math.so.1.8 +lib/libaqsis_ri2rib.so +lib/libaqsis_ri2rib.so.1 +lib/libaqsis_ri2rib.so.1.8 +lib/libaqsis_riutil.so +lib/libaqsis_riutil.so.1 +lib/libaqsis_riutil.so.1.8 +lib/libaqsis_shadervm.so +lib/libaqsis_shadervm.so.1 +lib/libaqsis_shadervm.so.1.8 +lib/libaqsis_slcomp.so +lib/libaqsis_slcomp.so.1 +lib/libaqsis_slcomp.so.1.8 +lib/libaqsis_slxargs.so +lib/libaqsis_slxargs.so.1 +lib/libaqsis_slxargs.so.1.8 +lib/libaqsis_tex.so +lib/libaqsis_tex.so.1 +lib/libaqsis_tex.so.1.8 +lib/libaqsis_util.so +lib/libaqsis_util.so.1 +lib/libaqsis_util.so.1.8 +share/applications/aqsis.desktop +share/applications/aqsl.desktop +share/applications/aqsltell.desktop +share/applications/eqsl.desktop +share/applications/piqsl.desktop +share/aqsis/examples/features/archives/bike.rib +share/aqsis/examples/features/archives/bikeData.rib.gz +share/aqsis/examples/features/archives/render.sh +share/aqsis/examples/features/bake/bakesphere.rib +share/aqsis/examples/features/bake/render.sh +share/aqsis/examples/features/bake/sphere.rib +share/aqsis/examples/features/curves/bezier.rib +share/aqsis/examples/features/curves/render.sh +share/aqsis/examples/features/layeredshaders/grid.tif +share/aqsis/examples/features/layeredshaders/layered.rib +share/aqsis/examples/features/layeredshaders/render.sh +share/aqsis/examples/features/layeredshaders/texmap.sl +share/aqsis/examples/features/levelofdetail/detail.rib +share/aqsis/examples/features/levelofdetail/render.sh +share/aqsis/examples/features/motionblur/camera.rib +share/aqsis/examples/features/motionblur/deformation.rib +share/aqsis/examples/features/motionblur/render_camera.sh +share/aqsis/examples/features/motionblur/render_deformation.sh +share/aqsis/examples/features/multipass/aov.rib +share/aqsis/examples/features/multipass/myval.sl +share/aqsis/examples/features/multipass/render.sh +share/aqsis/examples/features/objectinstance/render.sh +share/aqsis/examples/features/objectinstance/singlepolygon.rib +share/aqsis/examples/features/occlusion/envlight.sl +share/aqsis/examples/features/occlusion/occlmap.py +share/aqsis/examples/features/occlusion/occlmap.rib +share/aqsis/examples/features/occlusion/render.sh +share/aqsis/examples/features/occlusion/simple.rib +share/aqsis/examples/features/occlusion/world.rib +share/aqsis/examples/features/shadows/autoshadow.rib +share/aqsis/examples/features/shadows/render_autoshadow.sh +share/aqsis/examples/features/shadows/render_softshadow.sh +share/aqsis/examples/features/shadows/softshadow.rib +share/aqsis/examples/features/solidmodeling/csg.rib +share/aqsis/examples/features/solidmodeling/render.sh +share/aqsis/examples/features/subdivision/creases.rib +share/aqsis/examples/features/subdivision/render.sh +share/aqsis/examples/features/textures/grid.tif +share/aqsis/examples/features/textures/render.sh +share/aqsis/examples/features/textures/sticky.rib +share/aqsis/examples/point_based_gi/cornellbox/all_passes.rib +share/aqsis/examples/point_based_gi/cornellbox/ao.sl +share/aqsis/examples/point_based_gi/cornellbox/bake_pass.rib +share/aqsis/examples/point_based_gi/cornellbox/bake_points.sl +share/aqsis/examples/point_based_gi/cornellbox/beauty_pass.rib +share/aqsis/examples/point_based_gi/cornellbox/beauty_pass_ao.rib +share/aqsis/examples/point_based_gi/cornellbox/beautycam.rib +share/aqsis/examples/point_based_gi/cornellbox/geometry.rib +share/aqsis/examples/point_based_gi/cornellbox/indirect.sl +share/aqsis/examples/point_based_gi/cornellbox/lights.rib +share/aqsis/examples/point_based_gi/cornellbox/shadow_pass.rib +share/aqsis/examples/procedurals/menger/README.txt +share/aqsis/examples/procedurals/menger/menger.cpp +share/aqsis/examples/procedurals/menger/menger.rib +share/aqsis/examples/procedurals/menger/render.sh +share/aqsis/examples/scenes/fisheye/README.txt +share/aqsis/examples/scenes/fisheye/envmap.rib +share/aqsis/examples/scenes/fisheye/fisheye.rib +share/aqsis/examples/scenes/fisheye/fisheye_projection.sl +share/aqsis/examples/scenes/fisheye/lights.rib +share/aqsis/examples/scenes/fisheye/render.sh +share/aqsis/examples/scenes/fisheye/scene.rib +share/aqsis/examples/scenes/fisheye/world.rib +share/aqsis/examples/scenes/microbe/microbe.rib +share/aqsis/examples/scenes/microbe/render.sh +share/aqsis/examples/scenes/vase/render.sh +share/aqsis/examples/scenes/vase/vase.rib +share/aqsis/plugins/houdini/README.txt +share/aqsis/plugins/houdini/RIBtargets +share/aqsis/plugins/houdini/hshaders.otl +share/aqsis/plugins/houdini/post.sh +share/aqsis/plugins/houdini/scripts/out/targets/ribcreate_aqsis1.6.cmd +share/aqsis/plugins/houdini/slx2otl.py +share/aqsis/plugins/houdini/soho/RIBaqsis1.6.py +share/aqsis/plugins/houdini/soho/parameters/RIBaqsis1.6.ds +share/aqsis/plugins/houdini/soho/parameters/SOHOparameters +share/aqsis/scripts/aqsis.sh +share/aqsis/scripts/aqsl.sh +share/aqsis/scripts/aqsltell.sh +share/aqsis/shaders/displacement/AqDMap.sl +share/aqsis/shaders/displacement/AqDMap.slx +share/aqsis/shaders/displacement/asteroid.sl +share/aqsis/shaders/displacement/asteroid.slx +share/aqsis/shaders/displacement/borg_metal.sl +share/aqsis/shaders/displacement/borg_metal.slx +share/aqsis/shaders/displacement/bumpy.sl +share/aqsis/shaders/displacement/bumpy.slx +share/aqsis/shaders/displacement/dented.sl +share/aqsis/shaders/displacement/dented.slx +share/aqsis/shaders/displacement/micro_bumps.sl +share/aqsis/shaders/displacement/micro_bumps.slx +share/aqsis/shaders/displacement/wavy.sl +share/aqsis/shaders/displacement/wavy.slx +share/aqsis/shaders/imager/background.sl +share/aqsis/shaders/imager/background.slx +share/aqsis/shaders/imager/bluescreen.sl +share/aqsis/shaders/imager/bluescreen.slx +share/aqsis/shaders/imager/exposure.sl +share/aqsis/shaders/imager/exposure.slx +share/aqsis/shaders/imager/fakesky.sl +share/aqsis/shaders/imager/fakesky.slx +share/aqsis/shaders/imager/filmgrain.sl +share/aqsis/shaders/imager/filmgrain.slx +share/aqsis/shaders/imager/gradient.sl +share/aqsis/shaders/imager/gradient.slx +share/aqsis/shaders/imager/iramp.sl +share/aqsis/shaders/imager/iramp.slx +share/aqsis/shaders/include/patterns.sl +share/aqsis/shaders/light/ambientlight.sl +share/aqsis/shaders/light/ambientlight.slx +share/aqsis/shaders/light/distantlight.sl +share/aqsis/shaders/light/distantlight.slx +share/aqsis/shaders/light/pointlight.sl +share/aqsis/shaders/light/pointlight.slx +share/aqsis/shaders/light/shadowdistant.sl +share/aqsis/shaders/light/shadowdistant.slx +share/aqsis/shaders/light/shadowpoint.sl +share/aqsis/shaders/light/shadowpoint.slx +share/aqsis/shaders/light/shadowspot.sl +share/aqsis/shaders/light/shadowspot.slx +share/aqsis/shaders/light/spotlight.sl +share/aqsis/shaders/light/spotlight.slx +share/aqsis/shaders/surface/AqSMap.sl +share/aqsis/shaders/surface/AqSMap.slx +share/aqsis/shaders/surface/DPBlueMarble.sl +share/aqsis/shaders/surface/DPBlueMarble.slx +share/aqsis/shaders/surface/SpaceTest.sl +share/aqsis/shaders/surface/SpaceTest.slx +share/aqsis/shaders/surface/cd.sl +share/aqsis/shaders/surface/cd.slx +share/aqsis/shaders/surface/cellnoisetest.sl +share/aqsis/shaders/surface/cellnoisetest.slx +share/aqsis/shaders/surface/constant.sl +share/aqsis/shaders/surface/constant.slx +share/aqsis/shaders/surface/curvetube.sl +share/aqsis/shaders/surface/curvetube.slx +share/aqsis/shaders/surface/debug.sl +share/aqsis/shaders/surface/debug.slx +share/aqsis/shaders/surface/expensive.sl +share/aqsis/shaders/surface/expensive.slx +share/aqsis/shaders/surface/face_plastic.sl +share/aqsis/shaders/surface/face_plastic.slx +share/aqsis/shaders/surface/matte.sl +share/aqsis/shaders/surface/matte.slx +share/aqsis/shaders/surface/metal.sl +share/aqsis/shaders/surface/metal.slx +share/aqsis/shaders/surface/microscope.sl +share/aqsis/shaders/surface/microscope.slx +share/aqsis/shaders/surface/paintedplastic.sl +share/aqsis/shaders/surface/paintedplastic.slx +share/aqsis/shaders/surface/pinkGranite.sl +share/aqsis/shaders/surface/pinkGranite.slx +share/aqsis/shaders/surface/plastic.sl +share/aqsis/shaders/surface/plastic.slx +share/aqsis/shaders/surface/randgrid.sl +share/aqsis/shaders/surface/randgrid.slx +share/aqsis/shaders/surface/shinymetal.sl +share/aqsis/shaders/surface/shinymetal.slx +share/aqsis/shaders/surface/show_N.sl +share/aqsis/shaders/surface/show_N.slx +share/aqsis/shaders/surface/show_st.sl +share/aqsis/shaders/surface/show_st.slx +share/aqsis/shaders/surface/showuser.sl +share/aqsis/shaders/surface/showuser.slx +share/aqsis/shaders/surface/sticky_texture.sl +share/aqsis/shaders/surface/sticky_texture.slx +share/aqsis/shaders/surface/uvtest.sl +share/aqsis/shaders/surface/uvtest.slx +share/aqsis/shaders/volume/depthcue.sl +share/aqsis/shaders/volume/depthcue.slx +share/aqsis/shaders/volume/fog.sl +share/aqsis/shaders/volume/fog.slx +share/examples/aqsis/aqsisrc +share/icons/hicolor/192x192/mimetypes/aqsis-doc.png +share/mime/packages/aqsis.xml +share/pixmaps/aqsis.png diff --git a/graphics/aqsis/distinfo b/graphics/aqsis/distinfo index 5b135106db0..7eab5f40c2c 100644 --- a/graphics/aqsis/distinfo +++ b/graphics/aqsis/distinfo @@ -1,22 +1,6 @@ -$NetBSD: distinfo,v 1.7 2008/09/01 08:02:23 dholland Exp $ +$NetBSD: distinfo,v 1.8 2012/04/30 01:59:12 dholland Exp $ -SHA1 (aqsis-0.6.4.tar.gz) = 7a8e10db5502907840d8d2f4269eb3b489875dd4 -RMD160 (aqsis-0.6.4.tar.gz) = d2b034e05d47e31aa040471be37b34750154e6e5 -Size (aqsis-0.6.4.tar.gz) = 857020 bytes -SHA1 (patch-aa) = e98cedaea79ce45897387f82448468b14b1d033f -SHA1 (patch-ab) = 2f0f878996aa551a35c65d90299162e13661cbab -SHA1 (patch-ac) = 5633148c8f7617ddef0e8831bd003dc9cb3f3596 -SHA1 (patch-ad) = d5dc010175fc749268075e391fcb9fd5ff0ae6b9 -SHA1 (patch-ae) = d2ce4d8833a0ea27aaa6242c476fe542efe92574 -SHA1 (patch-af) = 5251aedf37fd4ab8e954d90e484d82bdcf0a8e45 -SHA1 (patch-ag) = 673c7fb0a9619d5a8f8a0ad0906c5f29fb639358 -SHA1 (patch-ah) = 30c2605ef5f0f82df71fc1b494c3ed5beeea78e8 -SHA1 (patch-ai) = 60ab77412e3e4a223604028087f377f94d113bdc -SHA1 (patch-aj) = 0cd6dcc80463ffb1193e25b55f6c160849ef0ab6 -SHA1 (patch-ak) = 45ee2a15967b5c0f75ed4ba7ecc3790373f5e44d -SHA1 (patch-al) = 3f721b5a28714c7ed601aace984096ef142c105b -SHA1 (patch-am) = 8227295b85018e5294ab1c8ca5c415dbe0371282 -SHA1 (patch-an) = 2a0dead7923ce600b70577f9f476bc0bab527131 -SHA1 (patch-ao) = 8776ff34346420d34a0ccfa1f952815c7a0328b8 -SHA1 (patch-ap) = b8659e4027114c1f1ecd0e8ab9d9c4eed61575a1 -SHA1 (patch-aq) = e4e2aef5e57f58e2f5f02d00277084c73ce4fe74 +SHA1 (aqsis-1.8.1.tar.gz) = 61b2552fd1fe782f008ba3a17efd3b185da70d5b +RMD160 (aqsis-1.8.1.tar.gz) = 12d13a851188339c99fa5cb7fc0d5ce40d077fd6 +Size (aqsis-1.8.1.tar.gz) = 5663787 bytes +SHA1 (patch-cmake_modules_FindPNG_cmake) = 24de84a90d62bcdbb767f5e16df2563f32e723aa diff --git a/graphics/aqsis/options.mk b/graphics/aqsis/options.mk new file mode 100644 index 00000000000..228e35678dd --- /dev/null +++ b/graphics/aqsis/options.mk @@ -0,0 +1,14 @@ +# $NetBSD: options.mk,v 1.1 2012/04/30 01:59:12 dholland Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.aqsis +PKG_SUPPORTED_OPTIONS= qt4 +PKG_SUGGESTED_OPTIONS= + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= qt4 + +.if !empty(PKG_OPTIONS:Mqt4) +.include "../../x11/qt4-libs/buildlink3.mk" +PLIST.qt4= yes +.endif diff --git a/graphics/aqsis/patches/patch-aa b/graphics/aqsis/patches/patch-aa deleted file mode 100644 index d748e5296da..00000000000 --- a/graphics/aqsis/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2006/05/11 18:55:31 joerg Exp $ - ---- teqser/Makefile.in.orig 2002-05-24 08:33:04.000000000 +0000 -+++ teqser/Makefile.in -@@ -81,7 +81,7 @@ YACC = @YACC@ - bin_PROGRAMS = teqser - - teqser_SOURCES = teqser.cpp --teqser_LDADD = $(top_builddir)/render/libaqsis.la $(top_builddir)/libddmsimple/libddmsimple.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la -ltiff -largparse -ldl -+teqser_LDADD = $(top_builddir)/render/libaqsis.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la -largparse ${DL_LIBS} - @DEBUG_TRUE@AM_CXXFLAGS = -g -Wall - @DEBUG_FALSE@AM_CXXFLAGS = - -@@ -100,7 +100,6 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - teqser_OBJECTS = teqser.o - teqser_DEPENDENCIES = $(top_builddir)/render/libaqsis.la \ --$(top_builddir)/libddmsimple/libddmsimple.la \ - $(top_builddir)/libaqsistypes/libaqsistypes.la \ - $(top_builddir)/libshadervm/libshadervm.la \ - $(top_builddir)/libshaderexecenv/libshaderexecenv.la diff --git a/graphics/aqsis/patches/patch-ab b/graphics/aqsis/patches/patch-ab deleted file mode 100644 index 676b9f559c7..00000000000 --- a/graphics/aqsis/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/10/28 15:12:36 agc Exp $ - ---- aqsis/Makefile.in 2002/06/24 19:30:09 1.1 -+++ aqsis/Makefile.in 2002/06/24 19:30:32 -@@ -81,7 +81,11 @@ - bin_PROGRAMS = aqsis - - aqsis_SOURCES = aqsis.cpp -+ifdef HAVE_LIBDL - aqsis_LDADD = $(top_builddir)/librib2ri/librib2ri.la $(top_builddir)/librib2/librib2.la $(top_builddir)/render/libaqsis.la $(top_builddir)/libddmsock/libddmsock.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la -ltiff -largparse -ldl -+else -+aqsis_LDADD = $(top_builddir)/librib2ri/librib2ri.la $(top_builddir)/librib2/librib2.la $(top_builddir)/render/libaqsis.la $(top_builddir)/libddmsock/libddmsock.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la -ltiff -largparse -+endif - @DEBUG_TRUE@AM_CXXFLAGS = -g -Wall - @DEBUG_FALSE@AM_CXXFLAGS = - diff --git a/graphics/aqsis/patches/patch-ac b/graphics/aqsis/patches/patch-ac deleted file mode 100644 index 12983ab84cd..00000000000 --- a/graphics/aqsis/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/10/28 15:12:36 agc Exp $ - ---- aqsltell/Makefile.in 2002/06/24 19:31:20 1.1 -+++ aqsltell/Makefile.in 2002/06/24 19:31:42 -@@ -81,7 +81,11 @@ - bin_PROGRAMS = aqsltell - - aqsltell_SOURCES = aqsltell.cpp -+ifdef HAVE_LIBDL - aqsltell_LDADD = $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la $(top_builddir)/libslxargs/libslxargs.la -largparse -ldl -+else -+aqsltell_LDADD = $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la $(top_builddir)/libslxargs/libslxargs.la -largparse -+endif - @DEBUG_TRUE@AM_CXXFLAGS = -g -Wall - @DEBUG_FALSE@AM_CXXFLAGS = - diff --git a/graphics/aqsis/patches/patch-ad b/graphics/aqsis/patches/patch-ad deleted file mode 100644 index 33f4652deb0..00000000000 --- a/graphics/aqsis/patches/patch-ad +++ /dev/null @@ -1,257 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/10/28 15:12:36 agc Exp $ - ---- libaqsistypes/posix/Makefile.in 2002/10/28 13:19:45 1.1 -+++ libaqsistypes/posix/Makefile.in 2002/10/28 13:19:52 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -78,7 +78,7 @@ - VERSION = @VERSION@ - YACC = @YACC@ - --noinst_LTLIBRARIES = libplatform.la -+lib_LTLIBRARIES = libplatform.la - - libplatform_la_SOURCES = aqsis_compiler.h criticalsection.h semaphore.cpp semaphore.h share.h - libplatform_la_LDFLAGS = -rpath $(libdir) -static -@@ -88,7 +88,7 @@ - INCLUDES = -I$(top_srcdir)/libaqsistypes - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -+LTLIBRARIES = $(lib_LTLIBRARIES) - - - DEFS = @DEFS@ -I. -I$(srcdir) -@@ -114,6 +114,7 @@ - - TAR = gtar - GZIP_ENV = --best -+DEP_FILES = .deps/semaphore.P - SOURCES = $(libplatform_la_SOURCES) - OBJECTS = $(libplatform_la_OBJECTS) - -@@ -121,24 +122,37 @@ - .SUFFIXES: - .SUFFIXES: .S .c .cpp .lo .o .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libaqsistypes/posix/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu libaqsistypes/posix/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - --mostlyclean-noinstLTLIBRARIES: -+mostlyclean-libLTLIBRARIES: - --clean-noinstLTLIBRARIES: -- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -+clean-libLTLIBRARIES: -+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - --distclean-noinstLTLIBRARIES: -+distclean-libLTLIBRARIES: - --maintainer-clean-noinstLTLIBRARIES: -+maintainer-clean-libLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -+install-libLTLIBRARIES: $(lib_LTLIBRARIES) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(libdir) -+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ if test -f $$p; then \ -+ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ -+ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ -+ else :; fi; \ -+ done -+ -+uninstall-libLTLIBRARIES: -+ @$(NORMAL_UNINSTALL) -+ list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ -+ done - - .s.o: - $(COMPILE) -c $< -@@ -156,9 +170,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -176,7 +187,7 @@ - maintainer-clean-libtool: - - libplatform.la: $(libplatform_la_OBJECTS) $(libplatform_la_DEPENDENCIES) -- $(CXXLINK) $(libplatform_la_LDFLAGS) $(libplatform_la_OBJECTS) $(libplatform_la_LIBADD) $(LIBS) -+ $(CXXLINK) -rpath $(libdir) $(libplatform_la_LDFLAGS) $(libplatform_la_OBJECTS) $(libplatform_la_LIBADD) $(LIBS) - .cpp.o: - $(CXXCOMPILE) -c $< - .cpp.lo: -@@ -216,6 +227,11 @@ - subdir = libaqsistypes/posix - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu libaqsistypes/posix/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -227,6 +243,56 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp -+ -+%.o: %.cpp -+ @echo '$(CXXCOMPILE) -c $<'; \ -+ $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.cpp -+ @echo '$(LTCXXCOMPILE) -c $<'; \ -+ $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -235,7 +301,7 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am --install-exec-am: -+install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-am - - install-data-am: -@@ -244,13 +310,14 @@ - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-am --uninstall-am: -+uninstall-am: uninstall-libLTLIBRARIES - uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -+ $(mkinstalldirs) $(DESTDIR)$(libdir) - - - mostlyclean-generic: -@@ -262,39 +329,41 @@ - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - --clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ -+ clean-depend clean-generic mostlyclean-am - - clean: clean-am - --distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+distclean-am: distclean-libLTLIBRARIES distclean-compile \ -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - --maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ -+maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - - maintainer-clean: maintainer-clean-am - --.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \ --clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \ --mostlyclean-compile distclean-compile clean-compile \ --maintainer-clean-compile mostlyclean-libtool distclean-libtool \ --clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ --distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -+.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ -+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ -+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ -+distclean-compile clean-compile maintainer-clean-compile \ -+mostlyclean-libtool distclean-libtool clean-libtool \ -+maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ - dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ - install-exec install-data-am install-data install-am install \ - uninstall-am uninstall all-redirect all-am all installdirs \ diff --git a/graphics/aqsis/patches/patch-ae b/graphics/aqsis/patches/patch-ae deleted file mode 100644 index 61fb6adde45..00000000000 --- a/graphics/aqsis/patches/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/10/28 15:12:36 agc Exp $ - ---- libaqsistypes/posix/Makefile.am 2002/10/28 14:11:34 1.1 -+++ libaqsistypes/posix/Makefile.am 2002/10/28 14:15:54 -@@ -1,4 +1,4 @@ --noinst_LTLIBRARIES = libplatform.la -+lib_LTLIBRARIES = libplatform.la - - libplatform_la_SOURCES = aqsis_compiler.h criticalsection.h semaphore.cpp semaphore.h share.h - libplatform_la_LDFLAGS = -rpath $(libdir) -static diff --git a/graphics/aqsis/patches/patch-af b/graphics/aqsis/patches/patch-af deleted file mode 100644 index a1f941d95a6..00000000000 --- a/graphics/aqsis/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2003/03/15 12:24:22 dmcmahill Exp $ - ---- aqsis/aqsis.cpp.orig Wed May 8 12:01:31 2002 -+++ aqsis/aqsis.cpp Fri Mar 14 21:22:49 2003 -@@ -67,6 +67,6 @@ - RtVoid PrintProgress( RtFloat percent ) - { --static long tick=0; --long now; -+static time_t tick=0; -+time_t now; - - if (tick == 0) diff --git a/graphics/aqsis/patches/patch-ag b/graphics/aqsis/patches/patch-ag deleted file mode 100644 index 88aecdcee54..00000000000 --- a/graphics/aqsis/patches/patch-ag +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2004/05/25 21:13:26 kristerw Exp $ - ---- render/ri.cpp.orig 2004-05-25 22:51:42.000000000 +0200 -+++ render/ri.cpp 2004-05-25 22:52:32.000000000 +0200 -@@ -3854,12 +3854,12 @@ - // Now copy the images to the big map. - CqTextureMap* Images[ 6 ] = - { -- {&tpz}, -- {&tpx}, -- {&tpy}, -- {&tnx}, -- {&tny}, -- {&tnz} -+ &tpz, -+ &tpx, -+ &tpy, -+ &tnx, -+ &tny, -+ &tnz - }; - - // Create a new image. diff --git a/graphics/aqsis/patches/patch-ah b/graphics/aqsis/patches/patch-ah deleted file mode 100644 index ad59375c03a..00000000000 --- a/graphics/aqsis/patches/patch-ah +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2006/05/11 18:55:31 joerg Exp $ - ---- render/motion.h.orig 2006-04-28 16:12:32.000000000 +0000 -+++ render/motion.h -@@ -74,9 +74,9 @@ class CqMotionSpec - { - m_aTimes.clear(); - m_aObjects.clear(); -- for ( std::vector<TqFloat>::const_iterator t = From.m_aTimes.begin(); t<From.m_aTimes.end(); t++ ) -+ for ( typename std::vector<TqFloat>::const_iterator t = From.m_aTimes.begin(); t<From.m_aTimes.end(); t++ ) - m_aTimes.push_back( *t ); -- for( std::vector<T>::const_iterator o = From.m_aObjects.begin(); o<From.m_aObjects.end(); o++ ) -+ for( typename std::vector<T>::const_iterator o = From.m_aObjects.begin(); o<From.m_aObjects.end(); o++ ) - m_aObjects.push_back( *o ); - m_DefObject = From.m_DefObject; - } -@@ -105,7 +105,7 @@ class CqMotionSpec - { - // Insert the timeslot at the proper place. - std::vector<TqFloat>::iterator itime = m_aTimes.begin(); -- std::vector<T>::iterator iobj = m_aObjects.begin(); -+ typename std::vector<T>::iterator iobj = m_aObjects.begin(); - while ( itime != m_aTimes.end() && *itime < time ) itime++, iobj++; - m_aTimes.insert( itime, time ); - m_aObjects.insert( iobj, Object ); -@@ -135,7 +135,7 @@ class CqMotionSpec - */ - void ConcatAllTimeSlots( const T& Object ) - { -- for ( std::vector<T>::iterator i = m_aObjects.begin(); i<m_aObjects.end(); i++ ) -+ for ( typename std::vector<T>::iterator i = m_aObjects.begin(); i<m_aObjects.end(); i++ ) - ( *i ) = ConcatMotionObjects( ( *i ), Object ); - } - /** Get the frame time at the specified timeslot index. diff --git a/graphics/aqsis/patches/patch-ai b/graphics/aqsis/patches/patch-ai deleted file mode 100644 index 1a0ca5f4e14..00000000000 --- a/graphics/aqsis/patches/patch-ai +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2006/05/11 18:55:31 joerg Exp $ - ---- render/parameters.h.orig 2006-04-28 16:14:58.000000000 +0000 -+++ render/parameters.h -@@ -463,7 +463,7 @@ class CqParameterTypedVaryingArray : pub - m_aValues.resize( size ); - TqInt j; - for ( j = 0; j < size; j++ ) -- m_aValues[ j ].resize( m_Count ); -+ m_aValues[ j ].resize( this->m_Count ); - } - virtual TqUint Size() const - { -@@ -541,9 +541,9 @@ class CqParameterTypedVaryingArray : pub - TqUint j; - for ( j = 0; j < m_aValues.size(); j++ ) - { -- m_aValues[ j ].resize( m_Count ); -+ m_aValues[ j ].resize( this->m_Count ); - TqInt i; -- for ( i = 0; i < m_Count; i++ ) -+ for ( i = 0; i < this->m_Count; i++ ) - m_aValues[ j ][ i ] = From.m_aValues[ j ][ i ]; - } - return ( *this ); -@@ -650,7 +650,7 @@ class CqParameterTypedUniformArray : pub - { - m_aValues.resize( From.m_aValues.size() ); - TqInt i2 = 0; -- for ( std::vector<T>::iterator i = From.m_aValues.being(); i != From.m_aValues.end(); i++, i2++ ) -+ for ( typename std::vector<T>::iterator i = From.m_aValues.being(); i != From.m_aValues.end(); i++, i2++ ) - m_aValues[ i2 ] = ( *i ); - return ( *this ); - } diff --git a/graphics/aqsis/patches/patch-aj b/graphics/aqsis/patches/patch-aj deleted file mode 100644 index 27b184d6d6a..00000000000 --- a/graphics/aqsis/patches/patch-aj +++ /dev/null @@ -1,139 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2006/05/11 18:55:31 joerg Exp $ - ---- render/surface.h.orig 2006-04-28 16:19:45.000000000 +0000 -+++ render/surface.h -@@ -425,8 +425,8 @@ class CqMotionSurface : public CqBasicSu - virtual ~CqMotionSurface() - { - TqInt i; -- for ( i = 0; i < cTimes(); i++ ) -- GetMotionObject( Time( i ) ) ->Release(); -+ for ( i = 0; i < this->cTimes(); i++ ) -+ GetMotionObject( this->Time( i ) ) ->Release(); - } - - /** Get combnied bound for all times -@@ -436,8 +436,8 @@ class CqMotionSurface : public CqBasicSu - { - CqBound B( FLT_MAX, FLT_MAX, FLT_MAX, -FLT_MAX, -FLT_MAX, -FLT_MAX ); - TqInt i; -- for ( i = 0; i < cTimes(); i++ ) -- B = B.Combine( GetMotionObject( Time( i ) ) ->Bound() ); -+ for ( i = 0; i < this->cTimes(); i++ ) -+ B = B.Combine( GetMotionObject( this->Time( i ) ) ->Bound() ); - - return ( B ); - } -@@ -447,10 +447,10 @@ class CqMotionSurface : public CqBasicSu - { - CqMotionMicroPolyGrid * pGrid = new CqMotionMicroPolyGrid; - TqInt i; -- for ( i = 0; i < cTimes(); i++ ) -+ for ( i = 0; i < this->cTimes(); i++ ) - { -- CqMicroPolyGridBase* pGrid2 = GetMotionObject( Time( i ) ) ->Dice(); -- pGrid->AddTimeSlot( Time( i ), pGrid2 ); -+ CqMicroPolyGridBase* pGrid2 = GetMotionObject( this->Time( i ) ) ->Dice(); -+ pGrid->AddTimeSlot( this->Time( i ), pGrid2 ); - } - return ( pGrid ); - } -@@ -459,11 +459,11 @@ class CqMotionSurface : public CqBasicSu - virtual TqInt Split( std::vector<CqBasicSurface*>& aSplits ) - { - std::vector<std::vector<CqBasicSurface*> > aaMotionSplits; -- aaMotionSplits.resize( cTimes() ); -+ aaMotionSplits.resize( this->cTimes() ); - TqInt cSplits = 0; - TqInt i; -- for ( i = 0; i < cTimes(); i++ ) -- cSplits = GetMotionObject( Time( i ) ) ->Split( aaMotionSplits[ i ] ); -+ for ( i = 0; i < this->cTimes(); i++ ) -+ cSplits = GetMotionObject( this->Time( i ) ) ->Split( aaMotionSplits[ i ] ); - - // Now build motion surfaces from the splits and pass them back. - for ( i = 0; i < cSplits; i++ ) -@@ -473,8 +473,8 @@ class CqMotionSurface : public CqBasicSu - pNewMotion->m_fDiceable = TqTrue; - pNewMotion->m_EyeSplitCount = m_EyeSplitCount; - TqInt j; -- for ( j = 0; j < cTimes(); j++ ) -- pNewMotion->AddTimeSlot( Time( j ), reinterpret_cast<T>( aaMotionSplits[ j ][ i ] ) ); -+ for ( j = 0; j < this->cTimes(); j++ ) -+ pNewMotion->AddTimeSlot( this->Time( j ), reinterpret_cast<T>( aaMotionSplits[ j ][ i ] ) ); - aSplits.push_back( pNewMotion ); - } - return ( cSplits ); -@@ -485,11 +485,11 @@ class CqMotionSurface : public CqBasicSu - */ - virtual TqBool Diceable() - { -- TqBool f = GetMotionObject( Time( 0 ) ) ->Diceable(); -+ TqBool f = GetMotionObject( this->Time( 0 ) ) ->Diceable(); - // Copy the split info so that at each time slot, the gprims split the same. - TqInt i; -- for ( i = 1; i < cTimes(); i++ ) -- GetMotionObject( Time( i ) ) ->CopySplitInfo( *GetMotionObject( Time( 0 ) ) ); -+ for ( i = 1; i < this->cTimes(); i++ ) -+ GetMotionObject( this->Time( i ) ) ->CopySplitInfo( *GetMotionObject( this->Time( 0 ) ) ); - return ( f ); - } - -@@ -500,7 +500,7 @@ class CqMotionSurface : public CqBasicSu - */ - virtual void Transform( const CqMatrix& matTx, const CqMatrix& matITTx, const CqMatrix& matRTx ) - { -- GetMotionObject( 0 ) ->Transform( matTx, matITTx, matRTx ); -+ this->GetMotionObject( 0 ) ->Transform( matTx, matITTx, matRTx ); - } - - /** Set the surface parameters of all GPrims to match those on the spefified one. -@@ -509,8 +509,8 @@ class CqMotionSurface : public CqBasicSu - virtual void SetSurfaceParameters( const CqBasicSurface& From ) - { - TqInt i; -- for ( i = 0; i < cTimes(); i++ ) -- GetMotionObject( Time( i ) ) ->SetSurfaceParameters( From ); -+ for ( i = 0; i < this->cTimes(); i++ ) -+ GetMotionObject( this->Time( i ) ) ->SetSurfaceParameters( From ); - } - /** Force all GPrims to be undiceable. - */ -@@ -518,8 +518,8 @@ class CqMotionSurface : public CqBasicSu - { - CqBasicSurface::ForceUndiceable(); - TqInt i; -- for ( i = 0; i < cTimes(); i++ ) -- GetMotionObject( Time( i ) ) ->ForceUndiceable(); -+ for ( i = 0; i < this->cTimes(); i++ ) -+ GetMotionObject( this->Time( i ) ) ->ForceUndiceable(); - } - - /** Mark all GPrims to be discarded. -@@ -528,21 +528,21 @@ class CqMotionSurface : public CqBasicSu - { - CqBasicSurface::Discard(); - TqInt i; -- for ( i = 0; i < cTimes(); i++ ) -- GetMotionObject( Time( i ) ) ->Discard(); -+ for ( i = 0; i < this->cTimes(); i++ ) -+ GetMotionObject( this->Time( i ) ) ->Discard(); - } - - virtual TqUint cUniform() const - { -- return ( GetMotionObject( Time( 0 ) ) ->cUniform() ); -+ return ( GetMotionObject( this->Time( 0 ) ) ->cUniform() ); - } - virtual TqUint cVarying() const - { -- return ( GetMotionObject( Time( 0 ) ) ->cVarying() ); -+ return ( GetMotionObject( this->Time( 0 ) ) ->cVarying() ); - } - virtual TqUint cVertex() const - { -- return ( GetMotionObject( Time( 0 ) ) ->cVertex() ); -+ return ( GetMotionObject( this->Time( 0 ) ) ->cVertex() ); - } - - // Overrides from CqMotionSpec diff --git a/graphics/aqsis/patches/patch-ak b/graphics/aqsis/patches/patch-ak deleted file mode 100644 index ccb03e437d4..00000000000 --- a/graphics/aqsis/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2006/05/11 18:55:31 joerg Exp $ - ---- libshaderexecenv/Makefile.in.orig 2006-05-11 16:56:35.000000000 +0000 -+++ libshaderexecenv/Makefile.in -@@ -83,7 +83,7 @@ EXTRA_DIST = libshaderexecenv.dsp - lib_LTLIBRARIES = libshaderexecenv.la - - libshaderexecenv_la_SOURCES = shaderexecenv.cpp shaderexecenv.h shadeops.cpp --libshaderexecenv_la_LDFLAGS = -rpath $(libdir) -+libshaderexecenv_la_LDFLAGS = -rpath $(libdir) ../render/libaqsis.la - @DEBUG_TRUE@AM_CXXFLAGS = -g -Wall - @DEBUG_FALSE@AM_CXXFLAGS = - diff --git a/graphics/aqsis/patches/patch-al b/graphics/aqsis/patches/patch-al deleted file mode 100644 index ea831d8e9e5..00000000000 --- a/graphics/aqsis/patches/patch-al +++ /dev/null @@ -1,204 +0,0 @@ -$NetBSD: patch-al,v 1.1 2006/05/11 18:55:31 joerg Exp $ - ---- render/subdivision.h.orig 2002-04-25 09:08:54.000000000 +0000 -+++ render/subdivision.h -@@ -181,46 +181,7 @@ class CqWVert : public CqPoolable<CqWVer - * \param pSurf Pointer to the CqWSurf on which we are working. - */ - template <class T> -- T GetSmoothedScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ) -- { -- // NOTE: Checks should have been made prior to this call to ensure it is neither -- // a boundary point or a crease/corner point with sharp edges. -- -- // Q the average of the face points surrounding the vertex. -- T Q = T( 0.0f ); -- std::vector<CqWEdge*>::iterator iE; -- CqWFace* pF; -- TqInt cE = 0; -- -- for ( iE = m_apEdges.begin(); iE != m_apEdges.end(); iE++ ) -- { -- if ( ( *iE ) ->pvHead() == this ) pF = ( *iE ) ->pfLeft(); -- else pF = ( *iE ) ->pfRight(); -- if ( pF ) -- { -- Q += ( pSurf->*F ) ( pPoints, pF->pvSubdivide() ->iVertex() ); -- cE++; -- } -- } -- Q *= ( 1.0f / ( cE * cE ) ); -- -- // R average of the midpoints of the edges that share the old vertex. -- T R = T( 0.0f ); -- cE = 0; -- for ( iE = m_apEdges.begin(); iE != m_apEdges.end(); iE++ ) -- { -- if ( ( *iE ) ->IsValid() ) -- { -- if ( ( *iE ) ->pvHead() == this ) R += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvTail() ->iVertex() ); -- else R += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvHead() ->iVertex() ); -- cE++; -- } -- } -- R *= ( 1.0f / ( cE * cE ) ); -- -- T S = ( pSurf->*F ) ( pPoints, iVertex() ) * ( ( cE - 2.0f ) / ( TqFloat ) cE ); -- return ( S + R + Q ); -- } -+ T GetSmoothedScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ); - - /** Templatised function to perform the subdivision arithmetic on a paramter type. - * \param t Temp of the template type to overcome the VC++ problem with template functions. -@@ -228,35 +189,7 @@ class CqWVert : public CqPoolable<CqWVer - * \param pSurf Pointer to the CqWSurf on which we are working. - */ - template <class T> -- T GetCreaseScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ) -- { -- T P = T( 0.0f ); -- std::vector<CqWEdge*>::iterator iE; -- TqFloat S = 0.0; -- TqInt cS = 0; -- -- for ( iE = m_apEdges.begin(); iE != m_apEdges.end(); iE++ ) -- { -- if ( ( *iE ) ->Sharpness() > 0 && ( *iE ) ->IsValid() ) -- { -- if ( ( *iE ) ->pvHead() == this ) P += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvTail() ->iVertex() ); -- else P += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvHead() ->iVertex() ); -- S += ( *iE ) ->Sharpness(); -- cS++; -- } -- } -- P += ( pSurf->*F ) ( pPoints, iVertex() ) * 6.0f; -- P /= 8.0f; // Crease point -- -- S /= ( TqFloat ) cS; -- if ( cS == 2 && S > 0.0f && S < 1.0f ) -- { -- T P2; -- P2 = GetSmoothedScalar( P2, F, pSurf, pPoints ); -- P = ( P2 * ( 1.0f - S ) ) + ( P * S ); // Linear blend for variable crease. -- } -- return ( P ); -- } -+ T GetCreaseScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ); - - /** Templatised function to perform the subdivision arithmetic on a paramter type. - * \param t Temp of the template type to overcome the VC++ problem with template functions. -@@ -264,19 +197,7 @@ class CqWVert : public CqPoolable<CqWVer - * \param pSurf Pointer to the CqWSurf on which we are working. - */ - template <class T> -- T GetBoundaryScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ) -- { -- T P = T( 0.0f ); -- std::vector<CqWEdge*>::iterator iE; -- for ( iE = m_apEdges.begin(); iE != m_apEdges.end(); iE++ ) -- if ( ( *iE ) ->IsBoundary() ) -- if ( ( *iE ) ->pvHead() == this ) P += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvTail() ->iVertex() ); -- else P += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvHead() ->iVertex() ); -- -- P += ( pSurf->*F ) ( pPoints, iVertex() ) * 6.0f; -- P /= 8.0f; -- return ( P ); -- } -+ T GetBoundaryScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ); - - private: - TqInt m_iVertex; ///< Index of the vertex in the vertex list -@@ -1168,6 +1089,93 @@ inline CqWFace* CqWReference::pfRight() - return ( m_pFace == m_pEdge->pfLeft() ? m_pEdge->pfRight() : m_pEdge->pfLeft() ); - } - -+template <class T> inline -+T CqWVert::GetSmoothedScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ) -+{ -+ // NOTE: Checks should have been made prior to this call to ensure it is neither -+ // a boundary point or a crease/corner point with sharp edges. -+ -+ // Q the average of the face points surrounding the vertex. -+ T Q = T( 0.0f ); -+ std::vector<CqWEdge*>::iterator iE; -+ CqWFace* pF; -+ TqInt cE = 0; -+ -+ for ( iE = m_apEdges.begin(); iE != m_apEdges.end(); iE++ ) -+ { -+ if ( ( *iE ) ->pvHead() == this ) pF = ( *iE ) ->pfLeft(); -+ else pF = ( *iE ) ->pfRight(); -+ if ( pF ) -+ { -+ Q += ( pSurf->*F ) ( pPoints, pF->pvSubdivide() ->iVertex() ); -+ cE++; -+ } -+ } -+ Q *= ( 1.0f / ( cE * cE ) ); -+ -+ // R average of the midpoints of the edges that share the old vertex. -+ T R = T( 0.0f ); -+ cE = 0; -+ for ( iE = m_apEdges.begin(); iE != m_apEdges.end(); iE++ ) -+ { -+ if ( ( *iE ) ->IsValid() ) -+ { -+ if ( ( *iE ) ->pvHead() == this ) R += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvTail() ->iVertex() ); -+ else R += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvHead() ->iVertex() ); -+ cE++; -+ } -+ } -+ R *= ( 1.0f / ( cE * cE ) ); -+ -+ T S = ( pSurf->*F ) ( pPoints, iVertex() ) * ( ( cE - 2.0f ) / ( TqFloat ) cE ); -+ return ( S + R + Q ); -+} -+ -+template <class T> inline -+T CqWVert::GetCreaseScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ) -+{ -+ T P = T( 0.0f ); -+ std::vector<CqWEdge*>::iterator iE; -+ TqFloat S = 0.0; -+ TqInt cS = 0; -+ -+ for ( iE = m_apEdges.begin(); iE != m_apEdges.end(); iE++ ) -+ { -+ if ( ( *iE ) ->Sharpness() > 0 && ( *iE ) ->IsValid() ) -+ { -+ if ( ( *iE ) ->pvHead() == this ) P += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvTail() ->iVertex() ); -+ else P += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvHead() ->iVertex() ); -+ S += ( *iE ) ->Sharpness(); -+ cS++; -+ } -+ } -+ P += ( pSurf->*F ) ( pPoints, iVertex() ) * 6.0f; -+ P /= 8.0f; // Crease point -+ -+ S /= ( TqFloat ) cS; -+ if ( cS == 2 && S > 0.0f && S < 1.0f ) -+ { -+ T P2; -+ P2 = GetSmoothedScalar( P2, F, pSurf, pPoints ); -+ P = ( P2 * ( 1.0f - S ) ) + ( P * S ); // Linear blend for variable crease. -+ } -+ return ( P ); -+} -+ -+template <class T> inline -+T CqWVert::GetBoundaryScalar( T& t, T( CqSubdivider::*F ) ( CqPolygonPoints*, TqInt ), CqSubdivider* pSurf, CqPolygonPoints* pPoints ) -+{ -+ T P = T( 0.0f ); -+ std::vector<CqWEdge*>::iterator iE; -+ for ( iE = m_apEdges.begin(); iE != m_apEdges.end(); iE++ ) -+ if ( ( *iE ) ->IsBoundary() ) -+ if ( ( *iE ) ->pvHead() == this ) P += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvTail() ->iVertex() ); -+ else P += ( pSurf->*F ) ( pPoints, ( *iE ) ->pvHead() ->iVertex() ); -+ -+ P += ( pSurf->*F ) ( pPoints, iVertex() ) * 6.0f; -+ P /= 8.0f; -+ return ( P ); -+} - - //----------------------------------------------------------------------- - diff --git a/graphics/aqsis/patches/patch-am b/graphics/aqsis/patches/patch-am deleted file mode 100644 index 00cc86226cc..00000000000 --- a/graphics/aqsis/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2006/05/11 18:55:31 joerg Exp $ - ---- libaqsistypes/memorypool.h.orig 2002-03-01 18:58:57.000000000 +0000 -+++ libaqsistypes/memorypool.h -@@ -165,7 +165,7 @@ class CqPoolable - /** Define the static memory pool for a poolable class. - */ - --#define DEFINE_STATIC_MEMORYPOOL(A) CqMemoryPool<A> CqPoolable<A>::m_thePool -+#define DEFINE_STATIC_MEMORYPOOL(A) template<> CqMemoryPool<A> CqPoolable<A>::m_thePool = CqMemoryPool<A>() - - - //----------------------------------------------------------------------- diff --git a/graphics/aqsis/patches/patch-an b/graphics/aqsis/patches/patch-an deleted file mode 100644 index 21449819190..00000000000 --- a/graphics/aqsis/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1 2006/05/11 18:55:31 joerg Exp $ - ---- render/Makefile.in.orig 2006-05-11 17:00:59.000000000 +0000 -+++ render/Makefile.in -@@ -100,7 +100,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libaqsis_la_LIBADD = -+libaqsis_la_LIBADD = ../libddmsock/libddmsock.la -ltiff -lm - libaqsis_la_OBJECTS = attributes.lo bound.lo context.lo imagebuffer.lo \ - lights.lo messages.lo micropolygon.lo nurbs.lo options.lo parameters.lo \ - patch.lo polygon.lo quadrics.lo points.lo render.lo renderer.lo ri.lo \ diff --git a/graphics/aqsis/patches/patch-ao b/graphics/aqsis/patches/patch-ao deleted file mode 100644 index 27ecacd05ff..00000000000 --- a/graphics/aqsis/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2008/09/01 08:02:23 dholland Exp $ - ---- filebuffer/filebuffer.cpp~ 2002-05-21 06:47:26.000000000 -0400 -+++ filebuffer/filebuffer.cpp 2008-09-01 03:28:56.000000000 -0400 -@@ -171,7 +171,7 @@ TqInt Close( SOCKET s, SqDDMessageBase* - #else - sprintf( version, "%s %s", STRNAME, VERSION ); - #endif -- TIFFSetField( pOut, TIFFTAG_SOFTWARE, ( uint32 ) version ); -+ TIFFSetField( pOut, TIFFTAG_SOFTWARE, version ); - TIFFSetField( pOut, TIFFTAG_IMAGEWIDTH, ( uint32 ) XRes ); - TIFFSetField( pOut, TIFFTAG_IMAGELENGTH, ( uint32 ) YRes ); - TIFFSetField( pOut, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT ); diff --git a/graphics/aqsis/patches/patch-ap b/graphics/aqsis/patches/patch-ap deleted file mode 100644 index 33f91769df2..00000000000 --- a/graphics/aqsis/patches/patch-ap +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2008/09/01 08:02:23 dholland Exp $ - ---- render/texturemap.cpp.orig 2002-05-21 08:20:02.000000000 -0400 -+++ render/texturemap.cpp 2008-09-01 03:39:36.000000000 -0400 -@@ -1840,7 +1840,7 @@ void CqShadowMap::SaveShadowMap( const C - #else - sprintf( version, "%s %s", STRNAME, VERSION ); - #endif -- TIFFSetField( pshadow, TIFFTAG_SOFTWARE, ( uint32 ) version ); -+ TIFFSetField( pshadow, TIFFTAG_SOFTWARE, version ); - TIFFSetField( pshadow, TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA, matWorldToCamera ); - TIFFSetField( pshadow, TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN, matWorldToScreen ); - TIFFSetField( pshadow, TIFFTAG_PIXAR_TEXTUREFORMAT, SHADOWMAP_HEADER ); -@@ -1900,7 +1900,7 @@ void CqTextureMap::WriteTileImage( TIFF* - #else - sprintf( version, "%s %s", STRNAME, VERSION ); - #endif -- TIFFSetField( ptex, TIFFTAG_SOFTWARE, ( uint32 ) version ); -+ TIFFSetField( ptex, TIFFTAG_SOFTWARE, version ); - TIFFSetField( ptex, TIFFTAG_IMAGEWIDTH, width ); - TIFFSetField( ptex, TIFFTAG_IMAGELENGTH, length ); - TIFFSetField( ptex, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG ); -@@ -1963,7 +1963,7 @@ void CqTextureMap::WriteImage( TIFF* pte - #else - sprintf( version, "%s %s", STRNAME, VERSION ); - #endif -- TIFFSetField( ptex, TIFFTAG_SOFTWARE, ( uint32 ) version ); -+ TIFFSetField( ptex, TIFFTAG_SOFTWARE, version ); - TIFFSetField( ptex, TIFFTAG_IMAGEWIDTH, width ); - TIFFSetField( ptex, TIFFTAG_IMAGELENGTH, length ); - TIFFSetField( ptex, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG ); -@@ -1996,7 +1996,7 @@ void CqTextureMap::WriteTileImage( TIFF* - #else - sprintf( version, "%s %s", STRNAME, VERSION ); - #endif -- TIFFSetField( ptex, TIFFTAG_SOFTWARE, ( uint32 ) version ); -+ TIFFSetField( ptex, TIFFTAG_SOFTWARE, version ); - TIFFSetField( ptex, TIFFTAG_IMAGEWIDTH, width ); - TIFFSetField( ptex, TIFFTAG_IMAGELENGTH, length ); - TIFFSetField( ptex, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG ); -@@ -2059,7 +2059,7 @@ void CqTextureMap::WriteImage( TIFF* pte - #else - sprintf( version, "%s %s", STRNAME, VERSION ); - #endif -- TIFFSetField( ptex, TIFFTAG_SOFTWARE, ( uint32 ) version ); -+ TIFFSetField( ptex, TIFFTAG_SOFTWARE, version ); - TIFFSetField( ptex, TIFFTAG_IMAGEWIDTH, width ); - TIFFSetField( ptex, TIFFTAG_IMAGELENGTH, length ); - TIFFSetField( ptex, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG ); diff --git a/graphics/aqsis/patches/patch-aq b/graphics/aqsis/patches/patch-aq deleted file mode 100644 index 1e2f0d42843..00000000000 --- a/graphics/aqsis/patches/patch-aq +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2008/09/01 08:02:23 dholland Exp $ - ---- libri2rib/ascii.cpp~ 2002-03-01 13:58:59.000000000 -0500 -+++ libri2rib/ascii.cpp 2008-09-01 03:45:14.000000000 -0400 -@@ -246,7 +246,8 @@ RtVoid CqASCII::RiObjectEnd( RtVoid ) - } - RtVoid CqASCII::RiObjectInstance( RtObjectHandle handle ) - { -- out << "ObjectInstance " << ( RtInt ) handle << endl; -+ //out << "ObjectInstance " << ( RtInt ) handle << endl; -+ out << "ObjectInstance " << ( intptr_t ) handle << endl; - } - RtVoid CqASCII::RiAttributeBegin( RtVoid ) - { -@@ -461,7 +462,8 @@ RtLightHandle CqASCII::RiAreaLightSource - RtVoid CqASCII::RiIlluminate( RtLightHandle light, RtBoolean onoff ) - { - out << "Illuminate "; -- out << ( RtInt ) light << " "; -+ //out << ( RtInt ) light << " "; -+ out << ( intptr_t ) light << " "; - if ( onoff == RI_TRUE ) - out << "1" << endl; - else diff --git a/graphics/aqsis/patches/patch-cmake_modules_FindPNG_cmake b/graphics/aqsis/patches/patch-cmake_modules_FindPNG_cmake new file mode 100644 index 00000000000..92db3b6156c --- /dev/null +++ b/graphics/aqsis/patches/patch-cmake_modules_FindPNG_cmake @@ -0,0 +1,15 @@ +$NetBSD: patch-cmake_modules_FindPNG_cmake,v 1.1 2012/04/30 01:59:14 dholland Exp $ + +Use the right library name for libpng. + +--- cmake/modules/FindPNG.cmake~ 2012-03-11 12:33:09.000000000 +0000 ++++ cmake/modules/FindPNG.cmake +@@ -27,7 +27,7 @@ IF(WIN32) + SET(AQSIS_PNG_LIBRARY_NAMES png) + endif() + ELSE(WIN32) +- SET(AQSIS_PNG_LIBRARY_NAMES png) ++ SET(AQSIS_PNG_LIBRARY_NAMES png15) + SET(AQSIS_PNG_LIBRARIES_DIR CACHE PATH "Semi-colon separated list of paths to search for the png libraries") + ENDIF(WIN32) + |