diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2019-02-09 18:32:37 +0100 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2019-02-09 18:32:37 +0100 |
commit | 80226b11d4e49cacdddc3d3718e6e18db9243a8c (patch) | |
tree | ee3bc9243be526a70e2907d5d5ee4c4bf8d3c4b4 /pcr | |
parent | 55e4a4402075a70457ac4d62865bf790325ef829 (diff) | |
download | abslibre-80226b11d4e49cacdddc3d3718e6e18db9243a8c.tar.gz abslibre-80226b11d4e49cacdddc3d3718e6e18db9243a8c.tar.bz2 abslibre-80226b11d4e49cacdddc3d3718e6e18db9243a8c.zip |
pcr/yafaray: reworked and rebuilt
Diffstat (limited to 'pcr')
-rw-r--r-- | pcr/yafaray/PKGBUILD | 57 | ||||
-rw-r--r-- | pcr/yafaray/ruby-archhdrdir.patch | 12 |
2 files changed, 46 insertions, 23 deletions
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD index 260d7ff0c..5e0610f20 100644 --- a/pcr/yafaray/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -1,42 +1,53 @@ -# Maintainer (AUR): AppleBloom <rat.o.drat@gmail.com> +# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> +# Contributor (AUR): Thomas Ascher <thomas.ascher@gmx.at> # Contributor: Márcio Silva <coadde@hyperbola.info> # parabola changes and rationale: -# - removed "open source" term from pkgdesc # - adapted from yafaray-experimental on AUR # - renamed tarball to avoid collisions # - added missing depends: opencv boost -pkgname='yafaray' -pkgver='3.3.0' -pkgrel='1' -pkgdesc='A free montecarlo raytracing engine.' -arch=('i686' 'x86_64' 'armv7h') -url='http://yafaray.org/' +pkgname=yafaray +pkgver=3.3.0 +pkgrel=2 +pkgdesc="A free open-source montecarlo raytracing engine" +arch=('i686' 'x86_64') +arch+=('armv7h') +url="http://yafaray.org/" license=('LGPL2.1') -depends=('libxml2' 'libjpeg' 'libpng' 'libtiff' 'openexr' 'freetype2' 'zlib' 'opencv' 'boost') -makedepends=('cmake' 'swig' 'python') -optdepends=('python: Python bindings' - 'yafaray-blender-exporter: For rendering in Blender.') -source=("$pkgname-$pkgver.tar.gz::https://github.com/YafaRay/Core/archive/v$pkgver.tar.gz") -md5sums=('ef9b9de4f4aba8588ee00e294c32b0a6') +depends=('boost-libs' 'opencv' 'qt4') +optdepends=('python: For Python bindings' + 'ruby: For Ruby bindings') +makedepends=('cmake' 'boost' 'swig' 'python' 'ruby') +source=("$pkgname-$pkgver.tar.gz::https://github.com/YafaRay/Core/archive/v${pkgver}.tar.gz" + "ruby-archhdrdir.patch") +sha256sums=('e0601f1128383a4dce8e234c46bcc0dcb40839deab4f375e949ad92193619c86' + '7f1fe9814bdc7cf64775541b7e5635aa92fc809464462243fada653935aba3ce') -_srcdir="Core-$pkgver" +prepare() { + cd "${srcdir}/Core-${pkgver}" + + patch -Np1 < "${srcdir}/ruby-archhdrdir.patch" +} build() { - cd "$_srcdir" + cd "${srcdir}/Core-${pkgver}" + + mkdir -p build + cd build - [[ -d build ]] && rm -rf build - mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DYAF_PY_VERSION=3.5 \ - -DYAF_BINDINGS_PY_DIR=/usr/lib/python3.5 .. + -DWITH_QT=ON \ + -DYAF_PY_VERSION=3.7 \ + -DYAF_BINDINGS_PY_DIR=/usr/lib/python3.7/site-packages \ + -DWITH_YAF_RUBY_BINDINGS=ON \ + -DYAF_BINDINGS_RUBY_DIR="$(ruby -e 'print RbConfig::CONFIG["vendorarchdir"]')" .. make } package() { - cd "$_srcdir/build" - make DESTDIR="$pkgdir" install + cd "${srcdir}/Core-${pkgver}/build" + + make DESTDIR="${pkgdir}" install } -# vim:set ts=2 sw=2 et: diff --git a/pcr/yafaray/ruby-archhdrdir.patch b/pcr/yafaray/ruby-archhdrdir.patch new file mode 100644 index 000000000..e412e8e5d --- /dev/null +++ b/pcr/yafaray/ruby-archhdrdir.patch @@ -0,0 +1,12 @@ +diff -aur --no-dereference package.pristine/src/bindings/CMakeLists.txt package.new/src/bindings/CMakeLists.txt +--- package.pristine/src/bindings/CMakeLists.txt 2017-08-22 18:50:42.000000000 +0200 ++++ package.new/src/bindings/CMakeLists.txt 2018-02-06 00:15:44.876654183 +0100 +@@ -150,7 +150,7 @@ + + endif(NOT WIN32) + +- include_directories(${YAF_INCLUDE_DIRS} ${RUBY_INCLUDE_DIR}) ++ include_directories(${YAF_INCLUDE_DIRS} ${RUBY_INCLUDE_DIR} ${RUBY_ARCHHDR_DIR}) + include(${SWIG_USE_FILE}) + + set(CMAKE_SWIG_FLAGS -c++ -w-801) |