diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 21 | ||||
-rw-r--r-- | luxrender-gcc7.patch | 13 |
3 files changed, 30 insertions, 8 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Mon Mar 27 17:55:27 UTC 2017 pkgbase = luxrender-hg pkgdesc = Rendering system for physically correct, unbiased image synthesis - pkgver = 4916+.e8f1c5ff54b0+ + pkgver = 4917+.0f023b130007+ pkgrel = 1 url = http://www.luxrender.net/ arch = x86_64 @@ -1,6 +1,8 @@ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Comaintainer : bartus <aur@bartus.33mail.com> +_pyver=$(python -c "from sys import version_info; print(\"%d.%d\" % (version_info[0],version_info[1]))") pkgname=luxrender-hg -pkgver=4916+.e8f1c5ff54b0+ +pkgver=4917+.0f023b130007+ pkgrel=1 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('x86_64') @@ -17,8 +19,10 @@ makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays-hg" 'python' 'opencl-headers' provides=('luxrender') conflicts=('luxrender') source=('lux::hg+https://bitbucket.org/luxrender/lux#branch=default' - force_python3.diff) + 'luxrender-gcc7.patch' + 'force_python3.diff') md5sums=('SKIP' + 'fa680b0d621b42c8e7440056bf26ec1c' '42692e65eabc5828693e2682e94b7c64') pkgver() { @@ -31,6 +35,12 @@ prepare() { # force use of python 3 with boost_python patch -Np1 < "$srcdir/force_python3.diff" + + # patch for gcc 7 missing argument error + patch -Np1 -i ${srcdir}/luxrender-gcc7.patch + + # remove reference to export_defs.h from liblux.cmake as it was removed from tree + sed -i '/export_defs/d' cmake/liblux.cmake } build() { @@ -39,10 +49,11 @@ build() { cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUX_DOCUMENTATION=OFF \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.6m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.6m/ \ + -DPYTHON_LIBRARIES=/usr/lib/libpython${_pyver}m.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python${_pyver}m/ \ -DCMAKE_EXE_LINKER_FLAGS=-lpthread make } @@ -55,7 +66,7 @@ package() { [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib # install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.6/pylux.so + install -D -m644 pylux.so "$pkgdir"/usr/lib/python${_pyver}/pylux.so } # vim:set ts=2 sw=2 et: diff --git a/luxrender-gcc7.patch b/luxrender-gcc7.patch new file mode 100644 index 000000000000..62dd64428dbe --- /dev/null +++ b/luxrender-gcc7.patch @@ -0,0 +1,13 @@ +--- luxrender-lux-b3f85cf7742f/qtgui/mainwindow.hxx.debug 2016-05-10 06:21:17.000000000 +0900 ++++ luxrender-lux-b3f85cf7742f/qtgui/mainwindow.hxx 2017-03-24 19:42:42.005564560 +0900 +@@ -134,8 +134,8 @@ + public: + QMRUListModel() : QAbstractListModel(), maxCount(0) { } + QMRUListModel(int count, QObject *parent = 0) : QAbstractListModel(parent), maxCount(count) { } +- QMRUListModel(const QMRUListModel<T> &other) +- : maxCount(other.maxCount), mruList(other.mruList), QAbstractListModel(other.parent()) { } ++ //QMRUListModel(const QMRUListModel<T> &other) ++ //: maxCount(other.maxCount), mruList(other.mruList), QAbstractListModel(other.parent()) { } + + int count() const { + return maxCount; |