Index: head/graphics/luxrender/Makefile =================================================================== --- head/graphics/luxrender/Makefile (revision 394656) +++ head/graphics/luxrender/Makefile (revision 394657) @@ -1,66 +1,67 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= luxrender -PORTVERSION= 1.3.1 -PORTREVISION= 4 +DISTVERSION= 1.4 CATEGORIES= graphics -MASTER_SITES= http://src.luxrender.net/lux/get/ \ - http://src.luxrender.net/luxrays/get/:lr -DISTFILES= v${PORTVERSION:S/.//g}${EXTRACT_SUFX} \ - luxrender_v${PORTVERSION}${EXTRACT_SUFX}:lr +MASTER_SITES= https://bitbucket.org/luxrender/lux/get/ \ + https://bitbucket.org/luxrender/luxrays/get/:lr +DISTFILES= v${DISTVERSION:C/[.-]//g}${EXTRACT_SUFX} \ + ${PORTNAME}_v${DISTVERSION:S/-//}${EXTRACT_SUFX}:lr DIST_SUBDIR= ${PORTNAME} MAINTAINER= danfe@FreeBSD.org COMMENT= Physically based and unbiased rendering system LICENSE= GPLv3 LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfreeimage.so:${PORTSDIR}/graphics/freeimage \ - libpng.so:${PORTSDIR}/graphics/png \ - libIlmImf.so:${PORTSDIR}/graphics/OpenEXR -.if !exists(/usr/include/execinfo.h) -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.endif + libOpenImageIO.so:${PORTSDIR}/graphics/openimageio ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE extensions -USES= bison cmake tar:bzip2 +USES= bison cmake execinfo python:version tar:bzip2 USE_GL= glut glew WRKSRC= ${WRKDIR}/luxrender-lux-${LUX_REV} LUXRAYS_WRKSRC= ${WRKDIR}/luxrender-luxrays-${LUXRAYS_REV} -CMAKE_ARGS= -DLUXRAYS_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ +CMAKE_ARGS= -DLUXCORE_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ + -DLUXCORE_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxcore.a" \ + -DLUXRAYS_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ -DLUXRAYS_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxrays.a" \ -DSLG_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ -DSLG_LIBRARY:PATH="${LUXRAYS_WRKSRC}/lib/libsmallluxgpu.a" \ -DLUXRAYS_DISABLE_OPENCL:BOOL=ON -LUX_REV= d0b0e20c47cc -LUXRAYS_REV= 7459cd8a9583 +LUX_REV= dfd211d6faa0 +LUXRAYS_REV= 7c7127ee1fa4 OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 -X11_DESC= Build GUI executable (Qt4-based) +X11_DESC= Build GUI executable (requires Qt 4) X11_USE= QT4=moc_build,qmake_build,rcc_build,uic_build,corelib,gui X11_PLIST_FILES= bin/luxrender post-patch: @${REINPLACE_CMD} -e 's/__APPLE__/__FreeBSD__/' \ ${LUXRAYS_WRKSRC}/samples/smallluxgpu4/smallluxgpu.h \ ${WRKSRC}/core/osfunc.h \ ${WRKSRC}/shapes/mikktspace/weldmesh.c @${REINPLACE_CMD} -e '/^set(Boost_USE_STATIC_LIBS/s,ON,OFF,' \ ${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake +# Avoid picking up Python 3.x bits if they're installed + @${REINPLACE_CMD} -e 's,PythonLibs,& ${PYTHON_VER} EXACT REQUIRED,' \ + ${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake \ + ${WRKSRC}/cmake/pylux.cmake pre-configure: cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ ${CMAKE_ARGS} . ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} -C ${LUXRAYS_WRKSRC} .include Index: head/graphics/luxrender/distinfo =================================================================== --- head/graphics/luxrender/distinfo (revision 394656) +++ head/graphics/luxrender/distinfo (revision 394657) @@ -1,4 +1,4 @@ -SHA256 (luxrender/v131.tar.bz2) = b38fb83e0e9a8bc09587ac78de688f9a79fbbe9e2e20ff5822bc72a24bb230fd -SIZE (luxrender/v131.tar.bz2) = 2541070 -SHA256 (luxrender/luxrender_v1.3.1.tar.bz2) = bae72176f33e4c307cba3f03c332024b6c46ea5d88251e14f5c748a6b0626bc5 -SIZE (luxrender/luxrender_v1.3.1.tar.bz2) = 44433304 +SHA256 (luxrender/v14.tar.bz2) = 87389167496037e22cbf420efd610474d6a02395c4f4e4a39e2bd50453676b0b +SIZE (luxrender/v14.tar.bz2) = 2642639 +SHA256 (luxrender/luxrender_v1.4.tar.bz2) = 8229a814807fed2810eefd4a5ba051e7b05a4b30862ee066a3c205d6bd730205 +SIZE (luxrender/luxrender_v1.4.tar.bz2) = 26682611 Index: head/graphics/luxrender/files/patch-luxrays-samples-slglibdemo-CMakeLists.txt =================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-slglibdemo-CMakeLists.txt (revision 394656) +++ head/graphics/luxrender/files/patch-luxrays-samples-slglibdemo-CMakeLists.txt (nonexistent) @@ -1,16 +0,0 @@ ---- ../luxrender-luxrays-7459cd8a9583/samples/slglibdemo/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7459cd8a9583/samples/slglibdemo/CMakeLists.txt -@@ -25,10 +25,12 @@ - # - ############################################################################# - -+find_package(Threads) -+ - set(SLGLIBDEMO_SRCS - slglibdemo.cpp - ) - - add_executable(slg4libdemo ${SLGLIBDEMO_SRCS}) - --TARGET_LINK_LIBRARIES(slg4libdemo smallluxgpu luxrays) -+TARGET_LINK_LIBRARIES(slg4libdemo smallluxgpu luxrays ${CMAKE_THREAD_LIBS_INIT}) Property changes on: head/graphics/luxrender/files/patch-luxrays-samples-slglibdemo-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/luxrender/files/patch-CMakeLists.txt =================================================================== --- head/graphics/luxrender/files/patch-CMakeLists.txt (revision 394656) +++ head/graphics/luxrender/files/patch-CMakeLists.txt (revision 394657) @@ -1,20 +1,11 @@ --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -179,7 +179,7 @@ IF(NOT APPLE AND NOT WIN32) - STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE}) - IF (_mach_x86_64) - SET(ARCH_X86_64 1) -- SET(LIB_SUFFIX 64) -+ #SET(LIB_SUFFIX 64) - #jromang - Hack to avoid boost bug on x64 Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433) - ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T) - ENDIF (_mach_x86_64) @@ -298,7 +298,7 @@ ELSEIF(MSVC) ELSE(APPLE) # Dade - default compiler options # Removed "-O3" from definitions in order to have CMake Release/Debug options to work - ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H) + ADD_DEFINITIONS(-msse -Wall -fPIC -DHAVE_PTHREAD_H) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=hidden -fvisibility-inlines-hidden") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden") # The QBVH accelerator needs to be compiled with much reduced optimizations Index: head/graphics/luxrender/files/patch-gcc42-fixes =================================================================== --- head/graphics/luxrender/files/patch-gcc42-fixes (revision 394656) +++ head/graphics/luxrender/files/patch-gcc42-fixes (revision 394657) @@ -1,378 +1,394 @@ +--- ../luxrender-luxrays-7c7127ee1fa4/include/luxrays/core/geometry/frame.h.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/include/luxrays/core/geometry/frame.h +@@ -46,11 +46,11 @@ public: + SetFromZ(z); + } + +- Frame(const Normal &z) { ++ Frame(const luxrays::Normal &z) { + SetFromZ(Vector(z)); + } + +- void SetFromZ(const Normal &z) { ++ void SetFromZ(const luxrays::Normal &z) { + SetFromZ(Vector(z)); + } + --- textures/bilerp.h.orig +++ textures/bilerp.h @@ -39,7 +39,7 @@ public: // BilerpTexture Public Methods BilerpFloatTexture(TextureMapping2D *m, float t00, float t01, float t10, float t11) : - Texture("BilerpFloatTexture-" + boost::lexical_cast(this)) { + lux::Texture::Texture("BilerpFloatTexture-" + boost::lexical_cast(this)) { mapping = m; v00 = t00; v01 = t01; @@ -87,7 +87,7 @@ public: BilerpSpectrumTexture(TextureMapping2D *m, const RGBColor &t00, const RGBColor &t01, const RGBColor &t10, const RGBColor &t11) : - Texture("BilerpSpectrumTexture-" + boost::lexical_cast(this)) { + lux::Texture::Texture("BilerpSpectrumTexture-" + boost::lexical_cast(this)) { mapping = m; v00 = t00; v01 = t01; @@ -145,7 +145,7 @@ public: const boost::shared_ptr > &t01, const boost::shared_ptr > &t10, const boost::shared_ptr > &t11) : - Texture("BilerpFresnelTexture-" + boost::lexical_cast(this)) { + lux::Texture::Texture("BilerpFresnelTexture-" + boost::lexical_cast(this)) { mapping = m; v00 = t00; v01 = t01; --- textures/blackbody.h.orig +++ textures/blackbody.h @@ -34,7 +34,7 @@ namespace lux class BlackBodyTexture : public Texture { public: // BlackBodyTexture Public Methods - BlackBodyTexture(float t) : Texture("BlackBodyTexture-" + boost::lexical_cast(this)), + BlackBodyTexture(float t) : lux::Texture::Texture("BlackBodyTexture-" + boost::lexical_cast(this)), BBSPD(t) { } virtual ~BlackBodyTexture() { } virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, --- textures/blender_base.h.orig +++ textures/blender_base.h @@ -34,7 +34,7 @@ public: virtual ~BlenderTexture3D() { } BlenderTexture3D(const std::string &name, const Transform &tex2world, const ParamSet &tp, - short type) : Texture(name) { + short type) : lux::Texture::Texture(name) { // Read mapping coordinates mapping = TextureMapping3D::Create(tex2world, tp); tex1 = tp.GetFloatTexture("tex1", 0.f); --- textures/cauchytexture.h.orig +++ textures/cauchytexture.h @@ -35,7 +35,7 @@ class CauchyTexture : public Texture(this)), + lux::Texture::Texture("CauchyTexture-" + boost::lexical_cast(this)), fresnel(cauchya, cauchyb, 0.f), index(cauchya + cauchyb * 1e6f / (WAVELENGTH_END * WAVELENGTH_START)) { } virtual ~CauchyTexture() { } --- textures/checkerboard.h.orig +++ textures/checkerboard.h @@ -42,7 +42,7 @@ public: Checkerboard2D(TextureMapping2D *m, boost::shared_ptr > &c1, boost::shared_ptr > &c2, const string &aa) : - Texture("Checkerboard2D-" + boost::lexical_cast(this)), + lux::Texture::Texture("Checkerboard2D-" + boost::lexical_cast(this)), tex1(c1), tex2(c2), mapping(m) { // Select anti-aliasing method for _Checkerboard2D_ if (aa == "none") @@ -226,7 +226,7 @@ public: Checkerboard3D(TextureMapping3D *m, boost::shared_ptr > &c1, boost::shared_ptr > &c2) : - Texture("Checkerboard3D-" + boost::lexical_cast(this)), + lux::Texture::Texture("Checkerboard3D-" + boost::lexical_cast(this)), tex1(c1), tex2(c2), mapping(m) { } virtual ~Checkerboard3D() { delete mapping; } virtual float Evaluate(const SpectrumWavelengths &sw, --- textures/cloud.h.orig +++ textures/cloud.h @@ -47,7 +47,7 @@ public: const u_int octaves, const float o, const float offset, const u_int numspheres, const float spheresize, TextureMapping3D *map) : - Texture("CloudTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("CloudTexture-" + boost::lexical_cast(this)), radius(r), numSpheres(numspheres), sphereSize(spheresize), sharpness(sharp), baseFlatness(baseflatness), variability(v), omega(o), firstNoiseScale(noiseScale), noiseOffset(offset), --- textures/colordepth.h.orig +++ textures/colordepth.h @@ -34,7 +34,7 @@ class ColorDepthTexture : public Texture public: // ColorDepthTexture Public Methods ColorDepthTexture(float t, boost::shared_ptr > &c) : - Texture("ColorDepthTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("ColorDepthTexture-" + boost::lexical_cast(this)), d(-max(1e-3f, t)), color(c) { } virtual ~ColorDepthTexture() { } virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, --- textures/constant.h.orig +++ textures/constant.h @@ -36,7 +36,7 @@ class ConstantFloatTexture : public Text public: // ConstantTexture Public Methods ConstantFloatTexture(float v) : - Texture("ConstantFloatTexture-" + boost::lexical_cast(this)), value(v) { + lux::Texture::Texture("ConstantFloatTexture-" + boost::lexical_cast(this)), value(v) { AddFloatAttribute(*this, "value", "ConstantFloatTexture value", &ConstantFloatTexture::value); } virtual ~ConstantFloatTexture() { } @@ -60,7 +60,7 @@ class ConstantRGBColorTexture : public T public: // ConstantTexture Public Methods ConstantRGBColorTexture(const RGBColor &s) : - Texture("ConstantRGBColorTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("ConstantRGBColorTexture-" + boost::lexical_cast(this)), color(s) { RGBSPD = new RGBReflSPD(color); @@ -99,7 +99,7 @@ class ConstantFresnelTexture : public Te public: // ConstantTexture Public Methods ConstantFresnelTexture(float v) : - Texture("ConstantFresnelTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("ConstantFresnelTexture-" + boost::lexical_cast(this)), value(DIELECTRIC_FRESNEL, SWCSpectrum(v), 0.f), val(v) { AddFloatAttribute(*this, "value", "ConstantFresnelTexture value", &ConstantFresnelTexture::val); } --- textures/densitygrid.h.orig +++ textures/densitygrid.h @@ -39,7 +39,7 @@ public: // DensityGridTexture Public Methods DensityGridTexture(int x, int y, int z, const float *d, enum WrapMode w, TextureMapping3D *map) : - Texture("DensityGridTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("DensityGridTexture-" + boost::lexical_cast(this)), nx(x), ny(y), nz(z), wrapMode(w), mapping(map) { density.assign(d, d + nx * ny * nz); dMin = *std::min_element(density.begin(), density.end()); --- textures/dots.h.orig +++ textures/dots.h @@ -37,7 +37,7 @@ public: // DotsTexture Public Methods DotsTexture(TextureMapping2D *m, boost::shared_ptr > &c1, boost::shared_ptr > &c2) : - Texture("DotsTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("DotsTexture-" + boost::lexical_cast(this)), outsideDot(c1), insideDot(c2), mapping(m) { } virtual ~DotsTexture() { delete mapping; } virtual float Evaluate(const SpectrumWavelengths &sw, --- textures/equalenergy.h.orig +++ textures/equalenergy.h @@ -35,7 +35,7 @@ class EqualEnergyTexture : public Textur public: // EqualEnergyTexture Public Methods EqualEnergyTexture(float t) : - Texture("EqualEnergyTexture-" + boost::lexical_cast(this)), e(t) { } + lux::Texture::Texture("EqualEnergyTexture-" + boost::lexical_cast(this)), e(t) { } virtual ~EqualEnergyTexture() { } virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, const DifferentialGeometry &) const { --- textures/exponential.h.orig +++ textures/exponential.h @@ -36,7 +36,7 @@ public: // ExponentialTexture Public Methods ExponentialTexture(const Point &o, const Vector &up, float d, TextureMapping3D *map) : - Texture("ExponentialTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("ExponentialTexture-" + boost::lexical_cast(this)), origin(o), upDir(up), decay(d), mapping(map) { } virtual ~ExponentialTexture() { delete mapping; } virtual float Evaluate(const SpectrumWavelengths &sw, --- textures/fbm.h.orig +++ textures/fbm.h @@ -37,7 +37,7 @@ class FBmTexture : public Texture public: // FBmTexture Public Methods FBmTexture(int oct, float roughness, TextureMapping3D *map) : - Texture("FBmTexture-" + boost::lexical_cast(this)) { + lux::Texture::Texture("FBmTexture-" + boost::lexical_cast(this)) { omega = roughness; octaves = oct; mapping = map; --- textures/frequencytexture.h.orig +++ textures/frequencytexture.h @@ -35,7 +35,7 @@ class FrequencyTexture : public Texture< public: // FrequencyTexture Public Methods FrequencyTexture(float w, float p, float r) - : Texture("FrequencyTexture-" + boost::lexical_cast(this)), + : lux::Texture::Texture("FrequencyTexture-" + boost::lexical_cast(this)), FSPD(w, p, r) { } virtual ~FrequencyTexture() { } virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, --- textures/fresnelcolor.h.orig +++ textures/fresnelcolor.h @@ -34,7 +34,7 @@ class FresnelColorTexture : public Textu public: // FresnelColorTexture Public Methods FresnelColorTexture(const boost::shared_ptr > &c) : - Texture("FresnelColorTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("FresnelColorTexture-" + boost::lexical_cast(this)), color(c) { } virtual ~FresnelColorTexture() { } virtual FresnelGeneral Evaluate(const SpectrumWavelengths &sw, --- textures/gaussiantexture.h.orig +++ textures/gaussiantexture.h @@ -35,7 +35,7 @@ class GaussianTexture : public Texture(this)), + lux::Texture::Texture("GaussianTexture-" + boost::lexical_cast(this)), GSPD(m, w, r) { } virtual ~GaussianTexture() { } virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, --- textures/harlequin.h.orig +++ textures/harlequin.h @@ -40,7 +40,7 @@ namespace lux class HarlequinTexture : public Texture { public: // Harlequin Public Methods - HarlequinTexture() : Texture("HarlequinTexture-" + boost::lexical_cast(this)) { + HarlequinTexture() : lux::Texture::Texture("HarlequinTexture-" + boost::lexical_cast(this)) { float c[3]; for (int i = 0; i < HARLEQUIN_TEXTURE_PALETTE_SIZE; i++) { c[0] = RadicalInverse(i * COLOR_SAMPLES + 1, 2); --- textures/hitpointcolor.h.orig +++ textures/hitpointcolor.h @@ -34,7 +34,7 @@ namespace lux class HitPointAlphaTexture : public Texture { public: HitPointAlphaTexture() : - Texture("HitPointAlphaTexture-" + boost::lexical_cast(this)) { } + lux::Texture::Texture("HitPointAlphaTexture-" + boost::lexical_cast(this)) { } virtual ~HitPointAlphaTexture() { } virtual float Evaluate(const SpectrumWavelengths &sw, const DifferentialGeometry &dgs) const { @@ -58,7 +58,7 @@ public: class HitPointRGBColorTexture : public Texture { public: HitPointRGBColorTexture() : - Texture("HitPointRGBColorTexture-" + boost::lexical_cast(this)) { } + lux::Texture::Texture("HitPointRGBColorTexture-" + boost::lexical_cast(this)) { } virtual ~HitPointRGBColorTexture() { } virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, const DifferentialGeometry &dgs) const { @@ -83,7 +83,7 @@ public: class HitPointGreyTexture : public Texture { public: HitPointGreyTexture(const u_int ch) : - Texture("HitPointGreyTexture-" + boost::lexical_cast(this)), channel(ch) { } + lux::Texture::Texture("HitPointGreyTexture-" + boost::lexical_cast(this)), channel(ch) { } virtual ~HitPointGreyTexture() { } virtual float Evaluate(const SpectrumWavelengths &sw, const DifferentialGeometry &dgs) const { --- textures/imagemap.h.orig +++ textures/imagemap.h @@ -112,7 +112,7 @@ class ImageFloatTexture : public Texture public: // ImageFloatTexture Public Methods ImageFloatTexture(const TexInfo &texInfo, TextureMapping2D *m, Channel ch) : - Texture("ImageFloatTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("ImageFloatTexture-" + boost::lexical_cast(this)), ImageTexture(texInfo, m) { channel = ch; } virtual ~ImageFloatTexture() { } @@ -152,7 +152,7 @@ class ImageSpectrumTexture : public Text public: // ImageSpectrumTexture Public Methods ImageSpectrumTexture(const TexInfo &texInfo, TextureMapping2D *m) : - Texture("ImageSpectrumTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("ImageSpectrumTexture-" + boost::lexical_cast(this)), ImageTexture(texInfo, m), isIlluminant(false) { } virtual ~ImageSpectrumTexture() { } @@ -200,7 +200,7 @@ class NormalMapTexture : public Texture< public: // NormalMapTexture Public Methods NormalMapTexture(const TexInfo &texInfo, TextureMapping2D *m) : - Texture("NormalMapTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("NormalMapTexture-" + boost::lexical_cast(this)), ImageTexture(texInfo, m) { } virtual ~NormalMapTexture() { } --- textures/irregulardata.h.orig +++ textures/irregulardata.h @@ -36,7 +36,7 @@ public: // IrregularDataSpectrumTexture Public Methods IrregularDataTexture(u_int n, const float *wl, const float *data, float resolution = 5.f) : - Texture("IrregularDataTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("IrregularDataTexture-" + boost::lexical_cast(this)), SPD(wl, data, n, resolution) { } virtual ~IrregularDataTexture() { } virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, --- textures/marble.h.orig +++ textures/marble.h @@ -39,7 +39,7 @@ public: // MarbleTexture Public Methods virtual ~MarbleTexture() { delete mapping; } MarbleTexture(int oct, float roughness, float sc, float var, - TextureMapping3D *map) : Texture("MarbleTexture-" + boost::lexical_cast(this)) { + TextureMapping3D *map) : lux::Texture::Texture("MarbleTexture-" + boost::lexical_cast(this)) { omega = roughness; octaves = oct; mapping = map; --- textures/regulardata.h.orig +++ textures/regulardata.h @@ -35,7 +35,7 @@ class RegularDataTexture : public Textur public: // RegularDataSpectrumTexture Public Methods RegularDataTexture(float s, float e, u_int n, const float *data) - : Texture("RegularDataTexture-" + boost::lexical_cast(this)), + : lux::Texture::Texture("RegularDataTexture-" + boost::lexical_cast(this)), SPD(data, s, e, n) { } virtual ~RegularDataTexture() { } virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, --- textures/sellmeiertexture.h.orig +++ textures/sellmeiertexture.h @@ -36,7 +36,7 @@ class SellmeierTexture : public Texture< public: // SellmeierTexture Public Methods SellmeierTexture(float a_, u_int n, const float *b_, const float *c_) : - Texture("SellmeierTexture-" + boost::lexical_cast(this)), + lux::Texture::Texture("SellmeierTexture-" + boost::lexical_cast(this)), b(b_, b_ + n), c(c_, c_ + n), a(a_) { // Sellmeier expects wavelength in µm but we have it in nm for (u_int i = 0; i < n; ++i) --- textures/tabulatedfresnel.h.orig +++ textures/tabulatedfresnel.h @@ -37,7 +37,7 @@ public: // TabulatedFresnel Public Methods TabulatedFresnel(const vector &wl, const vector &n, const vector &k) : - Texture("TabulatedFresnel-" + boost::lexical_cast(this)), + lux::Texture::Texture("TabulatedFresnel-" + boost::lexical_cast(this)), N(&wl[0], &n[0], wl.size()), K(&wl[0], &k[0], wl.size()), index(N.Filter()) { } virtual ~TabulatedFresnel() { } --- textures/uv.h.orig +++ textures/uv.h @@ -36,7 +36,7 @@ namespace lux class UVTexture : public Texture { public: // UVTexture Public Methods - UVTexture(TextureMapping2D *m) : Texture("UVTexture-" + boost::lexical_cast(this)) { + UVTexture(TextureMapping2D *m) : lux::Texture::Texture("UVTexture-" + boost::lexical_cast(this)) { mapping = m; } virtual ~UVTexture() { --- textures/windy.h.orig +++ textures/windy.h @@ -37,7 +37,7 @@ class WindyTexture : public Texture(this)) { mapping = map; } + lux::Texture::Texture("WindyTexture-" + boost::lexical_cast(this)) { mapping = map; } virtual ~WindyTexture() { delete mapping; } virtual float Evaluate(const SpectrumWavelengths &sw, const DifferentialGeometry &dg) const { --- textures/wrinkled.h.orig +++ textures/wrinkled.h @@ -37,7 +37,7 @@ class WrinkledTexture : public Texture(this)) { + lux::Texture::Texture("WrinkledTexture-" + boost::lexical_cast(this)) { omega = roughness; octaves = oct; mapping = map; Index: head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake =================================================================== --- head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake (revision 394656) +++ head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake (revision 394657) @@ -1,25 +1,26 @@ ---- ../luxrender-luxrays-7459cd8a9583/cmake/PlatformSpecific.cmake.orig -+++ ../luxrender-luxrays-7459cd8a9583/cmake/PlatformSpecific.cmake -@@ -106,18 +106,17 @@ ENDIF(MSVC) +--- ../luxrender-luxrays-7c7127ee1fa4/cmake/PlatformSpecific.cmake.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/cmake/PlatformSpecific.cmake +@@ -138,18 +138,17 @@ ENDIF(MSVC) -IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +#IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) # Update if necessary - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse") IF(NOT CYGWIN) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ENDIF(NOT CYGWIN) SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") - SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -ftree-vectorize -fvariable-expansion-in-unroller") - -ENDIF() + SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG") +#ENDIF() # Setting Universal Binary Properties, only for Mac OS X Index: head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h =================================================================== --- head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h (nonexistent) +++ head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h (revision 394657) @@ -0,0 +1,20 @@ +--- ../luxrender-luxrays-7c7127ee1fa4/include/luxcore/luxcore.h.orig 2015-01-20 22:45:32.000000000 +0000 ++++ ../luxrender-luxrays-7c7127ee1fa4/include/luxcore/luxcore.h +@@ -63,7 +63,7 @@ + */ + namespace luxcore { + +-CPP_EXPORT CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler ++extern CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler + + #define LC_LOG(a) { if (luxcore::LuxCore_LogHandler) { std::stringstream _LUXCORE_LOG_LOCAL_SS; _LUXCORE_LOG_LOCAL_SS << a; luxcore::LuxCore_LogHandler(_LUXCORE_LOG_LOCAL_SS.str().c_str()); } } + +@@ -603,7 +603,7 @@ public: + * + * \return the default Properties. + */ +- static const luxrays::Properties &GetDefaultProperties(); ++ const luxrays::Properties &GetDefaultProperties(); + + friend class RenderSession; + Property changes on: head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt =================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt (revision 394656) +++ head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt (revision 394657) @@ -1,14 +1,14 @@ ---- ../luxrender-luxrays-7459cd8a9583/samples/benchsimple/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7459cd8a9583/samples/benchsimple/CMakeLists.txt +--- ../luxrender-luxrays-7c7127ee1fa4/samples/benchsimple/CMakeLists.txt.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/samples/benchsimple/CMakeLists.txt @@ -19,8 +19,10 @@ # LuxRays website: http://www.luxrender.net # ########################################################################### +find_package(Threads) + include_directories(${LuxRays_INCLUDE_DIR}) link_directories (${LuxRays_LIB_DIR}) add_executable(benchsimple benchsimple.cpp) -target_link_libraries(benchsimple luxrays) -+target_link_libraries(benchsimple luxrays ${CMAKE_THREAD_LIBS_INIT}) ++target_link_libraries(benchsimple luxrays ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) Index: head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt =================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt (nonexistent) +++ head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt (revision 394657) @@ -0,0 +1,16 @@ +--- ../luxrender-luxrays-7c7127ee1fa4/samples/luxcoredemo/CMakeLists.txt.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/samples/luxcoredemo/CMakeLists.txt +@@ -22,10 +22,12 @@ + # + ################################################################################ + ++find_package(Threads) ++ + set(LUXCORELIBDEMO_SRCS + luxcoredemo.cpp + ) + + add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS}) + +-TARGET_LINK_LIBRARIES(luxcoredemo luxcore smallluxgpu luxrays ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) ++TARGET_LINK_LIBRARIES(luxcoredemo luxcore smallluxgpu luxrays ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) Property changes on: head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt =================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt (nonexistent) +++ head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt (revision 394657) @@ -0,0 +1,16 @@ +--- ../luxrender-luxrays-7c7127ee1fa4/samples/luxcorescenedemo/CMakeLists.txt.orig 2015-01-20 22:45:32 UTC ++++ ../luxrender-luxrays-7c7127ee1fa4/samples/luxcorescenedemo/CMakeLists.txt +@@ -22,10 +22,12 @@ + # + ################################################################################ + ++find_package(Threads) ++ + set(LUXCORESCENEDEMO_SRCS + luxcorescenedemo.cpp + ) + + add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS}) + +-TARGET_LINK_LIBRARIES(luxcorescenedemo luxcore smallluxgpu luxrays ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) ++TARGET_LINK_LIBRARIES(luxcorescenedemo luxcore smallluxgpu luxrays ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) Property changes on: head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt =================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt (revision 394656) +++ head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt (revision 394657) @@ -1,20 +1,20 @@ ---- ../luxrender-luxrays-7459cd8a9583/samples/smallluxgpu4/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7459cd8a9583/samples/smallluxgpu4/CMakeLists.txt +--- ../luxrender-luxrays-7c7127ee1fa4/samples/smallluxgpu4/CMakeLists.txt.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/samples/smallluxgpu4/CMakeLists.txt @@ -25,6 +25,8 @@ # ############################################################################# +find_package(Threads) + set(SMALLLUXGPU_SRCS smallluxgpu.cpp displayfunc.cpp @@ -32,7 +34,7 @@ set(SMALLLUXGPU_SRCS add_executable(slg4 ${SMALLLUXGPU_SRCS}) --TARGET_LINK_LIBRARIES(slg4 smallluxgpu luxrays ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY}) -+TARGET_LINK_LIBRARIES(slg4 smallluxgpu luxrays ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} -lexecinfo) +-TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) ++TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lexecinfo) # This instructs FREEGLUT to emit a pragma for the static version SET_TARGET_PROPERTIES(slg4 PROPERTIES COMPILE_DEFINITIONS FREEGLUT_STATIC)