[arch-commits] Commit in luxrender/repos (4 files)

[Antonio Rojas]

    Date: Monday, May 22, 2017 @ 21:21:50
  Author: arojas
Revision: 229333

archrelease: copy trunk to community-staging-x86_64

Added:
  luxrender/repos/community-staging-x86_64/
  luxrender/repos/community-staging-x86_64/PKGBUILD
    (from rev 229332, luxrender/trunk/PKGBUILD)
  luxrender/repos/community-staging-x86_64/force_python3.diff
    (from rev 229332, luxrender/trunk/force_python3.diff)
  luxrender/repos/community-staging-x86_64/luxrender-gcc7.patch
    (from rev 229332, luxrender/trunk/luxrender-gcc7.patch)

----------------------+
 PKGBUILD             |   58 +++++++++++++++++++++++++++++++++++++++++++++++++
 force_python3.diff   |   12 ++++++++++
 luxrender-gcc7.patch |   13 ++++++++++
 3 files changed, 83 insertions(+)

Copied: luxrender/repos/community-staging-x86_64/PKGBUILD (from rev 229332, luxrender/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2017-05-22 21:21:50 UTC (rev 229333)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: flixie <69one at gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
+pkgname=luxrender
+pkgver=1.6
+_pkgver=b3f85cf7742f
+pkgrel=8
+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)
+md5sums=('e40812e4e5a2bb1a58bcbd2a298ba9ee'
+         '42692e65eabc5828693e2682e94b7c64'
+         'fa680b0d621b42c8e7440056bf26ec1c')
+
+prepare() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+
+  patch -Np1 < "$srcdir/force_python3.diff"
+  # fix build with GCC 7 (Fedora)
+  patch -p1 -i ../luxrender-gcc7.patch
+}
+
+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/force_python3.diff (from rev 229332, luxrender/trunk/force_python3.diff)
===================================================================
--- community-staging-x86_64/force_python3.diff	                        (rev 0)
+++ community-staging-x86_64/force_python3.diff	2017-05-22 21:21:50 UTC (rev 229333)
@@ -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 229332, luxrender/trunk/luxrender-gcc7.patch)
===================================================================
--- community-staging-x86_64/luxrender-gcc7.patch	                        (rev 0)
+++ community-staging-x86_64/luxrender-gcc7.patch	2017-05-22 21:21:50 UTC (rev 229333)
@@ -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;