[LuxRender] update to 1.0rc3, fix ftbfs
Tom Callaway
spot at fedoraproject.org
Sun Aug 19 14:32:32 UTC 2012
commit 6ec5a1e4654f35f757615fe2009e1d88192588c8
Author: Tom Callaway <spot at fedoraproject.org>
Date: Sun Aug 19 10:33:12 2012 -0400
update to 1.0rc3, fix ftbfs
.gitignore | 3 +
LuxRender.spec | 22 +++++---
lux-1.0rc3-time_utc_fix.patch | 131 +++++++++++++++++++++++++++++++++++++++++
sources | 6 +-
4 files changed, 151 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e96a78..d81f1eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ f1dfbb50db27.tar.bz2
/lux-0488d0d3ad0a.tar.bz2
/luxblend25-8c20fa83f33f.tar.bz2
/luxrays-396d39b06aa6.tar.bz2
+/lux-9ed6b94cef05.tar.bz2
+/luxblend25-2d621c653196.tar.bz2
+/luxrays-f2a2fb7de23b.tar.bz2
diff --git a/LuxRender.spec b/LuxRender.spec
index 993c5ad..68de1f2 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -1,13 +1,13 @@
# [Fedora] Turn off the brp-python-bytecompile script
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%global hash0 0488d0d3ad0a
-%global hash1 8c20fa83f33f
-%global hash2 396d39b06aa6
+%global hash0 9ed6b94cef05
+%global hash1 2d621c653196
+%global hash2 f2a2fb7de23b
Name: LuxRender
Version: 1.0
-Release: 0.2_rc1%{?dist}
+Release: 0.3.rc3%{?dist}
Summary: Lux Renderer, an unbiased rendering system
Group: Applications/Multimedia
@@ -20,8 +20,9 @@ Source2: http://src.luxrender.net/luxrays/file/luxrays-%{hash2}.tar.bz2
Source3: luxblend-default.cfg
Patch0: lux-45d3e13eb94c-ld.patch
Patch1: lux-0.8-shared.patch
-Patch2: luxrays-1.0_rc1-ld.patch
+Patch2: luxrays-1.0_rc3-ld.patch
Patch3: luxrays-boost.patch
+Patch4: lux-1.0rc3-time_utc_fix.patch
BuildRequires: desktop-file-utils
BuildRequires: doxygen
@@ -67,7 +68,7 @@ The %{name}-lib package contains shared library for %{name}.
Summary: Core binaries for %{name}
Group: Applications/Multimedia
#Requires: %{name}-lib = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description core
The %{name}-core package contains core binaries for using %{name}.
@@ -75,7 +76,7 @@ The %{name}-core package contains core binaries for using %{name}.
%package blender
Summary: Blender export plugin to %{name}
Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: blender(ABI) = %{blender_api}
%description blender
@@ -85,7 +86,7 @@ to export into %{name}
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: %{name}-devel-docs = %{version}-%{release}
Obsoletes: %{name}-devel-docs < 0.7
@@ -121,6 +122,8 @@ sed -i -e 's/-mfpmath=sse//' CMakeLists.txt
# Patch for new boost release
#patch3 -p1 -b .boost
+%patch4 -p1 -b .time_utc_fix
+
#Fix eol encoding
find luxblend25-%{hash1}/src/luxrender -type f -exec dos2unix {} ';'
@@ -228,6 +231,9 @@ install -pm 0644 %{SOURCE3} \
%changelog
+* Sat Aug 18 2012 Tom Callaway <spot at fedoraproject.org> - 1.0-0.3.rc3
+- update to 1.0-rc3
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.2_rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/lux-1.0rc3-time_utc_fix.patch b/lux-1.0rc3-time_utc_fix.patch
new file mode 100644
index 0000000..f59ae2c
--- /dev/null
+++ b/lux-1.0rc3-time_utc_fix.patch
@@ -0,0 +1,131 @@
+diff -up lux-9ed6b94cef05/core/film.cpp.time_utc_fix lux-9ed6b94cef05/core/film.cpp
+--- lux-9ed6b94cef05/core/film.cpp.time_utc_fix 2012-07-28 18:11:31.000000000 -0400
++++ lux-9ed6b94cef05/core/film.cpp 2012-08-19 10:09:20.208463639 -0400
+@@ -638,7 +638,7 @@ Film::Film(u_int xres, u_int yres, Filte
+ int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth);
+ samplePerPass = xRealWidth * yRealHeight;
+
+- boost::xtime_get(&creationTime, boost::TIME_UTC);
++ boost::xtime_get(&creationTime, boost::TIME_UTC_);
+
+ //Queryable parameters
+ AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution);
+@@ -877,7 +877,7 @@ void Film::AddSampleCount(float count) {
+ if (haltTime > 0) {
+ // Check if we have met the enough rendering time condition
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ if (t.sec - creationTime.sec > haltTime)
+ enoughSamplesPerPixel = true;
+ }
+diff -up lux-9ed6b94cef05/core/photonmap.cpp.time_utc_fix lux-9ed6b94cef05/core/photonmap.cpp
+--- lux-9ed6b94cef05/core/photonmap.cpp.time_utc_fix 2012-08-19 10:14:40.034452207 -0400
++++ lux-9ed6b94cef05/core/photonmap.cpp 2012-08-19 10:14:59.853451497 -0400
+@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen
+
+ boost::xtime photonShootingStartTime;
+ boost::xtime lastUpdateTime;
+- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC);
+- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC);
++ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_);
++ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_);
+ u_int nshot = 0;
+ while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) {
+ // Dade - print some progress information
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ if (currentTime.sec - lastUpdateTime.sec > 5) {
+ ss.str("");
+ ss << "Photon shooting progress: Direct[" << directPhotons.size();
+@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen
+ return;
+
+ boost::xtime photonShootingEndTime;
+- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC);
++ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_);
+ LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)";
+
+ if (computeRadianceMap) {
+@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen
+ for (u_int i = 0; i < radiancePhotons.size(); ++i) {
+ // Dade - print some progress info
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ if (currentTime.sec - lastUpdateTime.sec > 5) {
+ LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)";
+
+@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen
+
+
+ boost::xtime radianceComputeEndTime;
+- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC);
++ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_);
+ LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)";
+ }
+
+diff -up lux-9ed6b94cef05/core/renderfarm.cpp.time_utc_fix lux-9ed6b94cef05/core/renderfarm.cpp
+--- lux-9ed6b94cef05/core/renderfarm.cpp.time_utc_fix 2012-08-19 10:14:06.466453407 -0400
++++ lux-9ed6b94cef05/core/renderfarm.cpp 2012-08-19 10:14:16.863453035 -0400
+@@ -101,7 +101,7 @@ void FilmUpdaterThread::updateFilm(FilmU
+ // Dade - thread to update the film with data from servers
+
+ boost::xtime reft;
+- boost::xtime_get(&reft, boost::TIME_UTC);
++ boost::xtime_get(&reft, boost::TIME_UTC_);
+
+ while (filmUpdaterThread->signal == SIG_NONE) {
+ // Dade - check signal every 1 sec
+@@ -109,7 +109,7 @@ void FilmUpdaterThread::updateFilm(FilmU
+ for(;;) {
+ // Dade - sleep for 1 sec
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.sec += 1;
+ boost::thread::sleep(xt);
+
+diff -up lux-9ed6b94cef05/film/fleximage.cpp.time_utc_fix lux-9ed6b94cef05/film/fleximage.cpp
+--- lux-9ed6b94cef05/film/fleximage.cpp.time_utc_fix 2012-08-19 10:15:10.044451134 -0400
++++ lux-9ed6b94cef05/film/fleximage.cpp 2012-08-19 10:15:27.454450511 -0400
+@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres,
+ m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != "";
+
+ // init timer
+- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC);
++ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_);
+ lastWriteFLMTime = lastWriteImageTime;
+ }
+
+@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter
+ {
+ // Check write output interval
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval);
+ bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval);
+
+@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter
+ // WriteImage can take a very long time to be executed (i.e. by saving
+ // the film. It is better to refresh timestamps after the
+ // execution of WriteImage instead than before.
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+
+ if (timeToWriteImage)
+ lastWriteImageTime = currentTime;
+diff -up lux-9ed6b94cef05/renderers/sppmrenderer.h.time_utc_fix lux-9ed6b94cef05/renderers/sppmrenderer.h
+--- lux-9ed6b94cef05/renderers/sppmrenderer.h.time_utc_fix 2012-08-19 10:15:38.468450118 -0400
++++ lux-9ed6b94cef05/renderers/sppmrenderer.h 2012-08-19 10:15:45.926449852 -0400
+@@ -126,7 +126,7 @@ public:
+ {
+ while (state == PAUSE && !boost::this_thread::interruption_requested()) {
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.sec += 1;
+ boost::thread::sleep(xt);
+ }
diff --git a/sources b/sources
index c6a280a..fe63ef4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ff8aa41ce9ab155fabe7375ab4f52437 lux-0488d0d3ad0a.tar.bz2
-2e766b8f02f44d349a5baf25cc069b19 luxblend25-8c20fa83f33f.tar.bz2
-c10777e1c5581c23872bf553ceea7eab luxrays-396d39b06aa6.tar.bz2
+567c5e06394ad5c2297904770565cab0 lux-9ed6b94cef05.tar.bz2
+db573c5289fab9434e570f9f85e9177c luxblend25-2d621c653196.tar.bz2
+89046ebddc994757c2f87e7c44ce9154 luxrays-f2a2fb7de23b.tar.bz2
More information about the scm-commits
mailing list