From 59cad02d19a88411cedbfc6f8ba21e4cf041321d Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Mon, 25 Jun 2018 14:45:45 -0500
Subject: blender-17:2.79.b.git3.32432d91-1.parabola1: updating version

---
 libre/blender/PKGBUILD | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

(limited to 'libre/blender/PKGBUILD')

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index ac8f31458..abc131793 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -15,14 +15,14 @@
 # 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=32432d91bbec558cbd88e54aece61b0d641c1761
 
 pkgname=blender
 pkgver=2.79.b
-#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=5
-pkgrel+=.parabola2
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
+pkgrel=1
+pkgrel+=.parabola1
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 pkgdesc+=", without nonfree CUDA support"
@@ -35,7 +35,7 @@ depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requ
          'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'alembic'
          'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
          'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb>=5.1' 'openvdb<5.2' 'log4cplus' 'sdl2')
-makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'gcc>=6.3')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm')
 if [[ "$CARCH" == arm* ]]; then
   makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm')
 fi
@@ -55,6 +55,10 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP'
          'SKIP'
+         'da14d7cbdea1ab5499659a066658cdd2'
+         'feea89510de171946c41c6208461f453'
+         '53da216adbc2a9d555a59c15b8f0ef08'
+         '3f9613fcb7ea61214982272e9c20a294'
          'SKIP')
 
 prepare() {
@@ -71,16 +75,10 @@ prepare() {
   # fix OS Name (pedantic, I know)
   sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' 'source/creator/buildinfo.c'
 
-  # 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 has renamed some defines
-  sed -i "s|FF_MIN_BUFFER_SIZE|AV_INPUT_BUFFER_MIN_SIZE|g ;              \
-          s|FF_INPUT_BUFFER_PADDING_SIZE|AV_INPUT_BUFFER_PADDING_SIZE|g" \
-          intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
-  sed -i "s|FF_MIN_BUFFER_SIZE|AV_INPUT_BUFFER_MIN_SIZE|g ;              \
-          s|CODEC_FLAG_GLOBAL_HEADER|AV_CODEC_FLAG_GLOBAL_HEADER|g"      \
-          intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+  patch -Np1 -i "$srcdir"/ffmpeg4.0.patch
+  patch -Np1 -i "$srcdir"/tree_hpp.patch
+  patch -Np1 -i "$srcdir"/util_sseb.patch
+  patch -Np1 -i "$srcdir"/openvdb3-abi.patch
 }
 
 build() {
@@ -89,20 +87,16 @@ build() {
   [[ -d build ]] && rm -rf build
   mkdir build && cd build
 
-  export CFLAGS="${CFLAGS} -DOPENVDB_3_ABI_COMPATIBLE"
-  export CXXFLAGS="${CXXFLAGS} -DOPENVDB_3_ABI_COMPATIBLE"
   cmake -C../build_files/cmake/config/blender_release.cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -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='OFF' \
     -DWITH_CYCLES_DEVICE_CUDA='OFF' \
     -DWITH_CYCLES_PTEX=OFF \
-- 
cgit v1.2.3