[LuxRender/f16] Update to 0.8.0

[Nicolas Chauvet]

commit c9e43f62ea1302ccfbb0087c68cf9d4ec4207814
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Aug 8 14:50:07 2011 +0200

    Update to 0.8.0

 .gitignore     |    3 ++
 LuxRender.spec |   69 +++++++++++++++++++++++++++++++++++++++++++++++---------
 sources        |    5 ++-
 3 files changed, 64 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91d1aac..ad49622 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 f1dfbb50db27.tar.bz2
 /9206b3ba7011.tar.bz2
 /f93faf8189c1.tar.bz2
+/lux-45d3e13eb94c.tar.bz2
+/luxblend25-e7534273b94a.tar.bz2
+/luxrays-e14ba5b1d111.tar.bz2
diff --git a/LuxRender.spec b/LuxRender.spec
index a1019a0..f3cee29 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -1,18 +1,20 @@
-%global hash 9206b3ba7011
-%global hash2 f93faf8189c1
+%global hash0 45d3e13eb94c
+%global hash1 e7534273b94a
+%global hash2 e14ba5b1d111
 
 Name:           LuxRender
-Version:        0.7.1
-Release:        7%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        Lux Renderer, an unbiased rendering system
 
 Group:          Applications/Multimedia
 License:        GPLv3+ and BSD
 URL:            http://www.luxrender.net
 #Taken from http://src.luxrender.net/lux/archive/XXXXX.tar.bz2 AKA said release
-Source0:        http://src.luxrender.net/lux/archive/%{hash}.tar.bz2
-Source1:        http://src.luxrender.net/luxblend/archive/%{hash2}.tar.bz2
-Source2:        luxblend-default.cfg
+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
 
 BuildRequires:  desktop-file-utils
@@ -23,7 +25,9 @@ BuildRequires:  bison
 BuildRequires:  boost-devel
 BuildRequires:  flex
 BuildRequires:  fltk-devel
+BuildRequires:  freeglut-devel
 BuildRequires:  freeimage-devel
+BuildRequires:  glew-devel
 BuildRequires:  qt-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
@@ -33,6 +37,7 @@ BuildRequires:  python-devel
 BuildRequires:  wxGTK-devel
 
 BuildRequires:  libXdamage-devel
+BuildRequires:  libXmu-devel
 
 Requires:  %{name}-core = %{version}-%{release}
 
@@ -79,9 +84,10 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n lux-%{hash}
-%setup -q -D -T -a 1 -n lux-%{hash}
-%patch0 -p1 -b .shared
+%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
@@ -94,16 +100,53 @@ sed -i -e 's/-msse2//' CMakeLists.txt
 sed -i -e 's/-mfpmath=sse//' CMakeLists.txt
 %endif
 
+#Patching luxrays
+#pushd luxrays-%{hash2}
+#
+#popd
 
 %build
+#Building luxrays
+mkdir -p luxrays-%{hash2}/build
+pushd luxrays-%{hash2}/build
+
+%cmake \
+  -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
+  -DCMAKE_SKIP_RPATH:BOOL=ON \
+  -DBoost_INCLUDE_DIR=%{_includedir} \
+  -DBoost_FILESYSTEM_LIBRARY_RELEASE=%{_libdir} \
+  -DBoost_FILESYSTEM_LIBRARY_DEBUG=%{_libdir} \
+  -DBoost_SYSTEM_LIBRARY_RELEASE=%{_libdir} \
+  -DBoost_SYSTEM_LIBRARY_DEBUG=%{_libdir} \
+  -DBoost_THREAD_LIBRARY_RELEASE=%{_libdir} \
+  -DBoost_THREAD_LIBRARY_DEBUG=%{_libdir} \
+  -DLUXRAYS_DISABLE_OPENCL:BOOL=ON \
+  -DCMAKE_CXX_FLAGS="$CXXFLAGS -DLUXRAYS_DISABLE_OPENCL=1" \
+%if %{?_lib} == "lib64"
+  -DLIBDIR=%{_lib} \
+%endif
+  ..
+
+make VERBOSE=1
+#%{?_smp_mflags} 
+
+popd
+
+
+#Building lux
 mkdir -p build
 pushd build
 
 %cmake \
   -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
   -DCMAKE_SKIP_RPATH:BOOL=ON \
+  -DLUXRAYS_INCLUDE_DIRS=%{_builddir}/%{buildsubdir}/luxrays-%{hash2}/include \
+  -DLUXRAYS_LIBRARY=%{_builddir}/%{buildsubdir}/luxrays-%{hash2}/build/lib \
+  -DLUXRAYS_DISABLE_OPENCL:BOOL=ON \
 %if 0%{?fedora} >= 15
-   -DCMAKE_CXX_FLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2" \
+   -DCMAKE_CXX_FLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2 -DLUXRAYS_DISABLE_OPENCL=1" \
+%else
+   -DCMAKE_CXX_FLAGS="$CXXFLAGS -DLUXRAYS_DISABLE_OPENCL=1" \
 %endif
 %if %{?_lib} == "lib64"
   -DLIBDIR=%{_lib} \
@@ -172,6 +215,10 @@ install -pm 0644 %{SOURCE2} \
 
 
 %changelog
+* Mon Aug 08 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.8.0-1
+- Update to 0.8.0
+- Add blend25 plugin to work with blender25
+
 * Wed Aug 03 2011 Tom Callaway <spot at fedoraproject.org> - 0.7.1-7
 - rebuilt
 
diff --git a/sources b/sources
index 2cefdf7..4856dde 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-44b819d37c2cccd8b1a890e6c67061a8  9206b3ba7011.tar.bz2
-daf70af98123d31303c2c037244c527c  f93faf8189c1.tar.bz2
+ad8d2ede00aa244cad884d9696ff5fbb  lux-45d3e13eb94c.tar.bz2
+3b3e1beaf15972379ed1e9ad71c34ba6  luxblend25-e7534273b94a.tar.bz2
+eef5bff7bb5564ce41a627e9ce479f80  luxrays-e14ba5b1d111.tar.bz2