diff options
8 files changed, 20 insertions, 16 deletions
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile index a4823e8da810..8a51cbcc4d7d 100644 --- a/graphics/luxrender/Makefile +++ b/graphics/luxrender/Makefile @@ -25,8 +25,8 @@ ONLY_FOR_ARCHS_REASON= uses SSE instructions 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 Qt 4) 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 diff --git a/graphics/luxrender/files/patch-gcc42-fixes b/graphics/luxrender/files/patch-gcc42-fixes index 7648ae07fd03..dbf2e1b99f53 100644 --- a/graphics/luxrender/files/patch-gcc42-fixes +++ b/graphics/luxrender/files/patch-gcc42-fixes @@ -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); } diff --git a/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake b/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake index 06026047e648..4ff5dc3bad2b 100644 --- a/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake +++ b/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake @@ -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) diff --git a/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h b/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h index 5682d834aedd..4a0b0eeb7380 100644 --- a/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h +++ b/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h @@ -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 { diff --git a/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt index 8b82dec72892..57463f284521 100644 --- a/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt +++ b/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt @@ -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 # ########################################################################### diff --git a/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt index 79099952acd2..c49fa9306fa8 100644 --- a/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt +++ b/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt @@ -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 @@ # ################################################################################ diff --git a/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt index d26f96765c6e..582310ee23b0 100644 --- a/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt +++ b/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt @@ -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 @@ # ################################################################################ diff --git a/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt index 06569f21524a..d978fce88fd6 100644 --- a/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt +++ b/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt @@ -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 @@ # ############################################################################# |