[LuxRender] Fix luxrays build

[Nicolas Chauvet]

commit a95a4a9c3538791925d9bfa8aa7ed6a23ab168ec
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Aug 8 17:58:31 2011 +0200

    Fix luxrays build

 LuxRender.spec                |   16 +++++-----------
 lux-0.7-shared.patch          |   14 --------------
 luxrays-e14ba5b1d111-ld.patch |   11 +++++++++++
 3 files changed, 16 insertions(+), 25 deletions(-)
---
diff --git a/LuxRender.spec b/LuxRender.spec
index 05a0248..cb12c92 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -15,7 +15,7 @@ Source0:        http://src.luxrender.net/lux/archive/lux-%{hash0}.tar.bz2
 Source1:        http://src.luxrender.net/luxblend25/archive/luxblend25-%{hash1}.tar.bz2
 Source2:        http://src.luxrender.net/luxrays/file/luxrays-%{hash2}.tar.bz2
 Source3:        luxblend-default.cfg
-Patch0:         lux-0.7-shared.patch
+Patch0:         luxrays-e14ba5b1d111-ld.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
@@ -87,7 +87,7 @@ developing applications that use %{name}.
 %setup -q -n lux-%{hash0}
 %setup -q -D -T -a 1 -n lux-%{hash0}
 %setup -q -D -T -a 2 -n lux-%{hash0}
-#patch0 -p1 -b .shared
+
 #Disable tweaking
 sed -i -e 's/-O3//' CMakeLists.txt
 %ifarch i686
@@ -101,9 +101,9 @@ sed -i -e 's/-mfpmath=sse//' CMakeLists.txt
 %endif
 
 #Patching luxrays
-#pushd luxrays-%{hash2}
-#
-#popd
+pushd luxrays-%{hash2}
+%patch0 -p1 -b .shared
+popd
 
 %build
 #Building luxrays
@@ -114,12 +114,6 @@ pushd luxrays-%{hash2}/build
   -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
   -DCMAKE_SKIP_RPATH:BOOL=ON \
   -DBoost_INCLUDE_DIR=%{_includedir} \
-  -DBoost_FILESYSTEM_LIBRARY_RELEASE=%{_libdir}/libboost_filesystem.so \
-  -DBoost_FILESYSTEM_LIBRARY_DEBUG=%{_libdir}/libboost_filesystem.so \
-  -DBoost_SYSTEM_LIBRARY_RELEASE=%{_libdir}/libboost_system.so \
-  -DBoost_SYSTEM_LIBRARY_DEBUG=%{_libdir}/libboost_system.so \
-  -DBoost_THREAD_LIBRARY_RELEASE=%{_libdir}/libboost_thread-mt.so \
-  -DBoost_THREAD_LIBRARY_DEBUG=%{_libdir}/libboost_thread-mt.so \
   -DLUXRAYS_DISABLE_OPENCL:BOOL=ON \
   -DCMAKE_CXX_FLAGS="$CXXFLAGS -DLUXRAYS_DISABLE_OPENCL=1" \
 %if %{?_lib} == "lib64"
diff --git a/luxrays-e14ba5b1d111-ld.patch b/luxrays-e14ba5b1d111-ld.patch
new file mode 100644
index 0000000..73b57ef
--- /dev/null
+++ b/luxrays-e14ba5b1d111-ld.patch
@@ -0,0 +1,11 @@
+diff -up luxrays-e14ba5b1d111/samples/smallluxgpu/CMakeLists.txt.ld luxrays-e14ba5b1d111/samples/smallluxgpu/CMakeLists.txt
+--- luxrays-e14ba5b1d111/samples/smallluxgpu/CMakeLists.txt.ld	2011-08-08 17:45:44.678715289 +0200
++++ luxrays-e14ba5b1d111/samples/smallluxgpu/CMakeLists.txt	2011-08-08 17:47:02.821522679 +0200
+@@ -176,6 +176,7 @@ add_executable(slg ${SMALLLUXGPU_SRCS})
+ TARGET_LINK_LIBRARIES(slg luxrays ${GLEW_LIBRARY} ${OPENGL_LIBRARY})
+ TARGET_LINK_LIBRARIES(slg ${OpenCL_LIBRARY})
+ TARGET_LINK_LIBRARIES(slg ${GLUT_LIBRARY})
++TARGET_LINK_LIBRARIES(slg -lpthread)
+ 
+ # This instructs FREEGLUT to emit a pragma for the static version
+ SET_TARGET_PROPERTIES(slg PROPERTIES COMPILE_DEFINITIONS FREEGLUT_STATIC)