[arch-commits] Commit in blender/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Friday, May 11, 2018 @ 14:24:07
  Author: svenstaro
Revision: 320781

upgpkg: blender 17:2.79.b.git1.0385b33f0b3e389ea2a82c4b6bb181c684f0511a-10

Modified:
  blender/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-11 14:08:06 UTC (rev 320780)
+++ PKGBUILD	2018-05-11 14:24:07 UTC (rev 320781)
@@ -11,13 +11,13 @@
 # or simply roll with a new version. I usually choose the latter when the former seems
 # unreasonable.
 
- _gittag=v2.79b
-#_gitcommit=3c3d0898b0c1a1d7da70f4a1778d4360b3cfe5c8
+# _gittag=v2.79b
+_gitcommit=0385b33f0b3e389ea2a82c4b6bb181c684f0511a
 
 pkgname=blender
 pkgver=2.79.b
-#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=8
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
+pkgrel=10
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -28,7 +28,7 @@
          'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'alembic'
          'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
          'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2')
-makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'gcc6' 'cuda')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda')
 optdepends=('cuda: cycles renderer cuda support')
 options=(!strip)
 source=("git://git.blender.org/blender-addons.git"
@@ -35,8 +35,7 @@
         "git://git.blender.org/blender-addons-contrib.git"
         "git://git.blender.org/blender-translations.git"
         "git://git.blender.org/blender-dev-tools.git"
-        "git://git.blender.org/scons.git"
-        ffmpeg4.0.patch)
+        "git://git.blender.org/scons.git")
 if [[ -n $_gittag ]]; then
     source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
 elif [[ -n $_gitcommit ]]; then
@@ -47,7 +46,6 @@
          'SKIP'
          'SKIP'
          'SKIP'
-         'da14d7cbdea1ab5499659a066658cdd2'
          'SKIP')
 
 prepare() {
@@ -61,14 +59,8 @@
   git config submodule."scons".url ${srcdir}/scons
   git submodule update
 
-  # cuda 9.1 fixes
-  sed -i -e "s/sm_20;//" -e "s/sm_21;//" build_files/cmake/config/blender_release.cmake
-
-  # openvdb 5 fix
-  sed -i "s/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER == 3/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER >= 3/g" intern/openvdb/intern/openvdb_writer.cc
-
-  # ffmpeg 4.0 fixes
-  patch -Np1 -i "${srcdir}"/ffmpeg4.0.patch
+  # Fix installation of modules
+  sed -i "144i\ \ \ \ pass" release/scripts/addons_contrib/np_station/np_point_dimension.py
 }
 
 build() {
@@ -85,12 +77,10 @@
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_PYTHON_INSTALL=OFF \
     -DOPENIMAGEIO_ROOT_DIR=/usr \
-    -DWITH_LLVM=ON \
     -DWITH_SYSTEM_OPENJPEG=ON \
     -DWITH_GL_PROFILE_CORE=OFF \
     -DWITH_GL_PROFILE_ES20=OFF \
-    -DLLVM_VERSION=3.6 \
-    -DLLVM_STATIC=ON \
+    -DWITH_LLVM=ON \
     -DWITH_CYCLES_CUDA_BINARIES=ON \
     -DWITH_CYCLES_PTEX=OFF \
     -DPYTHON_VERSION=3.6 \