Skip to content

Commit

Permalink
blender: update to 2.81a.
Browse files Browse the repository at this point in the history
resolves #18567
  • Loading branch information
Johnnynator committed Feb 2, 2020
1 parent 885f73d commit f55ed17
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 75 deletions.
37 changes: 18 additions & 19 deletions srcpkgs/blender/patches/blender-2.78a-musl.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
diff -ru blender-2.78.orig/CMakeLists.txt blender-2.78a/CMakeLists.txt
--- blender-2.78.orig/CMakeLists.txt 2016-10-25 12:09:56.000000000 +0000
+++ blender-2.78a/CMakeLists.txt 2017-02-07 14:50:03.967828817 +0000
@@ -181,6 +181,18 @@
set(_init_SDL OFF)
set(_init_FFTW3 OFF)
set(_init_OPENSUBDIV OFF)
+ # musl-libc related checks (missing execinfo.h, and feenableexcept())
+ include(CheckIncludeFiles)
+ check_include_files(execinfo.h HAVE_EXECINFO_H)
+ if (HAVE_EXECINFO_H)
+ add_definitions(-DHAVE_EXECINFO_H)
+ endif()
--- a/CMakeLists.txt 2019-12-04 12:00:31.000000000 +0100
+++ - 2020-01-26 14:37:19.575701782 +0100
@@ -185,6 +185,18 @@
set(_init_OPENSUBDIV OFF)
set(_init_OPENVDB OFF)
set(_init_OPENIMAGEDENOISE OFF)
+ # musl-libc related checks (missing execinfo.h, and feenableexcept())
+ include(CheckIncludeFiles)
+ check_include_files(execinfo.h HAVE_EXECINFO_H)
+ if (HAVE_EXECINFO_H)
+ add_definitions(-DHAVE_EXECINFO_H)
+ endif()
+
+ include(CheckLibraryExists)
+ check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
+ if (HAVE_FEENABLEEXCEPT)
+ add_definitions(-DHAVE_FEENABLEEXCEPT)
+ endif()
+ include(CheckLibraryExists)
+ check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
+ if (HAVE_FEENABLEEXCEPT)
+ add_definitions(-DHAVE_FEENABLEEXCEPT)
+ endif()
elseif(WIN32)
set(_init_JACK OFF)
set(_init_JACK OFF)
elseif(APPLE)
diff -ru blender-2.78.orig/source/blender/blenlib/intern/system.c blender-2.78a/source/blender/blenlib/intern/system.c
--- blender-2.78.orig/source/blender/blenlib/intern/system.c 2016-10-25 09:59:23.000000000 +0000
Expand Down
50 changes: 0 additions & 50 deletions srcpkgs/blender/patches/ppc.patch

This file was deleted.

15 changes: 9 additions & 6 deletions srcpkgs/blender/template
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Template file for 'blender'
pkgname=blender
version=2.80
version=2.81a
revision=1
build_style="cmake"
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 libopenjpeg-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy"
libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="3D graphics creation suite"
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.gz"
distfiles="https://ftp.halifax.rwth-aachen.de/blender/source/blender-${version}.tar.gz"
checksum=cd9d7e505c1f6e63a4f72366ed04d446859977eeb34cde21283aaea6a304a5c0
distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
checksum=52ac4145cef3d49ca6a36cbc6d009598ca2833143fd6c4f1caba4f5c525680fe
patch_args="-Np1"

pycompile_version="$py3_ver"
Expand All @@ -36,7 +36,10 @@ configure_args="
-DWITH_OPENCOLORIO=ON
-DWITH_IMAGE_OPENEXR=ON
-DWITH_IMAGE_OPENJPEG=ON
-DWITH_OPENSUBDIV=ON
-DWITH_OPENCOLLADA=ON
-DWITH_SYSTEM_GLEW=ON
-DWITH_BUILDINFO=OFF
-DPYTHON_VERSION=$py3_ver
-DPYTHON_LIBPATH=/usr/lib
-DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'
Expand Down

0 comments on commit f55ed17

Please sign in to comment.