blender: update pkg

1 files changed, 84 insertions, 53 deletions

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 0c12f9ab2..9abd563c5 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor (Arch): John Sowiak <john@archlinux.org>
 # Contributor (Arch): tobias <tobias@archlinux.org>
-# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Maintainer  (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer        : Márcio Silva <coadde@parabola.nu>
 
 # Sometimes blender.org takes some time to release patch releases and because the blender package
 # is broke, we sometimes need to build from git directly.
@@ -11,58 +11,89 @@
 # or simply roll with a new version. I usually choose the latter when the former seems
 # unreasonable.
 
-_git='yes'
-_gitrev='agit1'
-_gittagver='2.78'
-_gittagrev='a'
-_gitaddtagver=$_gittagver$_gittagrev
-_gittratagver=$_gittagver$_gittagrev
-_gitdevtagver=$_gittagver$_gittagrev
-# blender:
-_gitcommit='e8299c81006aba1e4b926c24276ce09d70435371'
-# blender-addons:
-_gitaddonscommit='c0f720c85ee12cd32cd837d6d0006f80b1da36c6'
-# blender-addons-contrib:
-_gitaddonscontribcommit='a52733b58d95ce60ecde95a9eca242e7319c285a'
-# blender-translations:
-_gittranslationscommit='0171e7ca48c845fce040d12a26d314d3c573f9af'
-# blender-dev-tools:
-_gitdevtoolscommit='896c5f78952adb2d091d28c65086d46992dabdac'
+# git:
+_git                    = 'no'
+_gitrev                 = 'git1'
+_gittagver              = '2.78'
+_gittagrev              = 'a'
+_gitaddtagver           = "$_gittagver$_gittagrev"
+_gittratagver           = "$_gittagver"
+_gitdevtagver           = "$_gittagver"
+_gitcommit              = 'e8299c81006aba1e4b926c24276ce09d70435371' # Blender
+_gitaddonscommit        = '7431449db6bd37edb3458f4afbec9034fb1a324c' # Blender Addons
+_gitaddonscontribcommit = 'f91d5e88b5b6fe7d2d7e75f95fe0bab2a99169d6' # Blender Addons Contrib
+_gittranslationscommit  = '0171e7ca48c845fce040d12a26d314d3c573f9af' # Blender Translation
+_gitdevtoolscommit      = '896c5f78952adb2d091d28c65086d46992dabdac' # Blender Dev Tools
 
