Date: Wed, 30 Oct 2013 01:31:21 +0100 From: nemysis <nemysis@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: gahr@FreeBSD.org Subject: ports/183459: [PATCH] graphics/aqsis: Fix build with OpenEXR 2.0.1 [exp-run] Message-ID: <201310300031.r9U0VLXQ020436@freefall.freebsd.org> Resent-Message-ID: <201310300040.r9U0e01C020606@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183459 >Category: ports >Synopsis: [PATCH] graphics/aqsis: Fix build with OpenEXR 2.0.1 [exp-run] >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 30 00:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.2-RELEASE-p8 amd64 >Organization: >Environment: System: FreeBSD nemysis4now 9.2-RELEASE-p8 FreeBSD 9.2-RELEASE-p8 #0: Mon Sep 23 16:26:45 UTC 2013 >Description: - Bump PORTREVISION for dependency change - Remove leading article from COMMENT - Add dependency for textproc/flex - Use the new format for LIB_DEPENDS - Add USES shared-mime-info - Support STAGEDIR - Add DOCS and EXAMPLES and Options - Add patch, fix build with OpenEXR 2.0.1 - Change pkg-plist, remove mtree and EXAMPLES Port maintainer (gahr@FreeBSD.org) is cc'd. Generated and tested manually, tested with stage and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) >How-To-Repeat: Build log https://redports.org/buildarchive/20131029225301-11987/ Fix failed build with OpenEXR-2.0.1 (ports/183345: [exp-run]) http://package20.nyi.freebsd.org/bulk/91amd64-default-pr_183345/2013-10-27_13h45m19s/logs/errors/aqsis-1.8.2_2.log Upstream add later patch files/patch-libs__tex__io__exrinputfile.h and release new Version https://github.com/aqsis/aqsis/issues/3 >Fix: --- aqsis-1.8.2_3.patch begins here --- diff -ruN /usr/ports/graphics/aqsis/Makefile ./Makefile --- /usr/ports/graphics/aqsis/Makefile 2013-09-20 20:53:20.000000000 +0200 +++ ./Makefile 2013-10-29 23:50:13.000000000 +0100 @@ -3,31 +3,51 @@ PORTNAME= aqsis PORTVERSION= 1.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} MAINTAINER= gahr@FreeBSD.org -COMMENT= A photorealistic rendering system +COMMENT= Photorealistic rendering system LICENSE= BSD GPLv2 LICENSE_COMB= multi BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ - xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ - boost_filesystem:${PORTSDIR}/devel/boost-libs \ - tiff.4:${PORTSDIR}/graphics/tiff \ - fltk.1:${PORTSDIR}/x11-toolkits/fltk + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libfltk.so:${PORTSDIR}/x11-toolkits/fltk LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -USES= cmake:outsource +USES= cmake:outsource shared-mime-info USE_QT4= opengl qmake_build moc_build rcc_build uic_build PLIST_SUB+= LIBVERS=${PORTVERSION:R} INSTALLS_ICONS= yes -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXAMPLES + +PORTDOCS= AUTHORS README +PORTEXAMPLES= * + +.include <bsd.port.options.mk> + +post-patch: + @${REINPLACE_CMD} -e 's|examples_install_dir $${EXAMPLESDIR}|examples_install_dir ${PREFIX}/share/examples/${PORTNAME}|' \ + ${WRKSRC}/examples/CMakeLists.txt + +.if ! ${PORT_OPTIONS:MEXAMPLES} + @${REINPLACE_CMD} -i '' -e '/add_subdirectory(examples)/d' \ + ${WRKSRC}/CMakeLists.txt +.endif + +post-install: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + .include <bsd.port.mk> diff -ruN /usr/ports/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt ./files/patch-libs-utils_CMakeLists.txt --- /usr/ports/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt 2013-09-13 02:57:01.000000000 +0200 +++ ./files/patch-libs-utils_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- libs/util/CMakeLists.txt.orig 2009-12-31 13:34:07.000000000 +0100 -+++ libs/util/CMakeLists.txt 2009-12-31 13:34:12.000000000 +0100 -@@ -33,7 +33,7 @@ - - set(linklibs ${Boost_FILESYSTEM_LIBRARY}) - if(UNIX) -- list(APPEND linklibs dl) -+ list(APPEND linklibs) - elseif(WIN32) - list(APPEND linklibs ws2_32) - endif() diff -ruN /usr/ports/graphics/aqsis/files/patch-libs__tex__io__exrinputfile.h ./files/patch-libs__tex__io__exrinputfile.h --- /usr/ports/graphics/aqsis/files/patch-libs__tex__io__exrinputfile.h 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-libs__tex__io__exrinputfile.h 2013-10-29 13:16:24.000000000 +0100 @@ -0,0 +1,18 @@ +--- ./libs/tex/io/exrinputfile.h.orig 2012-08-24 14:26:50.000000000 +0200 ++++ ./libs/tex/io/exrinputfile.h 2013-10-29 13:16:03.000000000 +0100 +@@ -48,10 +48,12 @@ + + #include <aqsis/tex/io/itexinputfile.h> + ++#include <OpenEXR/ImfInputFile.h> ++ + //------------------------------------------------------------------------------ +-namespace Imf { +- class InputFile; +-} ++//namespace Imf { ++// class InputFile; ++//} + + namespace Aqsis { + diff -ruN /usr/ports/graphics/aqsis/files/patch-libs__util__CMakeLists.txt ./files/patch-libs__util__CMakeLists.txt --- /usr/ports/graphics/aqsis/files/patch-libs__util__CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-libs__util__CMakeLists.txt 2013-10-29 13:16:24.000000000 +0100 @@ -0,0 +1,11 @@ +--- ./libs/util/CMakeLists.txt.orig 2012-08-24 14:26:50.000000000 +0200 ++++ ./libs/util/CMakeLists.txt 2013-10-29 13:12:48.000000000 +0100 +@@ -37,7 +37,7 @@ + + set(linklibs ${Boost_FILESYSTEM_LIBRARY}) + if(UNIX) +- list(APPEND linklibs dl) ++ list(APPEND linklibs) + elseif(WIN32) + list(APPEND linklibs ws2_32) + endif() diff -ruN /usr/ports/graphics/aqsis/pkg-plist ./pkg-plist --- /usr/ports/graphics/aqsis/pkg-plist 2013-10-23 02:34:31.000000000 +0200 +++ ./pkg-plist 2013-10-29 13:53:31.000000000 +0100 @@ -59,73 +59,6 @@ share/applications/aqsltell.desktop share/applications/eqsl.desktop share/applications/piqsl.desktop -%%DATADIR%%/examples/features/archives/bike.rib -%%DATADIR%%/examples/features/archives/bikeData.rib.gz -%%DATADIR%%/examples/features/archives/render.sh -%%DATADIR%%/examples/features/bake/bakesphere.rib -%%DATADIR%%/examples/features/bake/render.sh -%%DATADIR%%/examples/features/bake/sphere.rib -%%DATADIR%%/examples/features/curves/bezier.rib -%%DATADIR%%/examples/features/curves/render.sh -%%DATADIR%%/examples/features/layeredshaders/grid.tif -%%DATADIR%%/examples/features/layeredshaders/layered.rib -%%DATADIR%%/examples/features/layeredshaders/render.sh -%%DATADIR%%/examples/features/layeredshaders/texmap.sl -%%DATADIR%%/examples/features/levelofdetail/detail.rib -%%DATADIR%%/examples/features/levelofdetail/render.sh -%%DATADIR%%/examples/features/motionblur/camera.rib -%%DATADIR%%/examples/features/motionblur/deformation.rib -%%DATADIR%%/examples/features/motionblur/render_camera.sh -%%DATADIR%%/examples/features/motionblur/render_deformation.sh -%%DATADIR%%/examples/features/multipass/aov.rib -%%DATADIR%%/examples/features/multipass/myval.sl -%%DATADIR%%/examples/features/multipass/render.sh -%%DATADIR%%/examples/features/objectinstance/render.sh -%%DATADIR%%/examples/features/objectinstance/singlepolygon.rib -%%DATADIR%%/examples/features/occlusion/envlight.sl -%%DATADIR%%/examples/features/occlusion/occlmap.py -%%DATADIR%%/examples/features/occlusion/occlmap.rib -%%DATADIR%%/examples/features/occlusion/render.sh -%%DATADIR%%/examples/features/occlusion/simple.rib -%%DATADIR%%/examples/features/occlusion/world.rib -%%DATADIR%%/examples/features/shadows/autoshadow.rib -%%DATADIR%%/examples/features/shadows/render_autoshadow.sh -%%DATADIR%%/examples/features/shadows/render_softshadow.sh -%%DATADIR%%/examples/features/shadows/softshadow.rib -%%DATADIR%%/examples/features/solidmodeling/csg.rib -%%DATADIR%%/examples/features/solidmodeling/render.sh -%%DATADIR%%/examples/features/subdivision/creases.rib -%%DATADIR%%/examples/features/subdivision/render.sh -%%DATADIR%%/examples/features/textures/grid.tif -%%DATADIR%%/examples/features/textures/render.sh -%%DATADIR%%/examples/features/textures/sticky.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/all_passes.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/ao.sl -%%DATADIR%%/examples/point_based_gi/cornellbox/bake_pass.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/bake_points.sl -%%DATADIR%%/examples/point_based_gi/cornellbox/beauty_pass.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/beauty_pass_ao.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/beautycam.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/geometry.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/indirect.sl -%%DATADIR%%/examples/point_based_gi/cornellbox/lights.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/shadow_pass.rib -%%DATADIR%%/examples/procedurals/menger/README.txt -%%DATADIR%%/examples/procedurals/menger/menger.cpp -%%DATADIR%%/examples/procedurals/menger/menger.rib -%%DATADIR%%/examples/procedurals/menger/render.sh -%%DATADIR%%/examples/scenes/fisheye/README.txt -%%DATADIR%%/examples/scenes/fisheye/envmap.rib -%%DATADIR%%/examples/scenes/fisheye/fisheye.rib -%%DATADIR%%/examples/scenes/fisheye/fisheye_projection.sl -%%DATADIR%%/examples/scenes/fisheye/lights.rib -%%DATADIR%%/examples/scenes/fisheye/render.sh -%%DATADIR%%/examples/scenes/fisheye/scene.rib -%%DATADIR%%/examples/scenes/fisheye/world.rib -%%DATADIR%%/examples/scenes/microbe/microbe.rib -%%DATADIR%%/examples/scenes/microbe/render.sh -%%DATADIR%%/examples/scenes/vase/render.sh -%%DATADIR%%/examples/scenes/vase/vase.rib %%DATADIR%%/plugins/houdini/README.txt %%DATADIR%%/plugins/houdini/RIBtargets %%DATADIR%%/plugins/houdini/hshaders.otl @@ -246,37 +179,8 @@ @dirrm %%DATADIR%%/plugins/houdini/scripts @dirrm %%DATADIR%%/plugins/houdini @dirrm %%DATADIR%%/plugins -@dirrm %%DATADIR%%/examples/scenes/vase -@dirrm %%DATADIR%%/examples/scenes/microbe -@dirrm %%DATADIR%%/examples/scenes/fisheye -@dirrm %%DATADIR%%/examples/scenes -@dirrm %%DATADIR%%/examples/procedurals/menger -@dirrm %%DATADIR%%/examples/procedurals -@dirrm %%DATADIR%%/examples/point_based_gi/cornellbox -@dirrm %%DATADIR%%/examples/point_based_gi -@dirrm %%DATADIR%%/examples/features/textures -@dirrm %%DATADIR%%/examples/features/subdivision -@dirrm %%DATADIR%%/examples/features/solidmodeling -@dirrm %%DATADIR%%/examples/features/shadows -@dirrm %%DATADIR%%/examples/features/occlusion -@dirrm %%DATADIR%%/examples/features/objectinstance -@dirrm %%DATADIR%%/examples/features/multipass -@dirrm %%DATADIR%%/examples/features/motionblur -@dirrm %%DATADIR%%/examples/features/levelofdetail -@dirrm %%DATADIR%%/examples/features/layeredshaders -@dirrm %%DATADIR%%/examples/features/curves -@dirrm %%DATADIR%%/examples/features/bake -@dirrm %%DATADIR%%/examples/features/archives -@dirrm %%DATADIR%%/examples/features -@dirrm %%DATADIR%%/examples @dirrm %%DATADIR%% @dirrm lib/aqsis @dirrm include/aqsis/ri @dirrm include/aqsis @dirrm etc/aqsis -@dirrmtry share/icons/hicolor/192x192/mimetypes -@dirrmtry share/icons/hicolor/192x192 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons -@dirrmtry share/mime/packages -@dirrmtry share/mime --- aqsis-1.8.2_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310300031.r9U0VLXQ020436>