diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2015-10-12 09:37:20 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2015-10-12 09:37:20 +0000 |
| commit | f7ef0c292faad8fdd1c4e4443c0ceb7f2f670aa5 (patch) | |
| tree | 463be3b05823d03f07360c422835c5c16566481f /graphics/luxrender | |
| parent | be0628b38ec31712640a5bbe54a1baaa963d6a72 (diff) | |
| download | ports-f7ef0c292faad8fdd1c4e4443c0ceb7f2f670aa5.tar.gz ports-f7ef0c292faad8fdd1c4e4443c0ceb7f2f670aa5.zip | |
Update LuxRender to version 1.5. As it now requires `graphics/embree'
which is not available on 9.X for the moment, preserve version 1.4 as
`graphics/luxrender14' slave port.
Notes
Notes:
svn path=/head/; revision=399116
Diffstat (limited to 'graphics/luxrender')
4 files changed, 34 insertions, 11 deletions
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile index 8a51cbcc4d7d..9b903ce7292c 100644 --- a/graphics/luxrender/Makefile +++ b/graphics/luxrender/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= luxrender -DISTVERSION= 1.4 +DISTVERSION?= 1.5 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/luxrender/lux/get/ \ https://bitbucket.org/luxrender/luxrays/get/:lr @@ -19,6 +19,9 @@ LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfreeimage.so:${PORTSDIR}/graphics/freeimage \ libOpenImageIO.so:${PORTSDIR}/graphics/openimageio +.if ${DISTVERSION} > 1.4 +LIB_DEPENDS+= libembree.so:${PORTSDIR}/graphics/embree +.endif ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE instructions @@ -36,8 +39,8 @@ CMAKE_ARGS= -DLUXCORE_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ -DSLG_LIBRARY:PATH="${LUXRAYS_WRKSRC}/lib/libsmallluxgpu.a" \ -DLUXRAYS_DISABLE_OPENCL:BOOL=ON -LUX_REV= dfd211d6faa0 -LUXRAYS_REV= 7c7127ee1fa4 +LUX_REV?= 216e294b59e3 +LUXRAYS_REV?= 3674460aa1da OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 diff --git a/graphics/luxrender/distinfo b/graphics/luxrender/distinfo index 21b9a50c4199..120b4b12b53c 100644 --- a/graphics/luxrender/distinfo +++ b/graphics/luxrender/distinfo @@ -1,4 +1,4 @@ -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 +SHA256 (luxrender/v15.tar.bz2) = 5336ef37388e68414aa6f6e2ad43df5aa384e1cb7d73b2f68b4be02d10adade4 +SIZE (luxrender/v15.tar.bz2) = 2419335 +SHA256 (luxrender/luxrender_v1.5.tar.bz2) = 6aea4af2faa09460f8e77997e40855a8f978f15a4ddebdc6d67ee7bbf127d04f +SIZE (luxrender/luxrender_v1.5.tar.bz2) = 29612786 diff --git a/graphics/luxrender/files/patch-luxrays-samples-luxcoreimplserializationdemo-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-luxcoreimplserializationdemo-CMakeLists.txt new file mode 100644 index 000000000000..61b086aac3aa --- /dev/null +++ b/graphics/luxrender/files/patch-luxrays-samples-luxcoreimplserializationdemo-CMakeLists.txt @@ -0,0 +1,16 @@ +--- ../luxrays/samples/luxcoreimplserializationdemo/CMakeLists.txt.orig 2015-08-29 17:04:08 UTC ++++ ../luxrays/samples/luxcoreimplserializationdemo/CMakeLists.txt +@@ -22,10 +22,12 @@ + # + ################################################################################ + ++find_package(Threads) ++ + set(LUXCOREIMPL_SERIALIZATIONDEMO_SRCS + luxcoreimplserializationdemo.cpp + ) + + add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS}) + +-TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) ++TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt index d978fce88fd6..1c4be84820b4 100644 --- a/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt +++ b/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt @@ -1,6 +1,6 @@ --- ../luxrays/samples/smallluxgpu4/CMakeLists.txt.orig +++ ../luxrays/samples/smallluxgpu4/CMakeLists.txt -@@ -25,6 +25,8 @@ +@@ -22,6 +22,8 @@ # ############################################################################# @@ -9,12 +9,16 @@ set(SMALLLUXGPU_SRCS smallluxgpu.cpp displayfunc.cpp -@@ -32,7 +34,7 @@ set(SMALLLUXGPU_SRCS +@@ -29,11 +31,7 @@ add_executable(slg4 ${SMALLLUXGPU_SRCS}) --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) +-if(APPLE) +- TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) +-else(APPLE) +- TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) +-endif(APPLE) ++TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${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) |