From 973043af891d84fb28bf035ffc5cbe1c6aed93bd Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 27 Mar 2007 17:08:00 +0000 Subject: [PATCH] - update to aqsis-1.2.0 --- graphics/aqsis/Makefile | 96 ++++++++++++------------ graphics/aqsis/distinfo | 9 ++- graphics/aqsis/pkg/PLIST | 157 ++++++++++++--------------------------- 3 files changed, 100 insertions(+), 162 deletions(-) diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index 80ef20b2d31..0225283f042 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -1,33 +1,18 @@ -# $OpenBSD: Makefile,v 1.3 2006/11/27 10:33:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2007/03/27 17:08:00 ajacoutot Exp $ + +SHARED_ONLY= Yes COMMENT= "photorealistic 3D rendering solution" -DISTNAME= aqsis-1.0.1 -PKGNAME= ${DISTNAME}p0 +V= 1.2.0 +DISTNAME= aqsis-${V} CATEGORIES= graphics -SHARED_LIBS += argparse 0.0 # 0.0 -SHARED_LIBS += aqsistypes 0.0 # 0.0 -SHARED_LIBS += codegenvm 0.0 # 0.0 -SHARED_LIBS += rib2 0.0 # 0.0 -SHARED_LIBS += rib2ri 0.0 # 0.0 -SHARED_LIBS += rib2stream 0.0 # 0.0 -SHARED_LIBS += slparse 0.0 # 0.0 -SHARED_LIBS += shadervm 0.0 # 0.0 -SHARED_LIBS += shaderexecenv 0.0 # 0.0 -SHARED_LIBS += raytrace 0.0 # 0.0 -SHARED_LIBS += slpp 0.0 # 0.0 -SHARED_LIBS += ri2rib 0.0 # 0.0 -SHARED_LIBS += slxargs 0.0 # 0.0 -SHARED_LIBS += display 0.0 # 0.0 -SHARED_LIBS += ddmanager 0.0 # 0.0 -SHARED_LIBS += aqsis 0.0 # 0.0 -SHARED_LIBS += gif2tif 0.0 # 0.0 -SHARED_LIBS += jpg2tif 0.0 # 0.0 -SHARED_LIBS += ppm2tif 0.0 # 0.0 -SHARED_LIBS += pcx2tif 0.0 # 0.0 -SHARED_LIBS += tga2tif 0.0 # 0.0 -SHARED_LIBS += bake2tif 0.0 # 0.0 +SHARED_LIBS+= aqsis 1.0 \ + aqsistypes 1.0 \ + ri2rib 1.0 \ + shadervm 1.0 \ + slxargs 1.0 HOMEPAGE= http://www.aqsis.org/ @@ -41,39 +26,50 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqsis/} -WANTLIB= X11 Xext c m stdc++ z +WANTLIB= c m stdc++ z BUILD_DEPENDS= ::textproc/libxslt \ - :boost-headers-1.33.*:devel/boost + :boost-headers-1.33.*:devel/boost \ + ::devel/scons \ + ::devel/bison LIB_DEPENDS= fltk.>=1::x11/fltk \ jpeg.>=62::graphics/jpeg \ - tiff.>=38::graphics/tiff + tiff.>=38::graphics/tiff \ + Half.>=3,Iex.>=3,IlmImf.>=3,Imath.>=3::graphics/openexr -USE_X11= Yes -USE_LIBTOOL= Yes -CONFIGURE_STYLE=gnu +NO_REGRESS= Yes -# This regression test wants an X11 display -# and manual closing of rendered images -REGRESS_IS_INTERACTIVE=Yes - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fPIC" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static +MAKE_ENV+= CC=${CC} CXX=${CXX} LDFLAGS="-L${X11BASE}/lib" VERSION_STR=1.2.0 pre-configure: - perl -pi -e 's,PLUGIN_FLAGS="-ldl",PLUGIN_FLAGS="",g' \ - ${WRKSRC}/configure - perl -pi -e 's,libdisplay.so,libdisplay.so.${LIBdisplay_VERSION},g' \ - ${WRKSRC}/display/displays.ini - perl -pi -e 's,!!LIBdisplay_VERSION!!,${LIBdisplay_VERSION},g' \ - ${WRKSRC}/display/Makefile.in - @find ${WRKSRC} -name Makefile.in | \ - xargs perl -pi -e 's,-I\$$\(top_srcdir\)/boost,,g' + perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \ + ${WRKSRC}/platform/default/SConscript + perl -pi -e 's,major.*$$,major = ${LIBaqsis_VERSION:R},g;' \ + -e 's,minor.*$$,minor = ${LIBaqsis_VERSION:E},g;' \ + ${WRKSRC}/version.py + perl -pi -e 's,VERSION_STR.*$$,VERSION_STR "${V}",g' \ + ${WRKSRC}/version.h.in -do-regress: - @cd ${WRKBUILD} && \ - ${MAKE_PROGRAM} ${REGRESS_FLAGS} -f ${MAKE_FILE} ${REGRESS_TARGET} +do-build: + @cd ${WRKSRC} && env -i ${MAKE_ENV} scons \ + tiff_include_path=${LOCALBASE}/include \ + tiff_lib_path=${LOCALBASE}/lib \ + jpeg_include_path=${LOCALBASE}/include \ + jpeg_lib_path=${LOCALBASE}/lib \ + fltk_include_path=${LOCALBASE}/include \ + fltk_lib_path=${LOCALBASE}/lib \ + exr_include_path=${LOCALBASE}/include/OpenEXR \ + exr_lib_path=${LOCALBASE}/include \ + bison=/usr/local/bin/bison \ + sysconfdir=${SYSCONFDIR} \ + destdir=${DESTDIR} \ + install_prefix='${PREFIX}' build + +do-install: + @cd ${WRKSRC} && env -i ${MAKE_ENV} scons + install_prefix='${PREFIX}' + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/aqsis + ${INSTALL_DATA} ${WRKSRC}/build/aqsisrc \ + ${PREFIX}/share/examples/aqsis/ .include diff --git a/graphics/aqsis/distinfo b/graphics/aqsis/distinfo index c314a5c8dc5..4cffadba9e7 100644 --- a/graphics/aqsis/distinfo +++ b/graphics/aqsis/distinfo @@ -1,4 +1,5 @@ -MD5 (aqsis-1.0.1.tar.gz) = 17e58818ab647f002c642c8abe591e35 -RMD160 (aqsis-1.0.1.tar.gz) = 860401b598eaed59a0fe1e044b66c13dbf58444a -SHA1 (aqsis-1.0.1.tar.gz) = ad66c5d7488e3bdde0e99a77ae07bd9fbe2e3341 -SIZE (aqsis-1.0.1.tar.gz) = 2788459 +MD5 (aqsis-1.2.0.tar.gz) = ae9bb1c4b22e396fd7ce84ee3e13cb86 +RMD160 (aqsis-1.2.0.tar.gz) = 73f73756585933d53f803d659bd98048770fc280 +SHA1 (aqsis-1.2.0.tar.gz) = 0c13e87698522130b3e0c6a06da1192c1a720a54 +SHA256 (aqsis-1.2.0.tar.gz) = 1c34522620dbedef1a1cd3fce73a409179addf4afc5d8da80b32e6e5fd2e6317 +SIZE (aqsis-1.2.0.tar.gz) = 1013399 diff --git a/graphics/aqsis/pkg/PLIST b/graphics/aqsis/pkg/PLIST index ab7f11d3b12..e281c080e69 100644 --- a/graphics/aqsis/pkg/PLIST +++ b/graphics/aqsis/pkg/PLIST @@ -1,24 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/19 14:29:22 ajacoutot Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.2 2007/03/27 17:08:00 ajacoutot Exp $ bin/aqsis bin/aqsl bin/aqsltell +bin/miqser bin/teqser include/aqsis/ include/aqsis/aqsis.h include/aqsis/aqsis_types.h -include/aqsis/argparse.h include/aqsis/bitvector.h include/aqsis/color.h include/aqsis/exception.h include/aqsis/file.h -include/aqsis/librib.h -include/aqsis/librib2ri.h -include/aqsis/librib2stream.h include/aqsis/list.h include/aqsis/matrix.h -include/aqsis/memorypool.h -include/aqsis/parserstate.h +include/aqsis/ndspy.h include/aqsis/random.h include/aqsis/refcount.h include/aqsis/ri.h @@ -30,133 +25,79 @@ include/aqsis/vector2d.h include/aqsis/vector3d.h include/aqsis/vector4d.h lib/aqsis/ -lib/aqsis/displays.ini -lib/aqsis/libbake2tif.a -lib/aqsis/libbake2tif.la -lib/aqsis/libdisplay.a -lib/aqsis/libdisplay.la -lib/aqsis/libgif2tif.a -lib/aqsis/libgif2tif.la -lib/aqsis/libjpg2tif.a -lib/aqsis/libjpg2tif.la -lib/aqsis/libpcx2tif.a -lib/aqsis/libpcx2tif.la -lib/aqsis/libppm2tif.a -lib/aqsis/libppm2tif.la -lib/aqsis/libtga2tif.a -lib/aqsis/libtga2tif.la -lib/libaqsis.a -lib/libaqsis.la -lib/libaqsistypes.a -lib/libaqsistypes.la -lib/libargparse.a -lib/libargparse.la -lib/libcodegenvm.a -lib/libcodegenvm.la -lib/libddmanager.a -lib/libddmanager.la -lib/libraytrace.a -lib/libraytrace.la -lib/libri2rib.a -lib/libri2rib.la -lib/librib2.a -lib/librib2.la -lib/librib2ri.a -lib/librib2ri.la -lib/librib2stream.a -lib/librib2stream.la -lib/libshaderexecenv.a -lib/libshaderexecenv.la -lib/libshadervm.a -lib/libshadervm.la -lib/libslparse.a -lib/libslparse.la -lib/libslpp.a -lib/libslpp.la -lib/libslxargs.a -lib/libslxargs.la -@man man/man1/aqsis.1 +lib/aqsis/libd_bmp.so +lib/aqsis/libd_exr.so +lib/aqsis/libd_xpm.so +lib/aqsis/libdisplay.so +lib/aqsis/plugins/ +lib/aqsis/plugins/libbake2tif.so +lib/aqsis/plugins/libbmp2tif.so +lib/aqsis/plugins/libdbo_plane.so +lib/aqsis/plugins/libexr2tif.so +lib/aqsis/plugins/libgif2tif.so +lib/aqsis/plugins/libjpg2tif.so +lib/aqsis/plugins/libpcx2tif.so +lib/aqsis/plugins/libpng2tif.so +lib/aqsis/plugins/libppm2tif.so +lib/aqsis/plugins/libtga2tif.so +@lib lib/libaqsis.so.${LIBaqsis_VERSION} +@lib lib/libaqsistypes.so.${LIBaqsistypes_VERSION} +@lib lib/libri2rib.so.${LIBri2rib_VERSION} +@lib lib/libshadervm.so.${LIBshadervm_VERSION} +@lib lib/libslxargs.so.${LIBslxargs_VERSION} share/aqsis/ +share/aqsis/content/ +share/aqsis/content/ribs/ +share/aqsis/content/ribs/features/ +share/aqsis/content/ribs/features/layeredshaders/ +share/aqsis/content/ribs/features/layeredshaders/grid.tif +share/aqsis/content/ribs/features/layeredshaders/layered.rib +share/aqsis/content/ribs/features/layeredshaders/render.bat +share/aqsis/content/ribs/features/layeredshaders/render.sh +share/aqsis/content/ribs/features/layeredshaders/texmap.sl +share/aqsis/content/ribs/scenes/ +share/aqsis/content/ribs/scenes/vase/ +share/aqsis/content/ribs/scenes/vase/render.bat +share/aqsis/content/ribs/scenes/vase/render.sh +share/aqsis/content/ribs/scenes/vase/vase.rib +share/aqsis/content/shaders/ +share/aqsis/content/shaders/displacement/ +share/aqsis/content/shaders/displacement/dented.sl +share/aqsis/content/shaders/displacement/dented.slx +share/aqsis/content/shaders/light/ +share/aqsis/content/shaders/light/shadowspot.sl +share/aqsis/content/shaders/light/shadowspot.slx +share/aqsis/scripts/ +share/aqsis/scripts/mpanalyse.py share/aqsis/shaders/ -share/aqsis/shaders/DPProctext.h share/aqsis/shaders/ambientlight.sl share/aqsis/shaders/ambientlight.slx share/aqsis/shaders/background.sl share/aqsis/shaders/background.slx -share/aqsis/shaders/bake.h -share/aqsis/shaders/bluescreen.sl -share/aqsis/shaders/bluescreen.slx -share/aqsis/shaders/borg_metal.sl -share/aqsis/shaders/borg_metal.slx -share/aqsis/shaders/brickbump.sl -share/aqsis/shaders/brickbump.slx share/aqsis/shaders/bumpy.sl share/aqsis/shaders/bumpy.slx -share/aqsis/shaders/cellnoisetest.sl -share/aqsis/shaders/cellnoisetest.slx share/aqsis/shaders/constant.sl share/aqsis/shaders/constant.slx -share/aqsis/shaders/curvetube.sl -share/aqsis/shaders/curvetube.slx -share/aqsis/shaders/debug.sl -share/aqsis/shaders/debug.slx -share/aqsis/shaders/dented.sl -share/aqsis/shaders/dented.slx share/aqsis/shaders/depthcue.sl share/aqsis/shaders/depthcue.slx share/aqsis/shaders/distantlight.sl share/aqsis/shaders/distantlight.slx -share/aqsis/shaders/dpbluemarble.sl -share/aqsis/shaders/dpbluemarble.slx -share/aqsis/shaders/expensive.sl -share/aqsis/shaders/expensive.slx -share/aqsis/shaders/exposure.sl -share/aqsis/shaders/exposure.slx -share/aqsis/shaders/face_plastic.sl -share/aqsis/shaders/face_plastic.slx -share/aqsis/shaders/fakesky.sl -share/aqsis/shaders/fakesky.slx share/aqsis/shaders/fog.sl share/aqsis/shaders/fog.slx -share/aqsis/shaders/gradient.sl -share/aqsis/shaders/gradient.slx -share/aqsis/shaders/iramp.sl -share/aqsis/shaders/iramp.slx share/aqsis/shaders/matte.sl share/aqsis/shaders/matte.slx share/aqsis/shaders/metal.sl share/aqsis/shaders/metal.slx -share/aqsis/shaders/noises.h share/aqsis/shaders/paintedplastic.sl share/aqsis/shaders/paintedplastic.slx -share/aqsis/shaders/patterns.h share/aqsis/shaders/plastic.sl share/aqsis/shaders/plastic.slx share/aqsis/shaders/pointlight.sl share/aqsis/shaders/pointlight.slx -share/aqsis/shaders/randgrid.sl -share/aqsis/shaders/randgrid.slx -share/aqsis/shaders/shadowdistant.sl -share/aqsis/shaders/shadowdistant.slx -share/aqsis/shaders/shadowpoint.sl -share/aqsis/shaders/shadowpoint.slx -share/aqsis/shaders/shadowspot.sl -share/aqsis/shaders/shadowspot.slx share/aqsis/shaders/shinymetal.sl share/aqsis/shaders/shinymetal.slx -share/aqsis/shaders/show_N.sl -share/aqsis/shaders/show_N.slx -share/aqsis/shaders/show_st.sl -share/aqsis/shaders/show_st.slx -share/aqsis/shaders/showuser.sl -share/aqsis/shaders/showuser.slx -share/aqsis/shaders/spacetest.sl -share/aqsis/shaders/spacetest.slx share/aqsis/shaders/spotlight.sl share/aqsis/shaders/spotlight.slx -share/aqsis/shaders/sticky_texture.sl -share/aqsis/shaders/sticky_texture.slx -share/aqsis/shaders/uvtest.sl -share/aqsis/shaders/uvtest.slx -share/aqsis/shaders/wavy.sl -share/aqsis/shaders/wavy.slx +share/examples/aqsis/ +share/examples/aqsis/aqsisrc +@sample ${SYSCONFDIR}/aqsisrc