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

[Lukas Jirkovsky]

    Date: Thursday, December 5, 2013 @ 19:55:26
  Author: stativ
Revision: 102140

luxrender: force python3 when building pylux. This fixes an "ImportError" in blender

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-05 18:50:50 UTC (rev 102139)
+++ PKGBUILD	2013-12-05 18:55:26 UTC (rev 102140)
@@ -18,9 +18,17 @@
             'amdstream: OpenCL support for AMD GPUs' \
             'intel-opencl-sdk: OpenCL support for Intel CPUs')
 makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
-md5sums=('cbe749f56a1e1976745f5458100efa8a')
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
+        force_python3.diff)
+md5sums=('cbe749f56a1e1976745f5458100efa8a'
+         '42692e65eabc5828693e2682e94b7c64')
 
+prepare() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+
+  patch -Np1 < "$srcdir/force_python3.diff" || true
+}
+
 build() {
   cd "$srcdir"/luxrender-lux-$_pkgver
 

Added: force_python3.diff
===================================================================
--- force_python3.diff	                        (rev 0)
+++ force_python3.diff	2013-12-05 18:55:26 UTC (rev 102140)
@@ -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}")