[arch-commits] Commit in luxrender/repos (6 files)
Lukas Jirkovsky
stativ at nymeria.archlinux.org
Tue Mar 26 18:58:06 UTC 2013
Date: Tuesday, March 26, 2013 @ 19:58:05
Author: stativ
Revision: 87086
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
luxrender/repos/community-staging-i686/
luxrender/repos/community-staging-i686/PKGBUILD
(from rev 87085, luxrender/trunk/PKGBUILD)
luxrender/repos/community-staging-i686/boost-1.53-shared_array_constructor.diff
(from rev 87085, luxrender/trunk/boost-1.53-shared_array_constructor.diff)
luxrender/repos/community-staging-x86_64/
luxrender/repos/community-staging-x86_64/PKGBUILD
(from rev 87085, luxrender/trunk/PKGBUILD)
luxrender/repos/community-staging-x86_64/boost-1.53-shared_array_constructor.diff
(from rev 87085, luxrender/trunk/boost-1.53-shared_array_constructor.diff)
-------------------------------------------------------------------+
community-staging-i686/PKGBUILD | 54 ++++++++
community-staging-i686/boost-1.53-shared_array_constructor.diff | 62 ++++++++++
community-staging-x86_64/PKGBUILD | 54 ++++++++
community-staging-x86_64/boost-1.53-shared_array_constructor.diff | 62 ++++++++++
4 files changed, 232 insertions(+)
Copied: luxrender/repos/community-staging-i686/PKGBUILD (from rev 87085, luxrender/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-03-26 18:58:05 UTC (rev 87086)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: flixie <69one at gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
+pkgname=luxrender
+pkgver=1.2.1
+_pkgver=3066b2161439
+pkgrel=1
+pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
+optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \
+ 'python: Python interface (pylux)'
+ '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=1.2" 'python' 'opencl-headers')
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
+ boost-1.53-shared_array_constructor.diff)
+md5sums=('87958798c164ad14f92fb4af2595d332'
+ 'dd19c7ac2ba8c9b703018a176ef77f98')
+
+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 \
+ -DLUXRAYS_DISABLE_OPENCL=OFF \
+ -DPYTHON_CUSTOM=ON \
+ -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
+ -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
+ .
+ make
+}
+
+package() {
+ cd "$srcdir"/luxrender-lux-$_pkgver
+ make DESTDIR="$pkgdir" install
+
+ # fix library path on x86_64
+ [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+ #install pylux
+ install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
Copied: luxrender/repos/community-staging-i686/boost-1.53-shared_array_constructor.diff (from rev 87085, luxrender/trunk/boost-1.53-shared_array_constructor.diff)
===================================================================
--- community-staging-i686/boost-1.53-shared_array_constructor.diff (rev 0)
+++ community-staging-i686/boost-1.53-shared_array_constructor.diff 2013-03-26 18:58:05 UTC (rev 87086)
@@ -0,0 +1,62 @@
+diff -rup luxrender-lux-3066b2161439/cmake/luxrender.cmake luxrender-lux-3066b2161439.new/cmake/luxrender.cmake
+--- luxrender-lux-3066b2161439/cmake/luxrender.cmake 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/cmake/luxrender.cmake 2013-03-26 18:26:46.194520697 +0000
+@@ -98,7 +98,7 @@ IF(QT4_FOUND)
+
+ QT4_ADD_RESOURCES( LUXQTGUI_RC_SRCS ${LUXQTGUI_RCS})
+ QT4_WRAP_UI( LUXQTGUI_UI_HDRS ${LUXQTGUI_UIS} )
+- QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} )
++ QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
+
+ #file (GLOB TRANSLATIONS_FILES qtgui/translations/*.ts)
+ #qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
+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 18:03:02.828222310 +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),
++ noiseAwareMapVersion(0),
++ userSamplingMapFileName(samplingmapfilename), userSamplingMapVersion(0),
+ ZBuffer(NULL), use_Zbuf(useZbuffer),
+ debug_mode(debugmode), premultiplyAlpha(premult),
+ writeResumeFlm(w_resume_FLM), restartResumeFlm(restart_resume_FLM), writeFlmDirect(write_FLM_direct),
+diff -rup luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp
+--- luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp 2013-03-26 18:03:02.828222310 +0000
+@@ -29,7 +29,7 @@
+ using namespace lux;
+
+ LDSampler::LDData::LDData(const Sampler &sampler, int xPixelStart, int yPixelStart, u_int pixelSamples) :
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) {
++ noiseAwareMapVersion(0), userSamplingMapVersion(0) {
+ xPos = xPixelStart - 1;
+ yPos = yPixelStart;
+ samplePos = pixelSamples - 1;
+diff -rup luxrender-lux-3066b2161439/samplers/metrosampler.cpp luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp
+--- luxrender-lux-3066b2161439/samplers/metrosampler.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp 2013-03-26 18:13:13.146702871 +0000
+@@ -39,7 +39,7 @@ static const u_int rngA = 884;
+ MetropolisSampler::MetropolisData::MetropolisData(const MetropolisSampler &sampler) :
+ consecRejects(0), stamp(0), currentStamp(0), weight(0.f),
+ LY(0.f), alpha(0.f), totalLY(0.f), sampleCount(0.f),
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0),
++ noiseAwareMapVersion(0), userSamplingMapVersion(0),
+ large(true), cooldown(sampler.cooldownTime > 0)
+ {
+ u_int i;
+diff -rup luxrender-lux-3066b2161439/samplers/random.cpp luxrender-lux-3066b2161439.new/samplers/random.cpp
+--- luxrender-lux-3066b2161439/samplers/random.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/random.cpp 2013-03-26 18:12:34.378868365 +0000
+@@ -30,7 +30,7 @@ using namespace lux;
+
+ RandomSampler::RandomData::RandomData(const Sampler &sampler, int xPixelStart,
+ int yPixelStart, u_int pixelSamples) :
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0)
++ noiseAwareMapVersion(0), userSamplingMapVersion(0)
+ {
+ xPos = xPixelStart;
+ yPos = yPixelStart;
Copied: luxrender/repos/community-staging-x86_64/PKGBUILD (from rev 87085, luxrender/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-03-26 18:58:05 UTC (rev 87086)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: flixie <69one at gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
+pkgname=luxrender
+pkgver=1.2.1
+_pkgver=3066b2161439
+pkgrel=1
+pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
+optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \
+ 'python: Python interface (pylux)'
+ '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=1.2" 'python' 'opencl-headers')
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
+ boost-1.53-shared_array_constructor.diff)
+md5sums=('87958798c164ad14f92fb4af2595d332'
+ 'dd19c7ac2ba8c9b703018a176ef77f98')
+
+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 \
+ -DLUXRAYS_DISABLE_OPENCL=OFF \
+ -DPYTHON_CUSTOM=ON \
+ -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
+ -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
+ .
+ make
+}
+
+package() {
+ cd "$srcdir"/luxrender-lux-$_pkgver
+ make DESTDIR="$pkgdir" install
+
+ # fix library path on x86_64
+ [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+ #install pylux
+ install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
Copied: luxrender/repos/community-staging-x86_64/boost-1.53-shared_array_constructor.diff (from rev 87085, luxrender/trunk/boost-1.53-shared_array_constructor.diff)
===================================================================
--- community-staging-x86_64/boost-1.53-shared_array_constructor.diff (rev 0)
+++ community-staging-x86_64/boost-1.53-shared_array_constructor.diff 2013-03-26 18:58:05 UTC (rev 87086)
@@ -0,0 +1,62 @@
+diff -rup luxrender-lux-3066b2161439/cmake/luxrender.cmake luxrender-lux-3066b2161439.new/cmake/luxrender.cmake
+--- luxrender-lux-3066b2161439/cmake/luxrender.cmake 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/cmake/luxrender.cmake 2013-03-26 18:26:46.194520697 +0000
+@@ -98,7 +98,7 @@ IF(QT4_FOUND)
+
+ QT4_ADD_RESOURCES( LUXQTGUI_RC_SRCS ${LUXQTGUI_RCS})
+ QT4_WRAP_UI( LUXQTGUI_UI_HDRS ${LUXQTGUI_UIS} )
+- QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} )
++ QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
+
+ #file (GLOB TRANSLATIONS_FILES qtgui/translations/*.ts)
+ #qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
+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 18:03:02.828222310 +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),
++ noiseAwareMapVersion(0),
++ userSamplingMapFileName(samplingmapfilename), userSamplingMapVersion(0),
+ ZBuffer(NULL), use_Zbuf(useZbuffer),
+ debug_mode(debugmode), premultiplyAlpha(premult),
+ writeResumeFlm(w_resume_FLM), restartResumeFlm(restart_resume_FLM), writeFlmDirect(write_FLM_direct),
+diff -rup luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp
+--- luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp 2013-03-26 18:03:02.828222310 +0000
+@@ -29,7 +29,7 @@
+ using namespace lux;
+
+ LDSampler::LDData::LDData(const Sampler &sampler, int xPixelStart, int yPixelStart, u_int pixelSamples) :
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) {
++ noiseAwareMapVersion(0), userSamplingMapVersion(0) {
+ xPos = xPixelStart - 1;
+ yPos = yPixelStart;
+ samplePos = pixelSamples - 1;
+diff -rup luxrender-lux-3066b2161439/samplers/metrosampler.cpp luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp
+--- luxrender-lux-3066b2161439/samplers/metrosampler.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp 2013-03-26 18:13:13.146702871 +0000
+@@ -39,7 +39,7 @@ static const u_int rngA = 884;
+ MetropolisSampler::MetropolisData::MetropolisData(const MetropolisSampler &sampler) :
+ consecRejects(0), stamp(0), currentStamp(0), weight(0.f),
+ LY(0.f), alpha(0.f), totalLY(0.f), sampleCount(0.f),
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0),
++ noiseAwareMapVersion(0), userSamplingMapVersion(0),
+ large(true), cooldown(sampler.cooldownTime > 0)
+ {
+ u_int i;
+diff -rup luxrender-lux-3066b2161439/samplers/random.cpp luxrender-lux-3066b2161439.new/samplers/random.cpp
+--- luxrender-lux-3066b2161439/samplers/random.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/random.cpp 2013-03-26 18:12:34.378868365 +0000
+@@ -30,7 +30,7 @@ using namespace lux;
+
+ RandomSampler::RandomData::RandomData(const Sampler &sampler, int xPixelStart,
+ int yPixelStart, u_int pixelSamples) :
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0)
++ noiseAwareMapVersion(0), userSamplingMapVersion(0)
+ {
+ xPos = xPixelStart;
+ yPos = yPixelStart;
More information about the arch-commits
mailing list