pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2012Q1]: pkgsrc/graphics/aqsis Pullup ticket #3760 - requested...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe52e73fbd19
branches:  pkgsrc-2012Q1
changeset: 602067:fe52e73fbd19
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu May 03 17:54:53 2012 +0000

description:
Pullup ticket #3760 - requested by dholland
graphics/aqsis: build fix update

Revisions pulled up:
- graphics/aqsis/Makefile                                       1.37
- graphics/aqsis/PLIST                                          1.4
- graphics/aqsis/distinfo                                       1.8
- graphics/aqsis/options.mk                                     1.1-1.2
- graphics/aqsis/patches/patch-aa                               deleted
- graphics/aqsis/patches/patch-ab                               deleted
- graphics/aqsis/patches/patch-ac                               deleted
- graphics/aqsis/patches/patch-ad                               deleted
- graphics/aqsis/patches/patch-ae                               deleted
- graphics/aqsis/patches/patch-af                               deleted
- graphics/aqsis/patches/patch-ag                               deleted
- graphics/aqsis/patches/patch-ah                               deleted
- graphics/aqsis/patches/patch-ai                               deleted
- graphics/aqsis/patches/patch-aj                               deleted
- graphics/aqsis/patches/patch-ak                               deleted
- graphics/aqsis/patches/patch-al                               deleted
- graphics/aqsis/patches/patch-am                               deleted
- graphics/aqsis/patches/patch-an                               deleted
- graphics/aqsis/patches/patch-ao                               deleted
- graphics/aqsis/patches/patch-ap                               deleted
- graphics/aqsis/patches/patch-aq                               deleted
- graphics/aqsis/patches/patch-cmake_modules_FindPNG_cmake      1.1

---
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Mon Apr 30 01:59:14 UTC 2012

   Modified Files:
        pkgsrc/graphics/aqsis: Makefile PLIST distinfo
   Added Files:
        pkgsrc/graphics/aqsis: options.mk
        pkgsrc/graphics/aqsis/patches: patch-cmake_modules_FindPNG_cmake
   Removed Files:
        pkgsrc/graphics/aqsis/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak
            patch-al patch-am patch-an patch-ao patch-ap patch-aq

   Log Message:
   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.

---
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Mon Apr 30 02:54:29 UTC 2012

   Modified Files:
        pkgsrc/graphics/aqsis: options.mk

   Log Message:
   Switch the qt4 option on by default, as it turns out it works and (to
   my surprise) doesn't require PLIST additions. Ride the update as it was
   less than an hour ago.

diffstat:

 graphics/aqsis/Makefile                                  |  167 +++++++-
 graphics/aqsis/PLIST                                     |  322 ++++++++++----
 graphics/aqsis/distinfo                                  |   26 +-
 graphics/aqsis/options.mk                                |   15 +
 graphics/aqsis/patches/patch-aa                          |   21 -
 graphics/aqsis/patches/patch-ab                          |   16 -
 graphics/aqsis/patches/patch-ac                          |   16 -
 graphics/aqsis/patches/patch-ad                          |  257 -----------
 graphics/aqsis/patches/patch-ae                          |   10 -
 graphics/aqsis/patches/patch-af                          |   13 -
 graphics/aqsis/patches/patch-ag                          |   23 -
 graphics/aqsis/patches/patch-ah                          |   34 -
 graphics/aqsis/patches/patch-ai                          |   34 -
 graphics/aqsis/patches/patch-aj                          |  139 ------
 graphics/aqsis/patches/patch-ak                          |   13 -
 graphics/aqsis/patches/patch-al                          |  204 ---------
 graphics/aqsis/patches/patch-am                          |   13 -
 graphics/aqsis/patches/patch-an                          |   13 -
 graphics/aqsis/patches/patch-ao                          |   13 -
 graphics/aqsis/patches/patch-ap                          |   49 --
 graphics/aqsis/patches/patch-aq                          |   24 -
 graphics/aqsis/patches/patch-cmake_modules_FindPNG_cmake |   15 +
 22 files changed, 417 insertions(+), 1020 deletions(-)

diffs (truncated from 1545 to 300 lines):

diff -r 7fc6c3bcd314 -r fe52e73fbd19 graphics/aqsis/Makefile
--- a/graphics/aqsis/Makefile   Thu Apr 26 13:45:13 2012 +0000
+++ b/graphics/aqsis/Makefile   Thu May 03 17:54:53 2012 +0000
@@ -1,27 +1,170 @@
-# $NetBSD: Makefile,v 1.36 2012/02/06 12:40:16 wiz Exp $
+# $NetBSD: Makefile,v 1.36.2.1 2012/05/03 17:54:53 tron 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@localhost
 HOMEPAGE=              http://www.aqsis.org/
 COMMENT=               Renderman clone
-LICENSE=               gnu-gpl-v1
+LICENSE=               gnu-gpl-v2 AND gnu-lgpl-v2.1 AND modified-bsd
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+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
 
-MAKE_JOBS_SAFE=                no
+#
+# 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
 
-GNU_CONFIGURE=         yes
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake lex
+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
 
-GCC_REQD+=             2.95.3
-USE_LANGUAGES=         c c++
+# 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
 
-.include "../../devel/libargparse/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
+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/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 -r 7fc6c3bcd314 -r fe52e73fbd19 graphics/aqsis/PLIST
--- a/graphics/aqsis/PLIST      Thu Apr 26 13:45:13 2012 +0000
+++ b/graphics/aqsis/PLIST      Thu May 03 17:54:53 2012 +0000
@@ -1,99 +1,231 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:59:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3.24.1 2012/05/03 17:54:53 tron 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



Home | Main Index | Thread Index | Old Index