[arch-commits] Commit in luxrender/repos/community-x86_64 (8 files)
Bruno Pagani
archange at archlinux.org
Tue Jun 5 23:41:10 UTC 2018
Date: Tuesday, June 5, 2018 @ 23:41:07
Author: archange
Revision: 340688
archrelease: copy trunk to community-x86_64
Added:
luxrender/repos/community-x86_64/PKGBUILD
(from rev 340687, luxrender/trunk/PKGBUILD)
luxrender/repos/community-x86_64/fix_deprecated_native.diff
(from rev 340687, luxrender/trunk/fix_deprecated_native.diff)
luxrender/repos/community-x86_64/force_python3.diff
(from rev 340687, luxrender/trunk/force_python3.diff)
luxrender/repos/community-x86_64/luxrender-gcc7.patch
(from rev 340687, luxrender/trunk/luxrender-gcc7.patch)
Deleted:
luxrender/repos/community-x86_64/PKGBUILD
luxrender/repos/community-x86_64/fix_deprecated_native.diff
luxrender/repos/community-x86_64/force_python3.diff
luxrender/repos/community-x86_64/luxrender-gcc7.patch
----------------------------+
PKGBUILD | 118 +++++++++++++++++++++----------------------
fix_deprecated_native.diff | 24 ++++----
force_python3.diff | 24 ++++----
luxrender-gcc7.patch | 26 ++++-----
4 files changed, 96 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-05 23:40:41 UTC (rev 340687)
+++ PKGBUILD 2018-06-05 23:41:07 UTC (rev 340688)
@@ -1,59 +0,0 @@
-# $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=13
-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')
-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-x86_64/PKGBUILD (from rev 340687, luxrender/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-05 23:41:07 UTC (rev 340688)
@@ -0,0 +1,59 @@
+# $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=15
+pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+arch=('x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'embree2' 'freeimage' 'openexr' 'openimageio' 'libpng' 'opencl-icd-loader' 'libgl' 'fftw')
+optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI'
+ 'python: pylux Python interface')
+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:
Deleted: fix_deprecated_native.diff
===================================================================
--- fix_deprecated_native.diff 2018-06-05 23:40:41 UTC (rev 340687)
+++ fix_deprecated_native.diff 2018-06-05 23:41:07 UTC (rev 340688)
@@ -1,12 +0,0 @@
-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-x86_64/fix_deprecated_native.diff (from rev 340687, luxrender/trunk/fix_deprecated_native.diff)
===================================================================
--- fix_deprecated_native.diff (rev 0)
+++ fix_deprecated_native.diff 2018-06-05 23:41:07 UTC (rev 340688)
@@ -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);
Deleted: force_python3.diff
===================================================================
--- force_python3.diff 2018-06-05 23:40:41 UTC (rev 340687)
+++ force_python3.diff 2018-06-05 23:41:07 UTC (rev 340688)
@@ -1,12 +0,0 @@
-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-x86_64/force_python3.diff (from rev 340687, luxrender/trunk/force_python3.diff)
===================================================================
--- force_python3.diff (rev 0)
+++ force_python3.diff 2018-06-05 23:41:07 UTC (rev 340688)
@@ -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}")
Deleted: luxrender-gcc7.patch
===================================================================
--- luxrender-gcc7.patch 2018-06-05 23:40:41 UTC (rev 340687)
+++ luxrender-gcc7.patch 2018-06-05 23:41:07 UTC (rev 340688)
@@ -1,13 +0,0 @@
---- 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;
Copied: luxrender/repos/community-x86_64/luxrender-gcc7.patch (from rev 340687, luxrender/trunk/luxrender-gcc7.patch)
===================================================================
--- luxrender-gcc7.patch (rev 0)
+++ luxrender-gcc7.patch 2018-06-05 23:41:07 UTC (rev 340688)
@@ -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;
More information about the arch-commits
mailing list