diff options
| author | Lukáš Jirkovský | 2016-08-08 20:30:48 +0200 |
|---|---|---|
| committer | Lukáš Jirkovský | 2016-08-08 20:30:48 +0200 |
| commit | ff7b0f4b5b0cdb17308e7186821cb3130341b306 (patch) | |
| tree | 0dfb30f833a881f67be3b22fec32e1df66541fff | |
| parent | 22d639895dcf1e0965d73b86d7c5f5438fae6369 (diff) | |
| download | aur-ff7b0f4b5b0cdb17308e7186821cb3130341b306.tar.gz | |
make YafaRay work out of the box
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | pluginpath.diff | 20 |
3 files changed, 39 insertions, 9 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Dec 23 11:01:14 UTC 2015 +# Mon Aug 8 18:30:48 UTC 2016 pkgbase = yafaray-git pkgdesc = A free open-source raytracing engine - pkgver = 569.ee254c6 + pkgver = 971.573e158 pkgrel = 1 url = http://www.yafaray.org/ arch = i686 @@ -22,7 +22,9 @@ pkgbase = yafaray-git provides = yafaray conflicts = yafaray source = yafaray::git+git://github.com/YafaRay/Core.git + source = pluginpath.diff md5sums = SKIP + md5sums = bab516f2be6bc15491acd53df7a50a69 pkgname = yafaray-git @@ -1,18 +1,26 @@ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=yafaray-git -pkgver=569.ee254c6 +pkgver=971.573e158 pkgrel=1 pkgdesc="A free open-source raytracing engine" arch=('i686' 'x86_64') url="http://www.yafaray.org/" license=('LGPL2.1') depends=('libxml2' 'openexr' 'libjpeg') -optdepends=('qt4: QT GUI' 'python: Python bindings' 'yafaray-blender-exporter-git: Exporter for Blender') +optdepends=('qt4: QT GUI' 'python: Python bindings' + 'yafaray-blender-exporter-git: Exporter for Blender') makedepends=('cmake' 'git' 'qt4' 'swig' 'python') provides=('yafaray') conflicts=('yafaray') -source=('yafaray::git+git://github.com/YafaRay/Core.git') -md5sums=('SKIP') +source=('yafaray::git+git://github.com/YafaRay/Core.git' + 'pluginpath.diff') +md5sums=('SKIP' + 'bab516f2be6bc15491acd53df7a50a69') + +prepare() { + cd "$srcdir/yafaray" + patch -Np1 < "$srcdir/pluginpath.diff" +} pkgver() { cd "$srcdir/yafaray" @@ -22,10 +30,10 @@ pkgver() { build() { cd "$srcdir/yafaray" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DYAF_PY_VERSION=3.5 \ - -DYAF_BINDINGS_PY_DIR=/usr/lib/python3.5 \ - . + -DYAF_BINDINGS_PY_DIR=/usr/lib/python3.5 make } diff --git a/pluginpath.diff b/pluginpath.diff new file mode 100644 index 000000000000..b8f913f4e33e --- /dev/null +++ b/pluginpath.diff @@ -0,0 +1,20 @@ +diff --git a/src/yafraycore/environment.cc b/src/yafraycore/environment.cc +index fdf1c7c..69cb247 100755 +--- a/src/yafraycore/environment.cc ++++ b/src/yafraycore/environment.cc +@@ -137,13 +137,8 @@ void renderEnvironment_t::loadPlugins(const std::string &path) + + bool renderEnvironment_t::getPluginPath(std::string &path) + { +- //Get plugin path from a subfolder of the current yafaray_xml executable file path +- if(!session.getPathYafaRayXml().empty()) +- { +- path = session.getPathYafaRayXml()+"/plugins/"; +- return true; +- } +- else return false; ++ path = "/usr/lib/yafaray/"; ++ return true; + } + + |