From 22114cb5cba3c252143eef47107be70d92788ce4 Mon Sep 17 00:00:00 2001 From: coadde - Public Network Date: Fri, 1 Nov 2013 20:34:49 -0200 Subject: updating blender-libre, blender-spacenav-libre, luxrender-libre and blender-addon-luxrender --- libre/luxrender-libre/PKGBUILD | 32 +++-------- .../boost-1.53-shared_array_constructor.diff | 62 ---------------------- 2 files changed, 8 insertions(+), 86 deletions(-) delete mode 100644 libre/luxrender-libre/boost-1.53-shared_array_constructor.diff (limited to 'libre/luxrender-libre') diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 0c109a5d1..a8e9b4ab2 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -5,43 +5,27 @@ # Maintainer (Parabola): Márcio Silva _pkgname=luxrender pkgname=$_pkgname-libre -pkgver=1.2.1 -_pkgver=3066b2161439 -pkgrel=5 +pkgver=1.3 +_pkgver=523432614aa5 +pkgrel=1 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.$_pkgname.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libcl-libre' 'mesa-libgl') +depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw') optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') -makedepends+=('gcc-lts') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname -source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 - boost-1.53-shared_array_constructor.diff) -md5sums=( - '87958798c164ad14f92fb4af2595d332' - 'dd19c7ac2ba8c9b703018a176ef77f98') - -prepare() { - cd "$srcdir"/$_pkgname-lux-$_pkgver - - # fix the installation - sed -i '/.*wxgui.*/ d - s|-ftree-vectorize || - ' CMakeLists.txt - # fix for boost 1.53 - patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true - - export CXXFLAGS="$CXXFLAGS -lpthread" -} +source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2) +md5sums=('fad0fae0866e578ca6f5b3f3903d0c9f') build() { cd "$srcdir"/$_pkgname-lux-$_pkgver + export CXXFLAGS="$CXXFLAGS -lpthread" cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ @@ -52,7 +36,7 @@ build() { package() { cd "$srcdir"/$_pkgname-lux-$_pkgver - setarch $CARCH make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install # fix library path on 64bit [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib diff --git a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff deleted file mode 100644 index a6a8d532b..000000000 --- a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff +++ /dev/null @@ -1,62 +0,0 @@ -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; -- cgit v1.2.3