[arch-commits] Commit in luxrender/trunk (PKGBUILD fix_deprecated_native.diff)

[Lukas Jirkovsky]

    Date: Friday, December 29, 2017 @ 20:53:01
  Author: stativ
Revision: 276892

upgpkg: luxrender 1.6-10

boost 1.66 rebuild

Added:
  luxrender/trunk/fix_deprecated_native.diff
Modified:
  luxrender/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   17 ++++++++++-------
 fix_deprecated_native.diff |   12 ++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-29 20:25:48 UTC (rev 276891)
+++ PKGBUILD	2017-12-29 20:53:01 UTC (rev 276892)
@@ -5,7 +5,7 @@
 pkgname=luxrender
 pkgver=1.6
 _pkgver=b3f85cf7742f
-pkgrel=9
+pkgrel=10
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('x86_64')
 url="http://www.luxrender.net/"
@@ -17,17 +17,20 @@
             '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')
+        force_python3.diff luxrender-gcc7.patch fix_deprecated_native.diff)
+sha256sums=('29144f657087644086928a66421df5d25fc4dccd05970200932f5693650ddecf'
+            '916a45aec1326e6990c1ff9f141080c17a33ed793c44d1af9a2dacb9b21c19d2'
+            'e51e33ac85c247696a0cab7751b5e91a23df5dac45af05b9ee68299e4a37dc6d'
+            '0a35caff0cb72fb57c13ba932403849b9280f56506676d0144eceaf13e470209')
 
 prepare() {
   cd "$srcdir"/luxrender-lux-$_pkgver
 
-  patch -Np1 < "$srcdir/force_python3.diff"
+  patch -Np1 < ../force_python3.diff
   # fix build with GCC 7 (Fedora)
-  patch -p1 -i ../luxrender-gcc7.patch
+  patch -Np1 < ../luxrender-gcc7.patch
+  # fix build with boost 1.66 (the deprecated native() method was removed)
+  patch -Np1 < ../fix_deprecated_native.diff
 }
 
 build() {

Added: fix_deprecated_native.diff
===================================================================
--- fix_deprecated_native.diff	                        (rev 0)
+++ fix_deprecated_native.diff	2017-12-29 20:53:01 UTC (rev 276892)
@@ -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);