[arch-commits] Commit in luxrender/trunk (2 files)

[Lukas Jirkovsky]

    Date: Tuesday, March 26, 2013 @ 18:29:48
  Author: stativ
Revision: 87066

update to 1.2.1, try to fix build with boost 1.53

Added:
  luxrender/trunk/boost-1.53-shared_array_constructor.diff
Modified:
  luxrender/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   14 +++++++++-----
 boost-1.53-shared_array_constructor.diff |   14 ++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-26 15:50:32 UTC (rev 87065)
+++ PKGBUILD	2013-03-26 17:29:48 UTC (rev 87066)
@@ -3,8 +3,8 @@
 # Contributor: flixie <69one at gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
 pkgname=luxrender
-pkgver=1.2
-_pkgver=ee0b9ff73d62
+pkgver=1.2.1
+_pkgver=3066b2161439
 pkgrel=1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('i686' 'x86_64')
@@ -16,15 +16,19 @@
             'nvidia-utils: OpenCL support for nVidia GPUs' \
             'amdstream: OpenCL support for AMD GPUs' \
             'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
-md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=1.2" 'python' 'opencl-headers')
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
+        boost-1.53-shared_array_constructor.diff)
+md5sums=('87958798c164ad14f92fb4af2595d332'
+         'cb25bb3cdac0ab2ad480cbe5c23f5abb')
 
 build() {
   cd "$srcdir"/luxrender-lux-$_pkgver
 
   # fix the installation
   sed -i '/.*wxgui.*/ d' CMakeLists.txt
+  # fix for boost 1.53
+  patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true
 
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \

Added: boost-1.53-shared_array_constructor.diff
===================================================================
--- boost-1.53-shared_array_constructor.diff	                        (rev 0)
+++ boost-1.53-shared_array_constructor.diff	2013-03-26 17:29:48 UTC (rev 87066)
@@ -0,0 +1,14 @@
+diff -rup luxrender-lux-3066b2161439/core/film.cpp luxrender-lux-3066b2161439.new/core/film.cpp
+--- luxrender-lux-3066b2161439/core/film.cpp	2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/core/film.cpp	2013-03-26 17:23:21.359679166 +0000
+@@ -890,8 +890,8 @@ Film::Film(u_int xres, u_int yres, Filte
+ 	filename(filename1),
+ 	colorSpace(0.63f, 0.34f, 0.31f, 0.595f, 0.155f, 0.07f, 0.314275f, 0.329411f), // default is SMPTE
+ 	convTest(NULL), varianceBuffer(NULL),
+-	noiseAwareMap(NULL), noiseAwareMapVersion(0),
+-	userSamplingMapFileName(samplingmapfilename), userSamplingMap(NULL), userSamplingMapVersion(0),
++	noiseAwareMap(), noiseAwareMapVersion(0),
++	userSamplingMapFileName(samplingmapfilename), userSamplingMap(), userSamplingMapVersion(0),
+ 	ZBuffer(NULL), use_Zbuf(useZbuffer),
+ 	debug_mode(debugmode), premultiplyAlpha(premult),
+ 	writeResumeFlm(w_resume_FLM), restartResumeFlm(restart_resume_FLM), writeFlmDirect(write_FLM_direct),