diff options
| -rw-r--r-- | testing/blender/0001-musl-fixes.patch | 42 | ||||
| -rw-r--r-- | testing/blender/0002-fix-linking-issue.patch | 8 | ||||
| -rw-r--r-- | testing/blender/APKBUILD | 12 |
3 files changed, 32 insertions, 30 deletions
diff --git a/testing/blender/0001-musl-fixes.patch b/testing/blender/0001-musl-fixes.patch index 5308d7b7ce3..52a9e81a9d8 100644 --- a/testing/blender/0001-musl-fixes.patch +++ b/testing/blender/0001-musl-fixes.patch @@ -1,6 +1,6 @@ -From 5c8801d48bb1c2d528df9d653fbf96f27ac263a9 Mon Sep 17 00:00:00 2001 +From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001 From: Leon Marz <lmarz@cs.uni-frankfurt.de> -Date: Fri, 31 Jul 2020 15:30:32 +0200 +Date: Tue, 1 Sep 2020 09:09:50 +0200 Subject: [PATCH 1/2] musl fixes Original Patch by Nathanael Copa @@ -13,7 +13,7 @@ Original Patch by Nathanael Copa 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83f547e..8ec3c86 100644 +index cee8675..111e6e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,6 +138,19 @@ get_blender_version() @@ -33,14 +33,14 @@ index 83f547e..8ec3c86 100644 + add_definitions(-DHAVE_FEENABLEEXCEPT) +endif() + - # First platform specific non-cached vars - if(UNIX AND NOT (APPLE OR HAIKU)) - set(WITH_X11 ON) + # Blender internal features + option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON) + mark_as_advanced(WITH_BLENDER) diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h -index 876607f..ed12118 100644 +index 8fc3e43..ee443c4 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h -@@ -40,7 +40,7 @@ +@@ -33,7 +33,7 @@ #undef HAVE_MALLOC_STATS #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ @@ -50,7 +50,7 @@ index 876607f..ed12118 100644 # include <malloc.h> # define HAVE_MALLOC_STATS diff --git a/intern/libc_compat/libc_compat.c b/intern/libc_compat/libc_compat.c -index 8da3ca2..be17416 100644 +index 78e387e..d21c281 100644 --- a/intern/libc_compat/libc_compat.c +++ b/intern/libc_compat/libc_compat.c @@ -25,7 +25,6 @@ @@ -60,20 +60,20 @@ index 8da3ca2..be17416 100644 -# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31) double __exp_finite(double x); - double __acos_finite(double x); -@@ -112,5 +111,4 @@ float __powf_finite(float x, float y) + double __exp2_finite(double x); +@@ -124,5 +123,4 @@ float __powf_finite(float x, float y) return powf(x, y); } -# endif /* __GLIBC_PREREQ */ #endif /* __linux__ */ diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c -index 7d9ed25..71777e7 100644 +index 20edbb9..6e856cd 100644 --- a/source/blender/blenlib/intern/system.c +++ b/source/blender/blenlib/intern/system.c -@@ -38,7 +38,9 @@ - # include <dbghelp.h> - # pragma warning(pop) +@@ -35,7 +35,9 @@ + + # include "BLI_winstuff.h" #else +#if defined(HAVE_EXECINFO_H) # include <execinfo.h> @@ -81,20 +81,20 @@ index 7d9ed25..71777e7 100644 # include <unistd.h> #endif -@@ -81,7 +83,7 @@ void BLI_system_backtrace(FILE *fp) +@@ -80,7 +82,7 @@ void BLI_system_backtrace(FILE *fp) { /* ------------- */ /* Linux / Apple */ --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__linux__) && defined(HAVE_EXECINFO_H)|| defined(__APPLE__) +-# if defined(__linux__) || defined(__APPLE__) ++# if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__) - # define SIZE 100 + # define SIZE 100 void *buffer[SIZE]; diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c -index 7f7a03f..68ab04d 100644 +index ad0b7b2..01d5e37 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c -@@ -332,7 +332,7 @@ void main_signal_setup_fpe(void) +@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void) * set breakpoints on sig_handle_fpe */ signal(SIGFPE, sig_handle_fpe); diff --git a/testing/blender/0002-fix-linking-issue.patch b/testing/blender/0002-fix-linking-issue.patch index f580313a336..76d117de3b9 100644 --- a/testing/blender/0002-fix-linking-issue.patch +++ b/testing/blender/0002-fix-linking-issue.patch @@ -1,6 +1,6 @@ -From 8d48da9c40a7a91f2147fa4d4e108aeb18e69335 Mon Sep 17 00:00:00 2001 +From 5fb1a42c9efd281fac0e2775211fb140fbea1f06 Mon Sep 17 00:00:00 2001 From: Leon Marz <lmarz@cs.uni-frankfurt.de> -Date: Fri, 31 Jul 2020 18:12:48 +0200 +Date: Tue, 1 Sep 2020 09:11:18 +0200 Subject: [PATCH 2/2] fix linking issue --- @@ -8,10 +8,10 @@ Subject: [PATCH 2/2] fix linking issue 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt -index 68fc963..561baa7 100644 +index 77e777d..da33241 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt -@@ -405,5 +405,5 @@ if(WITH_XR_OPENXR) +@@ -466,5 +466,5 @@ if(WITH_XR_OPENXR) endif() add_definitions(${GL_DEFINITIONS}) diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD index 70fbb50e7dc..69c98a4785e 100644 --- a/testing/blender/APKBUILD +++ b/testing/blender/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Mark Riedesel <mark@klowner.com> +# Contributor: Leon Marz <lmarz@cs.uni-frankfurt.de> # Maintainer: Mark Riedesel <mark@klowner.com> pkgname=blender -pkgver=2.83.5 +pkgver=2.90.0 _pkgver=${pkgver%.[0-9]} pkgrel=0 pkgdesc="3D Creation/Animation/Publishing System" url="https://www.blender.org/" -arch="x86_64" # only on x86_64, mainly because of openimageio +arch="x86_64" # only on x86_64, mainly because of alembic license="GPL-2.0-or-later" depends="blender-shared=$pkgver-r$pkgrel" makedepends="cmake libx11-dev libjpeg-turbo-dev libpng-dev freetype-dev python3-dev @@ -49,6 +50,7 @@ _build() { -DWITH_SYSTEM_LZO=ON \ -DWITH_SYSTEM_EIGEN3=ON \ -DWITH_SYSTEM_GLEW=ON \ + -DWITH_CYCLES_EMBREE=OFF \ -DPYTHON_VERSION=$_py_version cmake --build . } @@ -97,6 +99,6 @@ python() { ln -s /usr/share/blender/"$_pkgver" "$subpkgdir"/usr/lib/python"$_py_version"/site-packages/"$_pkgver" } -sha512sums="6179b4c285d40f59b7701cafe8d2cca5d764ef15b5c390c42cfb7cf8a41704b09a4e62fcf644d76bd2b7f47bcfc96395f0afa4a1d748c4c2ba8dfdee7356df9f blender-2.83.5.tar.xz -aadee6f3767a225e766ae9d32d7459c776f1bc2cf9f3e37e63983d44e0e3f7525c33abe95f7c3b956b0bb87beff84d148032e6e3c6003b4338f0a64668c737af 0001-musl-fixes.patch -c626ed61534879250c30e39aead32d605a72843dea8f24843f25548ad3109efa9f4363c81a320165427522395f3e9dff4861b5f74f31b1f2b3fe8d93e57c43ae 0002-fix-linking-issue.patch" +sha512sums="9fc3e423bb13f3b983deba130febf8cc870a65c7d87fff8d9536a54ab606d097cccf46cdd518b15ab483fdf85551fde607b28801c3dbe681c841d7594fcbc57e blender-2.90.0.tar.xz +0f7ec7aa64bcfaec87677c660432e523fa2c75a0ac35cfc58d8baa7f461e19168e3457bc439fad3c5152c70aa5f48b0291dff50e06506fbd6ae9fac4fff37c1c 0001-musl-fixes.patch +9ccc155e469d6c87b73b68e8effebe90e70ad0dba15954da0c0f9b50ab82dd43ffd66b8c94554dff61d765ddd27fec30655c24ae555eb50863433c8bf3611922 0002-fix-linking-issue.patch" |