[LuxRender/f16] Update to final build for 0.8.0

[Nicolas Chauvet]

commit 5379a359572bcf105fd77129ba1e8d71514d4407
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Aug 8 20:09:12 2011 +0200

    Update to final build for 0.8.0

 LuxRender.spec                |   19 +++++++++++++------
 lux-0.8-shared.patch          |   18 ++++++++++++++++++
 luxrays-e14ba5b1d111-ld.patch |    2 +-
 3 files changed, 32 insertions(+), 7 deletions(-)
---
diff --git a/LuxRender.spec b/LuxRender.spec
index f171472..42fd9ef 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -2,6 +2,8 @@
 %global hash1 e7534273b94a
 %global hash2 e14ba5b1d111
 
+%global _python_bytecompile_errors_terminate_build 0
+
 Name:           LuxRender
 Version:        0.8.0
 Release:        1%{?dist}
@@ -16,11 +18,13 @@ Source1:        http://src.luxrender.net/luxblend25/archive/luxblend25-%{hash1}.
 Source2:        http://src.luxrender.net/luxrays/file/luxrays-%{hash2}.tar.bz2
 Source3:        luxblend-default.cfg
 Patch0:         lux-45d3e13eb94c-ld.patch
-Patch1:         luxrays-e14ba5b1d111-ld.patch
+Patch1:         lux-0.8-shared.patch
+Patch2:         luxrays-e14ba5b1d111-ld.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  cmake
+BuildRequires:  dos2unix
 
 BuildRequires:  bison
 BuildRequires:  boost-devel
@@ -89,6 +93,7 @@ developing applications that use %{name}.
 %setup -q -D -T -a 1 -n lux-%{hash0}
 %setup -q -D -T -a 2 -n lux-%{hash0}
 %patch0 -p1 -b .ld
+%patch1 -p1 -b .ld
 #Disable tweaking
 sed -i -e 's/-O3//' CMakeLists.txt
 %ifarch i686
@@ -103,9 +108,12 @@ sed -i -e 's/-mfpmath=sse//' CMakeLists.txt
 
 #Patching luxrays
 pushd luxrays-%{hash2}
-%patch1 -p1 -b .ld
+%patch2 -p1 -b .ld
 popd
 
+#Fix eol encoding
+find luxblend25-e7534273b94a/src/luxrender -type f -exec dos2unix {} ';'
+
 %build
 #Building luxrays
 mkdir -p luxrays-%{hash2}/build
@@ -168,10 +176,10 @@ desktop-file-install --vendor "" --delete-original \
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/blender/scripts/bpydata/config
 
-install -pm 0644 luxblend-%{hash2}/LuxBlend_0.1.py \
+cp -pr luxblend25-%{hash1}/src/luxrender \
   $RPM_BUILD_ROOT%{_datadir}/blender/scripts/
 
-install -pm 0644 %{SOURCE2} \
+install -pm 0644 %{SOURCE3} \
   $RPM_BUILD_ROOT%{_datadir}/blender/scripts/bpydata/config/luxblend.cfg
 
 
@@ -184,7 +192,6 @@ install -pm 0644 %{SOURCE2} \
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt COPYING.txt
-%{_bindir}/luxrenderwx
 %{_bindir}/luxrender
 %{_datadir}/pixmaps/luxrender.svg
 %{_datadir}/applications/luxrender.desktop
@@ -200,7 +207,7 @@ install -pm 0644 %{SOURCE2} \
 
 %files blender
 %defattr(-,root,root,-)
-%{_datadir}/blender/scripts/LuxBlend_0.1.py*
+%{_datadir}/blender/scripts/luxrender
 %{_datadir}/blender/scripts/bpydata/config/luxblend.cfg
 
 %files devel
diff --git a/lux-0.8-shared.patch b/lux-0.8-shared.patch
new file mode 100644
index 0000000..f1a7448
--- /dev/null
+++ b/lux-0.8-shared.patch
@@ -0,0 +1,18 @@
+diff -up lux-45d3e13eb94c/CMakeLists.txt.shared lux-45d3e13eb94c/CMakeLists.txt
+--- lux-45d3e13eb94c/CMakeLists.txt.shared	2011-08-08 19:16:24.027330415 +0200
++++ lux-45d3e13eb94c/CMakeLists.txt	2011-08-08 19:58:57.265174303 +0200
+@@ -857,12 +857,13 @@ SET( LUXQTGUI_RCS
+ 
+ LINK_DIRECTORIES(${LINK_DIRECTORIES} ${Boost_LIBRARY_DIRS} )
+ 
+-ADD_LIBRARY(luxStatic STATIC ${lux_lib_src} )
++ADD_LIBRARY(luxStatic SHARED ${lux_lib_src} )
+ IF( NOT CMAKE_VERSION VERSION_LESS 2.8.3 AND OSX_OPTION_CLANG) # only cmake >= 2.8.1 supports per target attributes
+ 	SET_TARGET_PROPERTIES(luxStatic PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION com.apple.compilers.llvm.clang.1_0) # for testing new CLANG2.0, will be ignored for other OS
+ 	SET_TARGET_PROPERTIES(luxStatic PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO NO ) # disabled due breaks bw compatibility
+ ENDIF()
+ TARGET_LINK_LIBRARIES(luxStatic ${FREEIMAGE_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
++SET_TARGET_PROPERTIES(luxStatic PROPERTIES SOVERSION 1 VERSION "1.0")
+ 
+ #############################################################################
+ # Here we build the shared core library liblux.so
diff --git a/luxrays-e14ba5b1d111-ld.patch b/luxrays-e14ba5b1d111-ld.patch
index 9d0fed4..73b57ef 100644
--- a/luxrays-e14ba5b1d111-ld.patch
+++ b/luxrays-e14ba5b1d111-ld.patch
@@ -5,7 +5,7 @@ diff -up luxrays-e14ba5b1d111/samples/smallluxgpu/CMakeLists.txt.ld luxrays-e14b
  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 )
++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)