From 43a790b0d70af0c52c24405e0242f77683fd412f Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Tue, 4 Sep 2012 23:20:25 -0300 Subject: remove lux{rays,render}-libre from libre repo and add lux{rays,render}-{nocl,art} to artistic repo --- artistic/luxrays-art/PKGBUILD | 62 +++++++++++++ artistic/luxrays-nocl/PKGBUILD | 60 +++++++++++++ artistic/luxrender-art/PKGBUILD | 80 +++++++++++++++++ artistic/luxrender-art/boost_1.50_fix.diff | 131 ++++++++++++++++++++++++++++ artistic/luxrender-nocl/PKGBUILD | 78 +++++++++++++++++ artistic/luxrender-nocl/boost_1.50_fix.diff | 131 ++++++++++++++++++++++++++++ libre/luxblend25/PKGBUILD | 50 +++++++---- libre/luxrays-libre/PKGBUILD | 42 --------- libre/luxrender-libre/PKGBUILD | 54 ------------ libre/luxrender-libre/boost_1.50_fix.diff | 131 ---------------------------- 10 files changed, 575 insertions(+), 244 deletions(-) create mode 100644 artistic/luxrays-art/PKGBUILD create mode 100644 artistic/luxrays-nocl/PKGBUILD create mode 100644 artistic/luxrender-art/PKGBUILD create mode 100644 artistic/luxrender-art/boost_1.50_fix.diff create mode 100644 artistic/luxrender-nocl/PKGBUILD create mode 100644 artistic/luxrender-nocl/boost_1.50_fix.diff delete mode 100644 libre/luxrays-libre/PKGBUILD delete mode 100644 libre/luxrender-libre/PKGBUILD delete mode 100644 libre/luxrender-libre/boost_1.50_fix.diff diff --git a/artistic/luxrays-art/PKGBUILD b/artistic/luxrays-art/PKGBUILD new file mode 100644 index 000000000..e7cbda0e9 --- /dev/null +++ b/artistic/luxrays-art/PKGBUILD @@ -0,0 +1,62 @@ +# Maintainer: Lukas Jirkovsky +# Maintainer (Parabola): Márcio Silva + +pkgname=luxrays-art +pkgver=1.0rc4 +_pkgver=752ba5c422e0 +pkgrel=1 +epoch=0 +pkgdesc='Accelerate the ray intersection process by using GPUs' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.${pkgname::3}render.net/ +license=( + GPL +) +depends=( + freeimage + freeglut + glew + libcl-libre +) +makedepends=( + cmake + boost + opencl-headers +) +conflicts=( + ${pkgname%-art} +) +provides=( + ${pkgname%-art}=$pkgver +) +source=( + https://bitbucket.org/${pkgname::3}render/${pkgname%-art}/get/$_pkgver.tar.bz2 +) +md5sums=( + f5f4b53df22a1c7ad301c78d046edd7d +) + +build() { + cd $srcdir/${pkgname::3}render-${pkgname%-art}-$_pkgver + + export CXXFLAGS='$CXXFLAGS -lpthread' + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DLUXRAYS_DISABLE_OPENCL=OFF \ + . + make +} + +package() { + cd $srcdir/luxrender-${pkgname%-art}-$_pkgver + + install -d -m755 $pkgdir/usr/{bin,include,lib} + install -m755 bin/* $pkgdir/usr/bin + install -m644 lib/* $pkgdir/usr/lib + cp -a include/${pkgname%-art} $pkgdir/usr/include +} + diff --git a/artistic/luxrays-nocl/PKGBUILD b/artistic/luxrays-nocl/PKGBUILD new file mode 100644 index 000000000..cd6d642e7 --- /dev/null +++ b/artistic/luxrays-nocl/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Lukas Jirkovsky +# Maintainer (Parabola): Márcio Silva + +pkgname=luxrays-nocl +pkgver=1.0rc4 +_pkgver=752ba5c422e0 +pkgrel=1 +epoch=0 +pkgdesc='Accelerate the ray intersection process by using CPUs (without OpenCL)' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.${pkgname::3}render.net/ +license=( + GPL +) +depends=( + freeimage + freeglut + glew +) +makedepends=( + cmake + boost +) +conflicts=( + ${pkgname%-nocl} +) +provides=( + ${pkgname%-nocl}=$pkgver +) +source=( + https://bitbucket.org/${pkgname::3}render/${pkgname%-nocl}/get/$_pkgver.tar.bz2 +) +md5sums=( + f5f4b53df22a1c7ad301c78d046edd7d +) + +build() { + cd $srcdir/${pkgname::3}render-${pkgname%-nocl}-$_pkgver + + export CXXFLAGS='$CXXFLAGS -lpthread' + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + . + make +} + +package() { + cd $srcdir/luxrender-${pkgname%-nocl}-$_pkgver + + install -d -m755 $pkgdir/usr/{bin,include,lib} + install -m755 bin/* $pkgdir/usr/bin + install -m644 lib/* $pkgdir/usr/lib + cp -a include/${pkgname%-nocl} $pkgdir/usr/include +} + diff --git a/artistic/luxrender-art/PKGBUILD b/artistic/luxrender-art/PKGBUILD new file mode 100644 index 000000000..5c5a4e0d1 --- /dev/null +++ b/artistic/luxrender-art/PKGBUILD @@ -0,0 +1,80 @@ +# Maintainer: Lukas Jirkovsky +# Initial contributor: flixie <69one@gmx.net> +# Contributor: Imanol Celaya +# Maintainer (Parabola): Márcio Silva +pkgname=luxrender-art +pkgver=1.0rc4 +_pkgver=0b4c3e188707 +pkgrel=1 +pkgdesc='Rendering system for physically correct, unbiased image synthesis' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.${pkgname%-art}.net/ +license=( + GPL +) +depends=( + boost-libs + freeimage + openexr + libcl-libre +) +optdepends=( + 'luxblend25: Blender exporter' + 'python: Python interface (pylux)' + 'qt: Qt GUI' +) +makedepends=( + cmake + boost + qt + ${pkgname::3}rays-art=$pkgver + python + opencl-headers +) +conflicts=( + ${pkgname%-art} +) +provides=( + ${pkgname%-art}=$pkgver +) +source=( + https://bitbucket.org/${pkgname%-art}/${pkgname::3}/get/$_pkgver.tar.bz2 + boost_1.50_fix.diff +) +md5sums=( + 54ff625a7833541c3cff5f0a77a93863 + 8c7774bb0c97aadd77d9e665d8fa4aab +) + +build() { + cd $srcdir/${pkgname%-art}-${pkgname::3}-$_pkgver + + # fix for boost 1.50 + # the boost::TIME_UTC has been renamed due to the conflict with C++11 + patch -Np1 < $srcdir/boost_1.50_fix.diff || true + + export CXXFLAGS='$CXXFLAGS -lpthread' + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + -DPYTHON_CUSTOM=ON \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu \ + . + make +} + +package() { + cd $srcdir/${pkgname%-art}-${pkgname::3}-$_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.2/pylux.so +} + diff --git a/artistic/luxrender-art/boost_1.50_fix.diff b/artistic/luxrender-art/boost_1.50_fix.diff new file mode 100644 index 000000000..c1aa0a8e2 --- /dev/null +++ b/artistic/luxrender-art/boost_1.50_fix.diff @@ -0,0 +1,131 @@ +diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp +--- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 +@@ -618,7 +618,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); +@@ -855,7 +855,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 -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp +--- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 +@@ -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 -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp +--- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 +@@ -100,7 +100,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 +@@ -108,7 +108,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 -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp +--- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 +@@ -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 -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h +--- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 +@@ -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/artistic/luxrender-nocl/PKGBUILD b/artistic/luxrender-nocl/PKGBUILD new file mode 100644 index 000000000..9daa7a548 --- /dev/null +++ b/artistic/luxrender-nocl/PKGBUILD @@ -0,0 +1,78 @@ +# Maintainer: Lukas Jirkovsky +# Initial contributor: flixie <69one@gmx.net> +# Contributor: Imanol Celaya +# Maintainer (Parabola): Márcio Silva +pkgname=luxrender-nocl +pkgver=1.0rc4 +_pkgver=0b4c3e188707 +pkgrel=1 +pkgdesc='Rendering system for physically correct, unbiased image synthesis (without OpenCL)' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.${pkgname%-nocl}.net/ +license=( + GPL +) +depends=( + boost-libs + freeimage + openexr +) +optdepends=( + 'luxblend25: Blender exporter' + 'python: Python interface (pylux)' + 'qt: Qt GUI' +) +makedepends=( + cmake + boost + qt + ${pkgname::3}rays-nocl=$pkgver + python +) +conflicts=( + ${pkgname%-nocl} +) +provides=( + ${pkgname%-nocl}=$pkgver +) +source=( + https://bitbucket.org/${pkgname%-nocl}/${pkgname::3}/get/$_pkgver.tar.bz2 + boost_1.50_fix.diff +) +md5sums=( + 54ff625a7833541c3cff5f0a77a93863 + 8c7774bb0c97aadd77d9e665d8fa4aab +) + +build() { + cd $srcdir/${pkgname%-nocl}-${pkgname::3}-$_pkgver + + # fix for boost 1.50 + # the boost::TIME_UTC has been renamed due to the conflict with C++11 + patch -Np1 < $srcdir/boost_1.50_fix.diff || true + + export CXXFLAGS='$CXXFLAGS -lpthread' + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + -DPYTHON_CUSTOM=ON \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu \ + . + make +} + +package() { + cd $srcdir/${pkgname%-nocl}-${pkgname::3}-$_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.2/pylux.so +} + diff --git a/artistic/luxrender-nocl/boost_1.50_fix.diff b/artistic/luxrender-nocl/boost_1.50_fix.diff new file mode 100644 index 000000000..c1aa0a8e2 --- /dev/null +++ b/artistic/luxrender-nocl/boost_1.50_fix.diff @@ -0,0 +1,131 @@ +diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp +--- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 +@@ -618,7 +618,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); +@@ -855,7 +855,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 -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp +--- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 +@@ -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 -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp +--- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 +@@ -100,7 +100,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 +@@ -108,7 +108,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 -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp +--- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 +@@ -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 -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h +--- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 +@@ -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/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD index d9934e179..3ce9b57db 100644 --- a/libre/luxblend25/PKGBUILD +++ b/libre/luxblend25/PKGBUILD @@ -1,28 +1,44 @@ -# $Id$ # Maintainer: Lukas Jirkovsky # Maintainer (Parabola): Márcio Silva pkgname=luxblend25 -pkgver=1.0rc3 -_pkgver=2d621c653196 +pkgver=1.0rc4 +_pkgver=06194cf93745 _blender=2.63 pkgrel=1 -pkgdesc="A LuxRender exporter for Blender-libre" -arch=('any') -url="http://www.luxrender.net/" -license=('GPL') -depends=('blender' 'luxrender') -replaces=('luxblend25') -conflicts=('luxblend25') -provides=("luxblend25=$pkgver") -source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2) -md5sums=('c5719c2a0e8567cd9f0aef429a2996f0') +pkgdesc='A LuxRender exporter for Blender-libre' +arch=( + any +) +url=http://www.{pkgname::3}render.net/ +license=( + GPL +) +depends=( + blender=$_blender + ${pkgname::3}render +) +replaces=( + $pkgname +) +conflicts=( + $pkgname +) +provides=( + $pkgname=$pkgver +) +source=( + https://bitbucket.org/${pkgname::3}render/$pkgname/get/$_pkgver.tar.bz2 +) +md5sums=( + c5719c2a0e8567cd9f0aef429a2996f0 +) package() { - install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/luxrender-luxblend25-$_pkgver/src/luxrender \ - "$pkgdir"/usr/share/blender/$_blender/scripts/addons + install -d -m755 $pkgdir/usr/share/blender/$_blender/scripts/addons + cp -a $srcdir/${pkgname::3}render-$pkgname-$_pkgver/src/${pkgname::3}render \ + $pkgdir/usr/share/blender/$_blender/scripts/addons # change the search path in exporter so it finds pylux in its new location - sed -i 's|from.*import pylux|import pylux|' "$pkgdir/usr/share/blender/$_blender/scripts/addons/luxrender/outputs/pure_api.py" + sed -i 's|from.*import pylux|import pylux|' $pkgdir/usr/share/blender/$_blender/scripts/addons/${pkgname::3}render/outputs/pure_api.py } # vim:set ts=2 sw=2 et: diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD deleted file mode 100644 index 279e6622e..000000000 --- a/libre/luxrays-libre/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Lukas Jirkovsky -# Maintainer (Parabola): Márcio Silva -_pkgname=luxrays -pkgname=luxrays-libre -pkgver=1.0rc3 -_pkgver=eb749c000ffc -pkgrel=1 -epoch=0 -pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.luxrender.net/" -license=('GPL') -depends=('freeimage' 'freeglut' 'glew') -makedepends=('cmake' 'boost') -replaces=('luxrays') -conflicts=('luxrays') -provides=("luxrays=$pkgver") -source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('f5f4b53df22a1c7ad301c78d046edd7d') - -build() { - cd "$srcdir/luxrender-$_pkgname-$_pkgver" - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=ON \ - . - make -} - -package() { - cd "$srcdir/luxrender-$_pkgname-$_pkgver" - - install -d -m755 "$pkgdir"/usr/{bin,include,lib} - install -m755 bin/* "$pkgdir"/usr/bin - install -m644 lib/* "$pkgdir"/usr/lib - cp -a include/luxrays "$pkgdir"/usr/include -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD deleted file mode 100644 index be6fd88e8..000000000 --- a/libre/luxrender-libre/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Lukas Jirkovsky -# Initial contributor: flixie <69one@gmx.net> -# Contributor: Imanol Celaya -# Maintainer (Parabola): Márcio Silva -pkgname=luxrender-libre -pkgver=1.0rc3 -_pkgver=9ed6b94cef05 -pkgrel=1 -pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.luxrender.net/" -license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr') -optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ - 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python') -replaces=('luxrender') -conflicts=('luxrender') -provides=("luxrender=$pkgver") -source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ - boost_1.50_fix.diff) -md5sums=('54ff625a7833541c3cff5f0a77a93863' - '8c7774bb0c97aadd77d9e665d8fa4aab') - -build() { - cd "$srcdir"/luxrender-lux-$_pkgver - - # fix for boost 1.50 - # the boost::TIME_UTC has been renamed due to the conflict with C++11 - patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=ON \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ - . - 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.2/pylux.so -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/luxrender-libre/boost_1.50_fix.diff b/libre/luxrender-libre/boost_1.50_fix.diff deleted file mode 100644 index c1aa0a8e2..000000000 --- a/libre/luxrender-libre/boost_1.50_fix.diff +++ /dev/null @@ -1,131 +0,0 @@ -diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp ---- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 -@@ -618,7 +618,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); -@@ -855,7 +855,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 -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp ---- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -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 -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp ---- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -100,7 +100,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 -@@ -108,7 +108,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 -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp ---- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 -@@ -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 -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h ---- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 -@@ -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); - } -- cgit v1.2.3