-pkgbase='blender'
-pkgname=("${pkgbase}" "${pkgbase}-addon-gimp" "${pkgbase}-addon-povray")
-[[ "${_git}" = 'yes' ]] &&					pkgver="${_gittagver}.${_gitrev}.${_gitcommit::7}"	# git commit
-[[ "${_git}" = 'no'  ]] && [[ -z "${_gittagrev}"   ]] &&	pkgver="${_gittagver}"					# official release
-[[ "${_git}" = 'no'  ]] && [[ "${#_gittagrev}" > 1 ]] &&	pkgver="${_gittagver}${_gittagrev/-/}"			# release candidate
-[[ "${_git}" = 'no'  ]] && [[ "${#_gittagrev}" = 1 ]] &&	pkgver="${_gittagver}.${_gittagrev}"			# revision
-pkgrel='2.parabola2'
-epoch='17'
-_jpgver='1.5'
-_llvmver='3.5'
-_povver='3.7'
-_pyver='3.5'
-pkgdesc='A fully integrated 3D graphics creation suite, without nonfree CUDA support'
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL')
-url="http://www.${pkgbase}.org"
-depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freeglut' 'freetype2'
-         'glew' 'hicolor-icon-theme' 'jack' 'jemalloc' 'libpng' 'libsndfile' 'libspnav'
-         'libtiff' 'log4cplus' 'openal' 'opencolorio' 'opencollada' 'openexr'
-         'openimageio' 'openjpeg' 'openshadinglanguage' 'opensubdiv' 'openvdb'
-         'python' 'python-requests' 'sdl2' 'shared-mime-info' 'xdg-utils') # 'ptex' has been disabled since building fails
-makedepends=('boost' 'cmake' 'git' 'llvm35' 'mesa') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n)
-options=('!strip')
-[[ "${_git}" = 'no'  ]] && source=("${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#tag=v${_gittagver}${_gittagrev}"				# blender
-                                   "${pkgbase}-addons-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-addons.git#tag=v${_gitaddtagver}"				# addons for blender
-                                   "${pkgbase}-translations-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-translations.git#tag=v${_gittratagver}"		# translations for blender
-                                   "${pkgbase}-dev-tools-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-dev-tools.git#tag=v${_gitdevtagver}")			# devel tools for blender
-[[ "${_git}" = 'yes' ]] && source=("${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#commit=${_gitcommit}"						# blender
-                                   "${pkgbase}-addons-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-addons.git#commit=${_gitaddonscommit}"			# addons for blender
-                                   "${pkgbase}-translations-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-translations.git#commit=${_gittranslationscommit}"	# translations for blender
-                                   "${pkgbase}-dev-tools-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-dev-tools.git#commit=${_gitdevtoolscommit}")		# devel tools for blender
-source+=("git://git.${pkgbase}.org/${pkgbase}-addons-contrib.git#commit=${_gitaddonscontribcommit}"								# addons contrib for blender
-         "git://git.${pkgbase}.org/scons.git")															# scons
-md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+# JPEG/LLVM/PovRay/Python version:
+_jpgver         =  '1.5'
+_llvmver        =  '3.5'
+_povver         =  '3.7'
+_pyver          =  '3.5'
+
+pkgbase         =  'blender'
+pkgname         =  ("${pkgbase}" "${pkgbase}-addon-gimp" "${pkgbase}-addon-povray")
+
+# pkgver:
+if [[ "${_git}" = 'yes' ]] then
+  pkgver="${_gittagver}.${_gitrev}.${_gitcommit::7}"	# Git Commit
+elif [[ "${_git}" = 'no'  ]] then
+  [[ -z "${_gittagrev}"   ]] && \
+    pkgver="${_gittagver}"				# Official Release
+  [[ "${#_gittagrev}" > 1 ]] && \
+    pkgver="${_gittagver}${_gittagrev/-/}"		# Release Candidate
+  [[ "${#_gittagrev}" = 1 ]] && \
+    pkgver="${_gittagver}.${_gittagrev}"		# Revision
+fi
+
+pkgrel		=  '3.parabola1'
+epoch		=  '17'
+pkgdesc		=  'A fully integrated 3D graphics creation suite, without nonfree CUDA support'
+arch		=  ('i686' 'x86_64' 'armv7h')
+license		=  ('GPL')
+url		=  "http://www.${pkgbase}.org"
+depends		=  ('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freeglut' 'freetype2'
+		    'glew' 'hicolor-icon-theme' 'jack' 'jemalloc' 'libpng' 'libsndfile' 'libspnav'
+		    'libtiff' 'log4cplus' 'openal' 'opencolorio' 'opencollada' 'openexr'
+		    'openimageio' 'openjpeg' 'openshadinglanguage' 'opensubdiv' 'openvdb'
+		    'python' 'python-requests' 'sdl2' 'shared-mime-info' 'xdg-utils')
+		  # 'ptex' has been disabled since building fails
+makedepends	=  ('boost' 'cmake' 'git' 'llvm35' 'mesa')
+		  # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n)
+options		=  ('!strip')
+
+# source:
+if [[ "${_git}" = 'no'  ]] then
+  source	=  (
+    # Blender
+    "${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#tag=v${_gittagver}${_gittagrev}"
+    # Blender addons
+    "${pkgbase}-addons-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-addons.git#tag=v${_gitaddtagver}"
+    # Blender translations
+    "${pkgbase}-translations-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-translations.git#tag=v${_gittratagver}"
+    # Blender Devel Tools
+    "${pkgbase}-dev-tools-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-dev-tools.git#tag=v${_gitdevtagver}"
+  )
+elif [[ "${_git}" = 'yes' ]] then
+  source	=  (
+    # Blender
+    "${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#commit=${_gitcommit}"
+    # Blender addons
+    "${pkgbase}-addons-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-addons.git#commit=${_gitaddonscommit}"
+    # Blender translations
+    "${pkgbase}-translations-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-translations.git#commit=${_gittranslationscommit}"
+    # Blender Devel Tools
+    "${pkgbase}-dev-tools-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-dev-tools.git#commit=${_gitdevtoolscommit}"
+  )
+fi
+source		+= (
+  # Blender Addons Contrib
+  "git://git.${pkgbase}.org/${pkgbase}-addons-contrib.git#commit=${_gitaddonscontribcommit}"
+  # Scons
+  "git://git.${pkgbase}.org/scons.git"
+)
+
+md5sums		=  ('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"