aboutsummaryrefslogtreecommitdiffstats
path: root/testing/blender/0001-musl-fixes.patch
diff options
context:
space:
mode:
authorLeon Marz <lmarz@cs.uni-frankfurt.de>2020-09-01 18:32:43 +0200
committerRasmus Thomsen <oss@cogitri.dev>2020-09-01 21:45:21 +0000
commit0914913f873fd26e51d172d5ac73d6fd878d5036 (patch)
treea398538680c8479433e82a153ddd49c5a5da42de /testing/blender/0001-musl-fixes.patch
parentc67eb1e3f814570445ca1c50ddcb2c6f509340ed (diff)
downloadaports-0914913f873fd26e51d172d5ac73d6fd878d5036.tar.gz
aports-0914913f873fd26e51d172d5ac73d6fd878d5036.tar.bz2
aports-0914913f873fd26e51d172d5ac73d6fd878d5036.tar.xz
testing/blender: upgrade to 2.90.0
Diffstat (limited to 'testing/blender/0001-musl-fixes.patch')
-rw-r--r--testing/blender/0001-musl-fixes.patch42
1 files changed, 21 insertions, 21 deletions
diff --git a/testing/blender/0001-musl-fixes.patch b/testing/blender/0001-musl-fixes.patch
index 5308d7b7ce..52a9e81a9d 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);