Date: Friday, December 29, 2017 @ 20:53:12 Author: stativ Revision: 276893
archrelease: copy trunk to community-staging-x86_64 Added: luxrender/repos/community-staging-x86_64/ luxrender/repos/community-staging-x86_64/PKGBUILD (from rev 276892, luxrender/trunk/PKGBUILD) luxrender/repos/community-staging-x86_64/fix_deprecated_native.diff (from rev 276892, luxrender/trunk/fix_deprecated_native.diff) luxrender/repos/community-staging-x86_64/force_python3.diff (from rev 276892, luxrender/trunk/force_python3.diff) luxrender/repos/community-staging-x86_64/luxrender-gcc7.patch (from rev 276892, luxrender/trunk/luxrender-gcc7.patch) ----------------------------+ PKGBUILD | 61 +++++++++++++++++++++++++++++++++++++++++++ fix_deprecated_native.diff | 12 ++++++++ force_python3.diff | 12 ++++++++ luxrender-gcc7.patch | 13 +++++++++ 4 files changed, 98 insertions(+) Copied: luxrender/repos/community-staging-x86_64/PKGBUILD (from rev 276892, luxrender/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-12-29 20:53:12 UTC (rev 276893) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Lukas Jirkovsky <l.jirkov...@gmail.com> +# Contributor: flixie <69...@gmx.net> +# Contributor: Imanol Celaya <ornitorrin...@archlinux-es.org> +pkgname=luxrender +pkgver=1.6 +_pkgver=b3f85cf7742f +pkgrel=10 +pkgdesc="Rendering system for physically correct, unbiased image synthesis" +arch=('x86_64') +url="http://www.luxrender.net/" +license=('GPL') +depends=('boost-libs' 'embree' 'freeimage' 'openexr' 'openimageio' 'libpng' 'opencl-icd-loader' 'libgl' 'fftw') +optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \ + 'python: pylux Python interface' \ + 'amdapp-sdk: OpenCL support for AMD GPUs' \ + 'intel-opencl-runtime: OpenCL support for Intel CPUs') +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') +source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/lux/get/v${pkgver/./}.tar.bz2 \ + force_python3.diff luxrender-gcc7.patch fix_deprecated_native.diff) +sha256sums=('29144f657087644086928a66421df5d25fc4dccd05970200932f5693650ddecf' + '916a45aec1326e6990c1ff9f141080c17a33ed793c44d1af9a2dacb9b21c19d2' + 'e51e33ac85c247696a0cab7751b5e91a23df5dac45af05b9ee68299e4a37dc6d' + '0a35caff0cb72fb57c13ba932403849b9280f56506676d0144eceaf13e470209') + +prepare() { + cd "$srcdir"/luxrender-lux-$_pkgver + + patch -Np1 < ../force_python3.diff + # fix build with GCC 7 (Fedora) + patch -Np1 < ../luxrender-gcc7.patch + # fix build with boost 1.66 (the deprecated native() method was removed) + patch -Np1 < ../fix_deprecated_native.diff +} + +build() { + cd "$srcdir"/luxrender-lux-$_pkgver + + + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=OFF \ + -DPYTHON_CUSTOM=ON \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.6m.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.6m/ \ + -DCMAKE_EXE_LINKER_FLAGS=-lpthread + make +} + +package() { + cd "$srcdir"/luxrender-lux-$_pkgver + make DESTDIR="$pkgdir" install + + # fix library path on x86_64 + [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + + # install pylux + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.6/pylux.so +} + +# vim:set ts=2 sw=2 et: Copied: luxrender/repos/community-staging-x86_64/fix_deprecated_native.diff (from rev 276892, luxrender/trunk/fix_deprecated_native.diff) =================================================================== --- community-staging-x86_64/fix_deprecated_native.diff (rev 0) +++ community-staging-x86_64/fix_deprecated_native.diff 2017-12-29 20:53:12 UTC (rev 276893) @@ -0,0 +1,12 @@ +diff -rup luxrender-lux-b3f85cf7742f.orig/core/renderfarm.cpp luxrender-lux-b3f85cf7742f/core/renderfarm.cpp +--- luxrender-lux-b3f85cf7742f.orig/core/renderfarm.cpp 2016-05-09 23:21:17.000000000 +0200 ++++ luxrender-lux-b3f85cf7742f/core/renderfarm.cpp 2017-12-29 21:34:12.481269755 +0100 +@@ -892,7 +892,7 @@ void RenderFarm::updateFilm(Scene *scene + stream.rdbuf()->set_option(boost::asio::socket_base::keep_alive(true)); + #if defined(__linux__) || defined(__MACOSX__) + // Set keep alive parameters on *nix platforms +- const int nativeSocket = static_cast<int>(stream.rdbuf()->native()); ++ const int nativeSocket = static_cast<int>(stream.rdbuf()->native_handle()); + int optval = 3; // Retry count + const socklen_t optlen = sizeof(optval); + setsockopt(nativeSocket, SOL_TCP, TCP_KEEPCNT, &optval, optlen); Copied: luxrender/repos/community-staging-x86_64/force_python3.diff (from rev 276892, luxrender/trunk/force_python3.diff) =================================================================== --- community-staging-x86_64/force_python3.diff (rev 0) +++ community-staging-x86_64/force_python3.diff 2017-12-29 20:53:12 UTC (rev 276893) @@ -0,0 +1,12 @@ +diff -rup luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake +--- luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake 2013-11-04 22:25:45.000000000 +0100 ++++ luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake 2013-12-05 19:43:23.414625854 +0100 +@@ -156,7 +156,7 @@ IF(MSVC AND BOOST_python_LIBRARYDIR) + SET(BOOST_LIBRARYDIR "${BOOST_python_LIBRARYDIR}") + ENDIF(MSVC AND BOOST_python_LIBRARYDIR) + +-FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python REQUIRED) ++FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python3 REQUIRED) + + IF(MSVC AND BOOST_python_LIBRARYDIR) + SET(BOOST_LIBRARYDIR "${_boost_libdir}") Copied: luxrender/repos/community-staging-x86_64/luxrender-gcc7.patch (from rev 276892, luxrender/trunk/luxrender-gcc7.patch) =================================================================== --- community-staging-x86_64/luxrender-gcc7.patch (rev 0) +++ community-staging-x86_64/luxrender-gcc7.patch 2017-12-29 20:53:12 UTC (rev 276893) @@ -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;