diff options
Diffstat (limited to 'testing/blender')
| -rw-r--r-- | testing/blender/0001-musl-fixes.patch | 96 | ||||
| -rw-r--r-- | testing/blender/0002-fix-linking-issue.patch | 23 | ||||
| -rw-r--r-- | testing/blender/0003-increase-thread-stack-size-for-musl.patch | 48 | ||||
| -rw-r--r-- | testing/blender/APKBUILD | 146 |
4 files changed, 0 insertions, 313 deletions
diff --git a/testing/blender/0001-musl-fixes.patch b/testing/blender/0001-musl-fixes.patch deleted file mode 100644 index 8ca03d433ce..00000000000 --- a/testing/blender/0001-musl-fixes.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 9f5cd19b34c6357d0473f61b8b4d13b28c3e8b6c Mon Sep 17 00:00:00 2001 -From: Leon Marz <lmarz@cs.uni-frankfurt.de> -Date: Wed, 25 Nov 2020 10:10:41 +0100 -Subject: [PATCH 1/3] musl fixes - -Original patch by Nathanael Copa ---- - intern/guardedalloc/intern/mallocn_intern.h | 2 +- - intern/libc_compat/libc_compat.c | 2 -- - source/blender/blenlib/intern/system.c | 4 +++- - source/blender/gpu/GPU_vertex_buffer.h | 1 - - source/creator/creator_signals.c | 2 +- - 5 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h -index aa95615..f7e347d 100644 ---- a/intern/guardedalloc/intern/mallocn_intern.h -+++ b/intern/guardedalloc/intern/mallocn_intern.h -@@ -33,7 +33,7 @@ - #undef HAVE_MALLOC_STATS - #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ - --#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ -+#if defined(__linux__) && !defined(__MUSL__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ - defined(__GLIBC__) - # include <malloc.h> - # define HAVE_MALLOC_STATS -diff --git a/intern/libc_compat/libc_compat.c b/intern/libc_compat/libc_compat.c -index 78e387e..d21c281 100644 ---- a/intern/libc_compat/libc_compat.c -+++ b/intern/libc_compat/libc_compat.c -@@ -25,7 +25,6 @@ - # include <features.h> - # include <math.h> - --# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31) - - double __exp_finite(double x); - 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 f4110c6..f5a32c5 100644 ---- a/source/blender/blenlib/intern/system.c -+++ b/source/blender/blenlib/intern/system.c -@@ -35,7 +35,9 @@ - - # include "BLI_winstuff.h" - #else -+#if !defined(__MUSL__) - # include <execinfo.h> -+#endif - # include <unistd.h> - #endif - -@@ -80,7 +82,7 @@ void BLI_system_backtrace(FILE *fp) - { - /* ------------- */ - /* Linux / Apple */ --# if defined(__linux__) || defined(__APPLE__) -+# if defined(__linux__) && !defined(__MUSL__) || defined(__APPLE__) - - # define SIZE 100 - void *buffer[SIZE]; -diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h -index aae58de..0a3a627 100644 ---- a/source/blender/gpu/GPU_vertex_buffer.h -+++ b/source/blender/gpu/GPU_vertex_buffer.h -@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a) - { - unsigned char *data = a->data; - a->data += a->stride; -- BLI_assert(data < a->_data_end); - return (void *)data; - } - -diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c -index 29e12a9..d90da8f 100644 ---- a/source/creator/creator_signals.c -+++ b/source/creator/creator_signals.c -@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void) - * set breakpoints on sig_handle_fpe */ - signal(SIGFPE, sig_handle_fpe); - --# if defined(__linux__) && defined(__GNUC__) -+# if defined(__linux__) && defined(__GNUC__) && !defined(__MUSL__) - feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); - # endif /* defined(__linux__) && defined(__GNUC__) */ - # if defined(OSX_SSE_FPE) --- -2.31.1 - diff --git a/testing/blender/0002-fix-linking-issue.patch b/testing/blender/0002-fix-linking-issue.patch deleted file mode 100644 index 2eac80f9e58..00000000000 --- a/testing/blender/0002-fix-linking-issue.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 38035cf0b6f9a8af1938930d151973687d4ba561 Mon Sep 17 00:00:00 2001 -From: Leon Marz <lmarz@cs.uni-frankfurt.de> -Date: Tue, 1 Sep 2020 09:11:18 +0200 -Subject: [PATCH 2/3] fix linking issue - ---- - intern/ghost/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt -index 1739659..d6b442b 100644 ---- a/intern/ghost/CMakeLists.txt -+++ b/intern/ghost/CMakeLists.txt -@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR) - endif() - - add_definitions(${GL_DEFINITIONS}) -- -+list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender") - blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") --- -2.31.1 - diff --git a/testing/blender/0003-increase-thread-stack-size-for-musl.patch b/testing/blender/0003-increase-thread-stack-size-for-musl.patch deleted file mode 100644 index 8ff94b94638..00000000000 --- a/testing/blender/0003-increase-thread-stack-size-for-musl.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7c5e611332e97d1678e4c32de84ad3dad1cc81a7 Mon Sep 17 00:00:00 2001 -From: Damian Kurek <starfire24680@gmail.com> -Date: Sun, 22 Nov 2020 02:03:11 +0100 -Subject: [PATCH 3/3] increase thread stack size for musl - ---- - intern/cycles/util/util_thread.cpp | 4 ++-- - intern/cycles/util/util_thread.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/intern/cycles/util/util_thread.cpp b/intern/cycles/util/util_thread.cpp -index cccde5a..4bf62d5 100644 ---- a/intern/cycles/util/util_thread.cpp -+++ b/intern/cycles/util/util_thread.cpp -@@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN - - thread::thread(function<void()> run_cb, int node) : run_cb_(run_cb), joined_(false), node_(node) - { --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__MUSL__) - /* Set the stack size to 2MB to match Linux. The default 512KB on macOS is - * too small for Embree, and consistent stack size also makes things more - * predictable in general. */ -@@ -56,7 +56,7 @@ void *thread::run(void *arg) - bool thread::join() - { - joined_ = true; --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__MUSL__) - return pthread_join(pthread_id, NULL) == 0; - #else - try { -diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h -index 29f9bec..58a63ce 100644 ---- a/intern/cycles/util/util_thread.h -+++ b/intern/cycles/util/util_thread.h -@@ -56,7 +56,7 @@ class thread { - - protected: - function<void()> run_cb_; --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__MUSL__) - pthread_t pthread_id; - #else - std::thread std_thread; --- -2.31.1 - diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD deleted file mode 100644 index d70e73525e7..00000000000 --- a/testing/blender/APKBUILD +++ /dev/null @@ -1,146 +0,0 @@ -# Contributor: Mark Riedesel <mark@klowner.com> -# Contributor: Leon Marz <main@lmarz.org> -# Maintainer: Leon Marz <main@lmarz.org> -pkgname=blender -pkgver=2.93.1 -_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 openvdb -license="GPL-2.0-or-later" -depends="blender-shared=$pkgver-r$pkgrel" -makedepends="cmake - alembic-dev - blosc-dev - boost-dev - eigen-dev - embree-dev - embree-static - ffmpeg-dev - fftw-dev - freetype-dev - glew-dev - gmp-dev - jack-dev - libharu-dev - libjpeg-turbo-dev - libpng-dev - libsndfile-dev - libtbb-dev - libx11-dev - libxi-dev - libxrender-dev - llvm11-dev - lzo-dev - openal-soft-dev - opencolorio-dev - openexr-dev - openimageio-dev - openjpeg-dev - opensubdiv-dev - openvdb-dev - openxr-dev - osl - osl-dev - potrace-dev - pugixml-dev - pulseaudio-dev - py3-numpy-dev - python3-dev - sdl2-dev - tiff-dev - " -subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless py3-$pkgname:python" -source="https://download.blender.org/source/blender-$pkgver.tar.xz - 0001-musl-fixes.patch - 0002-fix-linking-issue.patch - 0003-increase-thread-stack-size-for-musl.patch - " - - -build() { - # Headless - mkdir -p "$builddir"/build-headless - cd "$builddir"/build-headless - _build -C../build_files/cmake/config/blender_headless.cmake - - # Full - mkdir -p "$builddir"/build-full - cd "$builddir"/build-full - _build -C../build_files/cmake/config/blender_full.cmake - - # Python module - mkdir -p "$builddir"/build-py - cd "$builddir"/build-py - _build -C../build_files/cmake/config/bpy_module.cmake -} - -_build() { - local _py_version=$(python3 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))') - - export CFLAGS="$CFLAGS -D__MUSL__" - export CXXFLAGS="$CXXFLAGS -D__MUSL__" - - cmake .. "$@" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -DWITH_PYTHON_INSTALL=OFF \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_SYSTEM_LZO=ON \ - -DWITH_SYSTEM_EIGEN3=ON \ - -DWITH_SYSTEM_GLEW=ON \ - -DPYTHON_VERSION=$_py_version - cmake --build . -} - -package() { - # Install headless files - cd "$builddir"/build-headless - DESTDIR="$pkgdir"/headless cmake --install . - - # Rename the headless blender to blender-headless - mkdir -p "$pkgdir"/usr/bin - mv "$pkgdir"/headless/usr/bin/blender "$pkgdir"/usr/bin/blender-headless - rm -rf "$pkgdir"/headless - - # Install python module - cd "$builddir"/build-py - DESTDIR="$pkgdir" cmake --install . - - # Install the full package - cd "$builddir"/build-full - DESTDIR="$pkgdir" cmake --install . -} - -shared() { - pkgdesc="Blender shared runtime data and add-on scripts" - mkdir -p "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/blender "$subpkgdir"/usr/share/ -} - -headless() { - pkgdesc="$pkgdesc (headless build)" - depends="blender-shared=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/blender-headless "$subpkgdir"/usr/bin/ -} - -python() { - local _py_version=$(python3 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))') - - pkgdesc="Blender modules for Python 3" - mkdir -p "$subpkgdir"/usr/lib/python"$_py_version"/site-packages - mv "$pkgdir"/usr/lib/python"$_py_version"/site-packages/bpy.so "$subpkgdir"/usr/lib/python"$_py_version"/site-packages/ - rm -rf "$pkgdir"/usr/lib - - # Symlink to the blender-shared files - ln -s /usr/share/blender/"$_pkgver" "$subpkgdir"/usr/lib/python"$_py_version"/site-packages/"$_pkgver" -} - -sha512sums=" -b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1 blender-2.93.1.tar.xz -9a26ddc83d03fb24a03d567d134a30425b84d290e2d36f7bf4d5644b1d0a78a46f44c512550c1663d4c5ed5a316763446ff2da4cae2c63822f33f354fb7e6a05 0001-musl-fixes.patch -aa3ac2d938e7182fde2ee9219f55c02f1447781f679a28b651f377f0b27f885a063b5bcbe6f8bafd80e4259b0f1e8e21c08cef05d54930b4aa828b818e1d1cee 0002-fix-linking-issue.patch -8b305ad69ead11b12f08bfd55796cdb4560d04953ac2817d687c599a2179f7525a74a86f7b3d292832b002cf4075c7e1e7e2c164bb71ad977b917ec850e756f7 0003-increase-thread-stack-size-for-musl.patch -" |