pcr/yafaray: updated to 3.3.0

2 files changed, 23 insertions, 41 deletions

diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index fe09f7343..260d7ff0c 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,46 +1,42 @@
-# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>
-# Contributor (AUR): Thomas Ascher <thomas.ascher@gmx.at>
+# Maintainer (AUR): AppleBloom <rat.o.drat@gmail.com>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 
 # parabola changes and rationale:
 #  - removed "open source" term from pkgdesc
-
-pkgname=yafaray
-pkgver=0.1.5
-pkgrel=2
-pkgdesc="A free montecarlo raytracing engine"
-arch=('i686' 'x86_64')
-url="http://yafaray.org/"
+#  - 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/'
 license=('LGPL2.1')
-depends=('openexr' 'qt4')
-optdepends=('python: Python bindings')
+depends=('libxml2' 'libjpeg' 'libpng' 'libtiff' 'openexr' 'freetype2' 'zlib' 'opencv' 'boost')
 makedepends=('cmake' 'swig' 'python')
-source=("https://github.com/YafaRay/Core/archive/${pkgver}.tar.gz"
-        "std_namespace_usage.patch")
-md5sums=('31202a7bee930b2698c665ef6513bd7b'
-         'a98b23496e975bf91f9d97092d794d0c')
-
-prepare() {
-  cd "${srcdir}/Core-${pkgver}"
+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')
 
-  patch -Np1 < "${srcdir}/std_namespace_usage.patch"
-}
+_srcdir="Core-$pkgver"
 
 build() {
-  cd "${srcdir}/Core-${pkgver}"
+  cd "$_srcdir"
 
-  # Delete the build directory if it exists to avoid confusion caused by CMake's caches
-  test -d build && rm -rf 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.4 ..
+        -DYAF_BINDINGS_PY_DIR=/usr/lib/python3.5 ..
   make
 }
 
 package() {
-  cd "${srcdir}/Core-${pkgver}/build"
-
-  make DESTDIR="${pkgdir}" install
+  cd "$_srcdir/build"
+  make DESTDIR="$pkgdir" install
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/yafaray/std_namespace_usage.patch b/pcr/yafaray/std_namespace_usage.patch
deleted file mode 100644
index b6e580674..000000000
--- a/pcr/yafaray/std_namespace_usage.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -aur package.pristine/include/core_api/color.h package.new/include/core_api/color.h
---- package.pristine/include/core_api/color.h	2016-09-17 09:48:53.039092315 +0200
-+++ package.new/include/core_api/color.h	2016-09-17 09:52:04.724350559 +0200
-@@ -53,8 +53,8 @@
- 		color_t(CFLOAT g) { R=G=B=g; }
- 		color_t(CFLOAT af[3]) { R=af[0];  G=af[1];  B=af[2]; }
- 		bool isBlack() const { return ((R==0) && (G==0) && (B==0)); }
--		bool isNaN() const { return (isnan(R) || isnan(G) || isnan(B)); }
--		bool isInf() const { return (isinf(R) || isinf(G) || isinf(B)); }
-+		bool isNaN() const { return (std::isnan(R) || std::isnan(G) || std::isnan(B)); }
-+		bool isInf() const { return (std::isinf(R) || std::isinf(G) || std::isinf(B)); }
- 		~color_t() {}
- 		void set(CFLOAT r, CFLOAT g, CFLOAT b) { R=r;  G=g;  B=b; }
-