From 0178674ffac7742e8d6256a91b323c95a7858409 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Fri, 25 May 2018 15:04:25 -0400
Subject: [blender]: rebuild against openvdb=5.1 - fails to build

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

(limited to 'libre')

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 1436ea6f6..ac8f31458 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor (Arch): John Sowiak <john@archlinux.org>
 # Contributor (Arch): tobias <tobias@archlinux.org>
@@ -23,7 +22,7 @@ pkgname=blender
 pkgver=2.79.b
 #[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
 pkgrel=5
-pkgrel+=.parabola1
+pkgrel+=.parabola2
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 pkgdesc+=", without nonfree CUDA support"
@@ -35,8 +34,8 @@ depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requ
          'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg' 'python-numpy'
          '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')
+         'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb>=5.1' 'openvdb<5.2' 'log4cplus' 'sdl2')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'gcc>=6.3')
 if [[ "$CARCH" == arm* ]]; then
   makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm')
 fi
@@ -74,6 +73,14 @@ prepare() {
 
   # 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
 }
 
 build() {
-- 
cgit v1.2.3