summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/blender-addon-luxrender/PKGBUILD8
-rw-r--r--libre/blender-libre/PKGBUILD22
-rw-r--r--libre/luxrender-libre/PKGBUILD32
-rw-r--r--libre/luxrender-libre/boost-1.53-shared_array_constructor.diff62
4 files changed, 23 insertions, 101 deletions
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index d3c891067..337cabcda 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -1,16 +1,16 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
_srcname=luxrender
-_pkgver=1.2.1
+_pkgver=1.3
_bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
_pkgname=${_srcname::3}${_bldname::5}25
_srcver=c9deae0646d0
pkgname=$_bldname-addon-$_srcname
pkgver=$_pkgver.v$_bldver
-pkgrel=3
+pkgrel=1
pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)"
arch=any
url=http://www.$_srcname.net/
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 90df03528..359f2a6cf 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -2,8 +2,8 @@
_pkgname=blender
epoch=10
-_pkgver=2.68a
-pkgrel=3
+_pkgver=2.69
+pkgrel=1
_jpgver=1.5
_pyver=3.3
@@ -36,7 +36,7 @@ depends=(
openal
openexr-libre
openimageio
- 'opencollada=20130413'
+ 'opencollada=20131031'
opencolorio
openshadinglanguage
shared-mime-info
@@ -57,9 +57,10 @@ provides=($_pkgname)
conflicts=($_pkgname)
[[ $_spn == true ]] && conflicts+=($_pkgname-libre)
replaces=$_pkgname
+options=(!strip)
install=$_pkgname.install
source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
-sha512sums=ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019
+sha512sums=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
prepare() {
cd $srcdir/$_pkgname-$pkgver
@@ -67,16 +68,17 @@ prepare() {
msg 'renaming wrong OS name'
_OS=$(uname -o)
[[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c
- [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c
- sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre|
- s|Linux, FreeBSD|GNU, GNU/Linux-libre|
+ [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux";|' source/creator/buildinfo.c
+ [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c
+ sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD|
+ s|Linux, FreeBSD|GNU and BSD|
s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
\|Windows|d;\|Mac OS X|d
s|The downloaded Blender package includes|The '"${pkgname^}"' package includes|
' release/text/readme.html
- sed -i 's|Linux|GNU/Linux-libre|
+ sed -i 's|Linux|GNU|
' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py
- sed -i 's| (.so under Linux, .dll under windows...)||
+ sed -i 's| (.so under Linux, .dll under windows...)| (.so under GNU or BSD, .dll under Wine or ReactOS...)|
' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py
msg 'removing Open Source term'
@@ -135,5 +137,3 @@ package() {
make DESTDIR=$pkgdir install
python -m compileall $pkgdir/usr/share/$_pkgname
}
-
-# vim:set ts=2 sw=2 et:
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 <coadde@lavabit.com>
_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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 20:34:44 +0000