patch agains boot>1.55

3 files changed, 27 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a15cc91579d..43795dd175a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = luxrender-hg
 	pkgdesc = Rendering system for physically correct, unbiased image synthesis
-	pkgver = 4917+.0f023b130007+
-	pkgrel = 1
+	pkgver = 4918+.f56582df55f4+
+	pkgrel = 2
 	url = http://www.luxrender.net/
 	arch = x86_64
 	license = GPL
@@ -30,9 +30,11 @@ pkgbase = luxrender-hg
 	provides = luxrender
 	conflicts = luxrender
 	source = lux::hg+https://bitbucket.org/luxrender/lux#branch=default
+	source = boost-15500.patch
 	source = luxrender-gcc7.patch
 	source = force_python3.diff
 	md5sums = SKIP
+	md5sums = b9e5c442093e69485752e6395c931b27
 	md5sums = fa680b0d621b42c8e7440056bf26ec1c
 	md5sums = 42692e65eabc5828693e2682e94b7c64
 
diff --git a/PKGBUILD b/PKGBUILD
index 300d36e18c64..ff1056fd4c7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # 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=4917+.0f023b130007+
-pkgrel=1
+pkgver=4918+.f56582df55f4+
+pkgrel=2
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('x86_64')
 url="http://www.luxrender.net/"
@@ -19,9 +19,11 @@ makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays-hg" 'python' 'opencl-headers'
 provides=('luxrender')
 conflicts=('luxrender')
 source=('lux::hg+https://bitbucket.org/luxrender/lux#branch=default'
+        'boost-15500.patch'
         'luxrender-gcc7.patch'
         'force_python3.diff')
 md5sums=('SKIP'
+         'b9e5c442093e69485752e6395c931b27'
          'fa680b0d621b42c8e7440056bf26ec1c'
          '42692e65eabc5828693e2682e94b7c64')
 
@@ -41,13 +43,17 @@ prepare() {
   
   # remove reference to export_defs.h from liblux.cmake as it was removed from tree
   sed -i '/export_defs/d' cmake/liblux.cmake
+  
+  # fix deprecated function in boost,asio,basic_stream_socket::native() replace with native_handle()
+  patch -Np1 -i ${srcdir}/boost-15500.patch
 }
 
 build() {
   cd "$srcdir/lux"
+  mkdir -p build
+  cd build
 
-
-  cmake . \
+  cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUX_DOCUMENTATION=OFF \
     -DLUXRAYS_DISABLE_OPENCL=OFF \
@@ -59,7 +65,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/lux"
+  cd "$srcdir/lux/build"
   make DESTDIR="$pkgdir" install
 
   # fix library path on x86_64
diff --git a/boost-15500.patch b/boost-15500.patch
new file mode 100644
index 000000000000..fd6fb40e3d37
--- /dev/null
+++ b/boost-15500.patch
@@ -0,0 +1,12 @@
+diff -r f56582df55f4 core/renderfarm.cpp
+--- a/core/renderfarm.cpp	Sun Jul 23 13:46:05 2017 +0200
++++ b/core/renderfarm.cpp	Thu Mar 22 10:38:17 2018 +0100
+@@ -892,7 +892,7 @@
+ 			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);