Date: Wed, 30 Oct 2013 11:34:39 +0100 From: Pietro Cerutti <gahr@FreeBSD.org> To: freebsd-ports-bugs@FreeBSD.org Cc: nemysis@FreeBSD.org Subject: Re: ports/183459: [PATCH] graphics/aqsis: Fix build with OpenEXR 2.0.1 [exp-run] Message-ID: <20131030103439.GX29559@gahrfit.gahr.ch> In-Reply-To: <201310300040.r9U0e8is022261@freefall.freebsd.org> References: <201310300040.r9U0e8is022261@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--l21Zc9uzwusa2dXo
Content-Type: multipart/mixed; boundary="1kVeyRzorzGcO9ta"
Content-Disposition: inline
--1kVeyRzorzGcO9ta
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Nemysis,
thanks for your patch. I have a few modifications to it, in particular:
- I don't like your change of naming convention in ${PATCHDIR}. Double
underscores are unneeded and ugly.
- FLTK is not needed. It's only used in a prototype that is not included
in the build process (yet).
- I don't think installing AUTHORS and README is of much use.
Moreover, can you please elaborate on using shared-mime-info? I'm not
familiar with that, and I've got this warnings on port test:
=3D=3D=3D> Extra files and directories check
share/mime/subclasses
share/mime/globs
share/mime/globs2
share/mime/magic
share/mime/XMLnamespaces
share/mime/aliases
share/mime/types
share/mime/generic-icons
share/mime/icons
share/mime/treemagic
share/mime/mime.cache
share/mime/version
Is this going to be a problem?
A new diff is attached.
--=20
Pietro Cerutti
The FreeBSD Project
gahr@FreeBSD.org
PGP Public Key:
http://gahr.ch/pgp
--1kVeyRzorzGcO9ta
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="aqsis.diff"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile (revision 332086)
+++ Makefile (working copy)
@@ -3,12 +3,12 @@
=20
PORTNAME=3D aqsis
PORTVERSION=3D 1.8.2
-PORTREVISION=3D 2
+PORTREVISION=3D 3
CATEGORIES=3D graphics
MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
=20
MAINTAINER=3D gahr@FreeBSD.org
-COMMENT=3D A photorealistic rendering system
+COMMENT=3D Photorealistic rendering system
=20
LICENSE=3D BSD GPLv2
LICENSE_COMB=3D multi
@@ -15,19 +15,32 @@
=20
BUILD_DEPENDS=3D bison:${PORTSDIR}/devel/bison \
xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=3D IlmImf:${PORTSDIR}/graphics/OpenEXR \
- boost_filesystem:${PORTSDIR}/devel/boost-libs \
- tiff.4:${PORTSDIR}/graphics/tiff \
- fltk.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=3D libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
+ libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
+ libtiff.so:${PORTSDIR}/graphics/tiff
=20
LDFLAGS+=3D -L${LOCALBASE}/lib
=20
USE_LDCONFIG=3D yes
-USES=3D cmake:outsource
+USES=3D cmake:outsource desktop-file-utils shared-mime-info
USE_QT4=3D opengl qmake_build moc_build rcc_build uic_build
PLIST_SUB+=3D LIBVERS=3D${PORTVERSION:R}
=20
INSTALLS_ICONS=3D yes
=20
-NO_STAGE=3D yes
+OPTIONS_DEFINE=3D EXAMPLES
+
+PORTEXAMPLES=3D *
+
+.include <bsd.port.options.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|examples_install_dir $${EXAMPLESDIR}|examples_ins=
tall_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
+
.include <bsd.port.mk>
Index: files/patch-libs-tex-io_exrinputfile.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-libs-tex-io_exrinputfile.h (revision 0)
+++ files/patch-libs-tex-io_exrinputfile.h (working copy)
@@ -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 @@
+=20
+ #include <aqsis/tex/io/itexinputfile.h>
+=20
++#include <OpenEXR/ImfInputFile.h>
++
+ //-----------------------------------------------------------------------=
-------
+-namespace Imf {
+- class InputFile;
+-}
++//namespace Imf {
++// class InputFile;
++//}
+=20
+ namespace Aqsis {
+=20
Property changes on: files/patch-libs-tex-io_exrinputfile.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-libs-utils_CMakeLists.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-libs-utils_CMakeLists.txt (revision 332086)
+++ files/patch-libs-utils_CMakeLists.txt (working copy)
@@ -1,6 +1,6 @@
---- 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 @@
+--- ./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 @@
=20
set(linklibs ${Boost_FILESYSTEM_LIBRARY})
if(UNIX)
Index: pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pkg-plist (revision 332086)
+++ pkg-plist (working copy)
@@ -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
--1kVeyRzorzGcO9ta--
--l21Zc9uzwusa2dXo
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)
iQJ8BAEBCgBmBQJScOC7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQTZERTEwNkE1Qjg1NEI4NUREODZENDlB
REQwRDM4RUExOTIwODlFAAoJEK3Q046hkgiexX8P/A3THVJW+bzG1TjO33Xk8ORd
BFRL+BIpNjNMygop54sYxe23HrrwJE00ZozhhlEgZg+j2/Xgj+Q0lQojHsy+jNIn
huGUtLKG33ejzdEayrXZ4Q49JABwehmgL/ym6sklYN/TC2QYWdJ69twgOMRUqbtK
kIpziKJnnvfT/OwaociHCVrLOvRNV09H8L0rV01UxbSYYEXLVM6uqEhKRZQklQY1
G67mhOAo0Qh1w5kIxFi4v64I16kR71cjcU1qC66HTiJdwtK3fWQxj6fJZGTDl3F8
7lXrp6w5s7Wb4vnjUYJG0vsECxQzXrghZKCh9qcKcxlA1vxOWN1YZ5wjxGPlbWDQ
cFn9KeMCND7CWs5629LcGcIZfFKF7lWxS0pFQiXTHdBuAdoIRTRzdI1gJDQH0aQo
I8CqWwfgi5cdVrUtG0VVrXMw9CfrR+OFMUe0YkWglWj4RQWoD331cQZQ/etodvXX
WGwlt1EXfMDWf/LKbDuzV9hnOWoNuTVdKPM4c+5w79d3m4rct9A/Hrjlj9VpxrwH
JPsvumtSreaugXRyUjRtZEwU78Fp5h35wgGdjT2qzL/FD9i3pWuu9+mk55JIq/RN
mH1ldzqQHmeOGA+Wd3O8d35b9PWUtcTRzhh+C0hF7eGbZFIfZ9lOzL6sTh/aaFjk
wCgfy3nMpN1UklmyEf3R
=90bi
-----END PGP SIGNATURE-----
--l21Zc9uzwusa2dXo--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131030103439.GX29559>