Date: Wed, 26 Aug 2015 08:57:34 +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: r395352 - in head/graphics/luxrender: . files Message-ID: <201508260857.t7Q8vYMS052257@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Aug 26 08:57:33 2015 New Revision: 395352 URL: https://svnweb.freebsd.org/changeset/ports/395352 Log: - Do not embed revision hashes inside patches by creating a symlink with constant name in `pre-patch' stage - Add explanatory comment on why do we want to link Boost libraries dynamically while I'm here Modified: head/graphics/luxrender/Makefile head/graphics/luxrender/files/patch-gcc42-fixes head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Modified: head/graphics/luxrender/Makefile ============================================================================== --- head/graphics/luxrender/Makefile Wed Aug 26 08:40:21 2015 (r395351) +++ head/graphics/luxrender/Makefile Wed Aug 26 08:57:33 2015 (r395352) @@ -25,8 +25,8 @@ ONLY_FOR_ARCHS_REASON= uses SSE instruct 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} +WRKSRC= ${WRKDIR}/${PORTNAME}-lux-${LUX_REV} +LUXRAYS_WRKSRC= ${WRKDIR}/${PORTNAME}-luxrays-${LUXRAYS_REV} CMAKE_ARGS= -DLUXCORE_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ -DLUXCORE_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxcore.a" \ @@ -46,11 +46,15 @@ X11_DESC= Build GUI executable (requires X11_USE= QT4=moc_build,qmake_build,rcc_build,uic_build,corelib,gui X11_PLIST_FILES= bin/luxrender +pre-patch: + @${LN} -sf ${PORTNAME}-luxrays-${LUXRAYS_REV} ${WRKDIR}/luxrays + post-patch: @${REINPLACE_CMD} -e 's/__APPLE__/__FreeBSD__/' \ ${LUXRAYS_WRKSRC}/samples/smallluxgpu4/smallluxgpu.h \ ${WRKSRC}/core/osfunc.h \ ${WRKSRC}/shapes/mikktspace/weldmesh.c +# Avoid infamous "local symbol discarded in section `.text...' errors @${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 Modified: head/graphics/luxrender/files/patch-gcc42-fixes ============================================================================== --- head/graphics/luxrender/files/patch-gcc42-fixes Wed Aug 26 08:40:21 2015 (r395351) +++ head/graphics/luxrender/files/patch-gcc42-fixes Wed Aug 26 08:57:33 2015 (r395352) @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7c7127ee1fa4/include/luxrays/core/geometry/frame.h.orig -+++ ../luxrender-luxrays-7c7127ee1fa4/include/luxrays/core/geometry/frame.h +--- ../luxrays/include/luxrays/core/geometry/frame.h.orig ++++ ../luxrays/include/luxrays/core/geometry/frame.h @@ -46,11 +46,11 @@ public: SetFromZ(z); } Modified: head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake Wed Aug 26 08:40:21 2015 (r395351) +++ head/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake Wed Aug 26 08:57:33 2015 (r395352) @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7c7127ee1fa4/cmake/PlatformSpecific.cmake.orig -+++ ../luxrender-luxrays-7c7127ee1fa4/cmake/PlatformSpecific.cmake +--- ../luxrays/cmake/PlatformSpecific.cmake.orig ++++ ../luxrays/cmake/PlatformSpecific.cmake @@ -138,18 +138,17 @@ ENDIF(MSVC) Modified: head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h Wed Aug 26 08:40:21 2015 (r395351) +++ head/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h Wed Aug 26 08:57:33 2015 (r395352) @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7c7127ee1fa4/include/luxcore/luxcore.h.orig 2015-01-20 22:45:32.000000000 +0000 -+++ ../luxrender-luxrays-7c7127ee1fa4/include/luxcore/luxcore.h +--- ../luxrays/include/luxcore/luxcore.h.orig ++++ ../luxrays/include/luxcore/luxcore.h @@ -63,7 +63,7 @@ */ namespace luxcore { Modified: head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt Wed Aug 26 08:40:21 2015 (r395351) +++ head/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt Wed Aug 26 08:57:33 2015 (r395352) @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7c7127ee1fa4/samples/benchsimple/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7c7127ee1fa4/samples/benchsimple/CMakeLists.txt +--- ../luxrays/samples/benchsimple/CMakeLists.txt.orig ++++ ../luxrays/samples/benchsimple/CMakeLists.txt @@ -19,8 +19,10 @@ # LuxRays website: http://www.luxrender.net # ########################################################################### Modified: head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt Wed Aug 26 08:40:21 2015 (r395351) +++ head/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt Wed Aug 26 08:57:33 2015 (r395352) @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7c7127ee1fa4/samples/luxcoredemo/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7c7127ee1fa4/samples/luxcoredemo/CMakeLists.txt +--- ../luxrays/samples/luxcoredemo/CMakeLists.txt.orig ++++ ../luxrays/samples/luxcoredemo/CMakeLists.txt @@ -22,10 +22,12 @@ # ################################################################################ Modified: head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt Wed Aug 26 08:40:21 2015 (r395351) +++ head/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt Wed Aug 26 08:57:33 2015 (r395352) @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7c7127ee1fa4/samples/luxcorescenedemo/CMakeLists.txt.orig 2015-01-20 22:45:32 UTC -+++ ../luxrender-luxrays-7c7127ee1fa4/samples/luxcorescenedemo/CMakeLists.txt +--- ../luxrays/samples/luxcorescenedemo/CMakeLists.txt.orig ++++ ../luxrays/samples/luxcorescenedemo/CMakeLists.txt @@ -22,10 +22,12 @@ # ################################################################################ Modified: head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt ============================================================================== --- head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Wed Aug 26 08:40:21 2015 (r395351) +++ head/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt Wed Aug 26 08:57:33 2015 (r395352) @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7c7127ee1fa4/samples/smallluxgpu4/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7c7127ee1fa4/samples/smallluxgpu4/CMakeLists.txt +--- ../luxrays/samples/smallluxgpu4/CMakeLists.txt.orig ++++ ../luxrays/samples/smallluxgpu4/CMakeLists.txt @@ -25,6 +25,8 @@ # #############################################################################
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508260857.t7Q8vYMS052257>