[arch-commits] Commit in luxrays/trunk (PKGBUILD force_python3.diff)

[Lukas Jirkovsky]

    Date: Sunday, May 29, 2016 @ 15:16:13
  Author: stativ
Revision: 177421

upgpkg: luxrays 1.6-1

update to 1.6

Modified:
  luxrays/trunk/PKGBUILD
  luxrays/trunk/force_python3.diff

--------------------+
 PKGBUILD           |   19 ++++++++++++-------
 force_python3.diff |   10 +++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-29 10:47:49 UTC (rev 177420)
+++ PKGBUILD	2016-05-29 13:16:13 UTC (rev 177421)
@@ -1,30 +1,32 @@
 # $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 pkgname='luxrays'
-pkgver=1.5.1
-_pkgver=8577ff287efb
-pkgrel=2
+pkgver=1.6
+_pkgver=61352e6aae3f
+pkgrel=1
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
 depends=('embree' 'libcl' 'libgl' 'openimageio')
-makedepends=('boost' 'cmake' 'freetype2' 'libpng' 'mesa' 'opencl-headers' 'glew' 'freeglut')
+makedepends=('boost' 'cmake' 'freetype2' 'gtk3' 'libpng' 'mesa' 'opencl-headers' 'glew' 'freeglut')
 optdepends=('opencl-nvidia: OpenCL support for nVidia GPUs' \
             'amdapp-sdk: OpenCL support for AMD GPUs' \
             'intel-opencl-runtime: OpenCL support for Intel CPUs' \
             'glew: demos (SmallLuxGPU etc.)' \
+            'gtk3: luxcoreui'
             'freeglut: demos (SmallLuxGPU etc.)' \
             'boost-libs: demos (SmallLuxGPU etc.)')
 options=('staticlibs')
-source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2 \
+source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/luxrender_v$pkgver.tar.bz2 \
         force_python3.diff)
-md5sums=('2d6619e33fb4df237ba239b944e00e68'
-         '3bfb5594a709d1ea772866d66904b8fd')
+md5sums=('4c8df34d90dc04b50a180b945041cd92'
+         '36c9823246c2b575415c1709e065727c')
 
 prepare() {
   cd "$srcdir"/luxrender-luxrays-$_pkgver
 
+  # force python3 for boost
   patch -Np1 < "$srcdir/force_python3.diff" || true
 }
 
@@ -35,6 +37,9 @@
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
     -DLUXRAYS_DISABLE_OPENCL=OFF
+  # this sucks, but luxrays doesn't seem to honor  CMAKE_*_LINKER_FLAGS
+  # thanks bartus from AUR for the fix
+  for file in `grep lboost_python -l -R ` ;do sed -i 's/$/ -lpython3/' $file ; done
   make
 }
 

Modified: force_python3.diff
===================================================================
--- force_python3.diff	2016-05-29 10:47:49 UTC (rev 177420)
+++ force_python3.diff	2016-05-29 13:16:13 UTC (rev 177421)
@@ -1,12 +1,12 @@
-diff -rup luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake
---- luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake	2015-01-20 23:45:32.000000000 +0100
-+++ luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake	2015-02-15 22:19:40.775351414 +0100
+diff -rup luxrender-luxrays-61352e6aae3f.orig/cmake/Dependencies.cmake luxrender-luxrays-61352e6aae3f/cmake/Dependencies.cmake
+--- luxrender-luxrays-61352e6aae3f.orig/cmake/Dependencies.cmake	2016-05-09 22:17:57.000000000 +0200
++++ luxrender-luxrays-61352e6aae3f/cmake/Dependencies.cmake	2016-05-29 09:04:30.913648230 +0200
 @@ -58,7 +58,7 @@ set(Boost_MINIMUM_VERSION       "1.44.0"
  
  set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0")
  
--set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python)
-+set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python3)
+-set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python chrono)
++set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python3 chrono)
  find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS})
  if (NOT Boost_FOUND)
          # Try again with the other type of libs