Date: Tue, 18 Aug 2015 20:43:59 +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: r394657 - in head/graphics/luxrender: . files Message-ID: <201508182043.t7IKhx8u024427@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Aug 18 20:43:58 2015 New Revision: 394657 URL: https://svnweb.freebsd.org/changeset/ports/394657 Log: - Belatedly update to version 1.4 (switch to DISTVERSION to make testing of -RC versions easier) - Point MASTER_SITES to fetch distfiles from Bitbucket (src.luxrender.net redirects there now) - Add two new USES: `execinfo' and `python:version'; the latter is needed to avoid build breakage when both Python 2.x and 3.x are installed - Remove `-pedantic' from CMAKE_CXX_FLAGS to allow building with GCC 4.2 by avoiding "floating constant exceeds range of 'long double'" error - Reword X11_DESC slightly while here in order to insert space in "Qt 4" while retaining visual appeal of option description text in the dialog Added: head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h (contents, props changed) head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt (contents, props changed) head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt (contents, props changed) Deleted: head/graphics/luxrender/files/patch-luxrays-samples-slglibdemo-CMakeLists.txt Modified: head/graphics/luxrender/Makefile head/graphics/luxrender/distinfo head/graphics/luxrender/files/patch-CMakeLists.txt head/graphics/luxrender/files/patch-gcc42-fixes head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Modified: head/graphics/luxrender/Makefile ============================================================================== --- head/graphics/luxrender/Makefile Tue Aug 18 20:37:35 2015 (r394656) +++ head/graphics/luxrender/Makefile Tue Aug 18 20:43:58 2015 (r394657) @@ -2,13 +2,12 @@ # $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 @@ -19,33 +18,31 @@ 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 @@ -56,6 +53,10 @@ post-patch: ${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} \ Modified: head/graphics/luxrender/distinfo ============================================================================== --- head/graphics/luxrender/distinfo Tue Aug 18 20:37:35 2015 (r394656) +++ head/graphics/luxrender/distinfo Tue Aug 18 20:43:58 2015 (r394657) @@ -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 Modified: head/graphics/luxrender/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/luxrender/files/patch-CMakeLists.txt Tue Aug 18 20:37:35 2015 (r394656) +++ head/graphics/luxrender/files/patch-CMakeLists.txt Tue Aug 18 20:43:58 2015 (r394657) @@ -1,14 +1,5 @@ --- 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 Modified: head/graphics/luxrender/files/patch-gcc42-fixes ============================================================================== --- head/graphics/luxrender/files/patch-gcc42-fixes Tue Aug 18 20:37:35 2015 (r394656) +++ head/graphics/luxrender/files/patch-gcc42-fixes Tue Aug 18 20:43:58 2015 (r394657) @@ -1,3 +1,19 @@ +--- ../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: Modified: head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake Tue Aug 18 20:37:35 2015 (r394656) +++ head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake Tue Aug 18 20:43:58 2015 (r394657) @@ -1,14 +1,15 @@ ---- ../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") Added: head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h Tue Aug 18 20:43:58 2015 (r394657) @@ -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; + Modified: head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt Tue Aug 18 20:37:35 2015 (r394656) +++ head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt Tue Aug 18 20:43:58 2015 (r394657) @@ -1,5 +1,5 @@ ---- ../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 # ########################################################################### @@ -11,4 +11,4 @@ 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}) Added: head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt Tue Aug 18 20:43:58 2015 (r394657) @@ -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}) Added: head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt Tue Aug 18 20:43:58 2015 (r394657) @@ -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}) Modified: head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Tue Aug 18 20:37:35 2015 (r394656) +++ head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Tue Aug 18 20:43:58 2015 (r394657) @@ -1,5 +1,5 @@ ---- ../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 @@ # ############################################################################# @@ -13,8 +13,8 @@ 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508182043.t7IKhx8u024427>