From f24fd783ea3112694bb89a2565afb0f3ee7b7cd4 Mon Sep 17 00:00:00 2001
From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com>
Date: Thu, 3 Sep 2020 19:27:19 +0000
Subject: [PATCH 1/4] blender: update to 2.83.5

---
 srcpkgs/blender/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 15c20dbe818..3e6202fe44d 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,6 +1,6 @@
 # Template file for 'blender'
 pkgname=blender
-version=2.83.4
+version=2.83.5
 revision=1
 build_style="cmake"
 makedepends="
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.blender.org"
 distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=86d4361a479fef8a5766a11b002ee2885b3344f84b82b7e49d27f89eff8497f8
+checksum=835ca58f4ff12f21f43ea77ddbabd80cba320952fb2cb39a83a928003ce5ca77
 patch_args="-Np1"
 
 python_version=3

From 067e535a530ea6f8347cec662d1b9c95316dba68 Mon Sep 17 00:00:00 2001
From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com>
Date: Wed, 9 Sep 2020 16:43:52 +0000
Subject: [PATCH 2/4] Update template

---
 srcpkgs/blender/template | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 3e6202fe44d..8774199772c 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -18,34 +18,15 @@ homepage="http://www.blender.org"
 distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
 checksum=835ca58f4ff12f21f43ea77ddbabd80cba320952fb2cb39a83a928003ce5ca77
 patch_args="-Np1"
-
 python_version=3
 pycompile_dirs="/usr/share/blender/$version/scripts"
-
 archs="x86_64* i686* ppc64*"
-configure_args="
--DWITH_INSTALL_PORTABLE=OFF
--DWITH_PYTHON_INSTALL=OFF
--DWITH_JACK=ON
--DWITH_CODEC_FFMPEG=ON
--DWITH_CODEC_SNDFILE=ON
--DWITH_OPENMP=ON
--DWITH_FFTW3=ON
--DWITH_MOD_OCEANSIM=ON
--DWITH_CYCLES=ON
--DWITH_OPENCOLORIO=ON
--DWITH_IMAGE_OPENEXR=ON
--DWITH_IMAGE_OPENJPEG=ON
--DWITH_OPENSUBDIV=ON
--DWITH_OPENCOLLADA=ON
--DWITH_SYSTEM_GLEW=ON
--DWITH_OPENVDB=ON
--DWITH_ALEMBIC=ON
--DWITH_BUILDINFO=OFF
--DPYTHON_VERSION=$py3_ver
--DPYTHON_LIBPATH=/usr/lib
--DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'
--DPYTHON_INCLUDE_DIRS=/$py3_inc"
+configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF -DWITH_JACK=ON -DWITH_CODEC_FFMPEG=ON
+ -DWITH_CODEC_SNDFILE=ON -DWITH_OPENMP=ON -DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON -DWITH_CYCLES=ON
+ -DWITH_OPENCOLORIO=ON -DWITH_IMAGE_OPENEXR=ON -DWITH_IMAGE_OPENJPEG=ON -DWITH_OPENSUBDIV=ON
+ -DWITH_OPENCOLLADA=ON -DWITH_SYSTEM_GLEW=ON -DWITH_OPENVDB=ON -DWITH_ALEMBIC=ON -DWITH_BUILDINFO=OFF
+ -DPYTHON_VERSION=$py3_ver -DPYTHON_LIBPATH=/usr/lib -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'
+ -DPYTHON_INCLUDE_DIRS=/$py3_inc"
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl) # crashes at startup in jemallocs free()

From ec8777ddbfa41944069acae06f17dfa04cabf205 Mon Sep 17 00:00:00 2001
From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com>
Date: Thu, 10 Sep 2020 14:50:45 +0000
Subject: [PATCH 3/4] Update template

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 8774199772c..4dbdd892bff 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -17,7 +17,6 @@ license="GPL-2.0-or-later"
 homepage="http://www.blender.org"
 distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
 checksum=835ca58f4ff12f21f43ea77ddbabd80cba320952fb2cb39a83a928003ce5ca77
-patch_args="-Np1"
 python_version=3
 pycompile_dirs="/usr/share/blender/$version/scripts"
 archs="x86_64* i686* ppc64*"
@@ -27,6 +26,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF -DWITH_JAC
  -DWITH_OPENCOLLADA=ON -DWITH_SYSTEM_GLEW=ON -DWITH_OPENVDB=ON -DWITH_ALEMBIC=ON -DWITH_BUILDINFO=OFF
  -DPYTHON_VERSION=$py3_ver -DPYTHON_LIBPATH=/usr/lib -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'
  -DPYTHON_INCLUDE_DIRS=/$py3_inc"
+patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl) # crashes at startup in jemallocs free()

From 376166bc30671922e0d8ee8167f2b17b2d0adacb Mon Sep 17 00:00:00 2001
From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com>
Date: Thu, 10 Sep 2020 17:00:56 +0000
Subject: [PATCH 4/4] xlint fix

[ci skip]
---
 srcpkgs/blender/template | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 4dbdd892bff..cf5756c84db 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -2,9 +2,16 @@
 pkgname=blender
 version=2.83.5
 revision=1
+archs="x86_64* i686* ppc64*"
 build_style="cmake"
-makedepends="
- libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
+pycompile_dirs="/usr/share/blender/$version/scripts"
+configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF -DWITH_JACK=ON -DWITH_CODEC_FFMPEG=ON
+ -DWITH_CODEC_SNDFILE=ON -DWITH_OPENMP=ON -DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON -DWITH_CYCLES=ON
+ -DWITH_OPENCOLORIO=ON -DWITH_IMAGE_OPENEXR=ON -DWITH_IMAGE_OPENJPEG=ON -DWITH_OPENSUBDIV=ON
+ -DWITH_OPENCOLLADA=ON -DWITH_SYSTEM_GLEW=ON -DWITH_OPENVDB=ON -DWITH_ALEMBIC=ON -DWITH_BUILDINFO=OFF
+ -DPYTHON_VERSION=$py3_ver -DPYTHON_LIBPATH=/usr/lib -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'
+ -DPYTHON_INCLUDE_DIRS=/$py3_inc"
+makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
  glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
  libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
  libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
@@ -18,14 +25,6 @@ homepage="http://www.blender.org"
 distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
 checksum=835ca58f4ff12f21f43ea77ddbabd80cba320952fb2cb39a83a928003ce5ca77
 python_version=3
-pycompile_dirs="/usr/share/blender/$version/scripts"
-archs="x86_64* i686* ppc64*"
-configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF -DWITH_JACK=ON -DWITH_CODEC_FFMPEG=ON
- -DWITH_CODEC_SNDFILE=ON -DWITH_OPENMP=ON -DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON -DWITH_CYCLES=ON
- -DWITH_OPENCOLORIO=ON -DWITH_IMAGE_OPENEXR=ON -DWITH_IMAGE_OPENJPEG=ON -DWITH_OPENSUBDIV=ON
- -DWITH_OPENCOLLADA=ON -DWITH_SYSTEM_GLEW=ON -DWITH_OPENVDB=ON -DWITH_ALEMBIC=ON -DWITH_BUILDINFO=OFF
- -DPYTHON_VERSION=$py3_ver -DPYTHON_LIBPATH=/usr/lib -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'
- -DPYTHON_INCLUDE_DIRS=/$py3_inc"
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in