Date: Mon, 12 Oct 2015 09:37:20 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399116 - in head/graphics: . luxrender luxrender/files luxrender14 luxrender14/files Message-ID: <201510120937.t9C9bK49031814@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Oct 12 09:37:20 2015 New Revision: 399116 URL: https://svnweb.freebsd.org/changeset/ports/399116 Log: 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. Added: head/graphics/luxrender/files/patch-luxrays-samples-luxcoreimplserializationdemo-CMakeLists.txt (contents, props changed) head/graphics/luxrender14/ head/graphics/luxrender14/Makefile (contents, props changed) head/graphics/luxrender14/distinfo (contents, props changed) head/graphics/luxrender14/files/ - copied from r399114, head/graphics/luxrender/files/ Modified: head/graphics/Makefile head/graphics/luxrender/Makefile head/graphics/luxrender/distinfo head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Mon Oct 12 09:04:20 2015 (r399115) +++ head/graphics/Makefile Mon Oct 12 09:37:20 2015 (r399116) @@ -572,6 +572,7 @@ SUBDIR += luminance SUBDIR += luminance-qt5 SUBDIR += luxrender + SUBDIR += luxrender14 SUBDIR += mahotas SUBDIR += maim SUBDIR += makehuman Modified: head/graphics/luxrender/Makefile ============================================================================== --- head/graphics/luxrender/Makefile Mon Oct 12 09:04:20 2015 (r399115) +++ head/graphics/luxrender/Makefile Mon Oct 12 09:37:20 2015 (r399116) @@ -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:${PORTSD 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= -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 Modified: head/graphics/luxrender/distinfo ============================================================================== --- head/graphics/luxrender/distinfo Mon Oct 12 09:04:20 2015 (r399115) +++ head/graphics/luxrender/distinfo Mon Oct 12 09:37:20 2015 (r399116) @@ -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 Added: head/graphics/luxrender/files/patch-luxrays-samples-luxcoreimplserializationdemo-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender/files/patch-luxrays-samples-luxcoreimplserializationdemo-CMakeLists.txt Mon Oct 12 09:37:20 2015 (r399116) @@ -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}) Modified: head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Mon Oct 12 09:04:20 2015 (r399115) +++ head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Mon Oct 12 09:37:20 2015 (r399116) @@ -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) Added: head/graphics/luxrender14/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender14/Makefile Mon Oct 12 09:37:20 2015 (r399116) @@ -0,0 +1,15 @@ +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> +# $FreeBSD$ + +DISTVERSION= 1.4 + +LUX_REV= dfd211d6faa0 +LUXRAYS_REV= 7c7127ee1fa4 + +MASTERDIR= ${.CURDIR}/../luxrender +PKGNAMESUFFIX= -14 + +DISTINFO_FILE= ${.CURDIR}/distinfo +PATCHDIR= ${.CURDIR}/files + +.include "${MASTERDIR}/Makefile" Added: head/graphics/luxrender14/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender14/distinfo Mon Oct 12 09:37:20 2015 (r399116) @@ -0,0 +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510120937.t9C9bK49031814>