From b7f587bb0ab6c2fa78b188dc7fb446c8ae7d74a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 24 Sep 2022 13:37:54 +0700 Subject: [PATCH] blender: update to 3.3.0. --- srcpkgs/blender/patches/0001-musl-fixes.patch | 65 +++++++++---------- .../patches/0002-fix-linking-issue.patch | 13 ++-- srcpkgs/blender/patches/altivec-all.patch | 6 +- .../patches/no-Werror-double-promotion.patch | 19 +++--- srcpkgs/blender/template | 17 ++--- 5 files changed, 59 insertions(+), 61 deletions(-) diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch index 0e64369b4379..330c91397349 100644 --- a/srcpkgs/blender/patches/0001-musl-fixes.patch +++ b/srcpkgs/blender/patches/0001-musl-fixes.patch @@ -15,11 +15,11 @@ Original patch by Nathanael Copa 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 @@ +Index: blender-3.3.0/intern/guardedalloc/intern/mallocn_intern.h +=================================================================== +--- blender-3.3.0.orig/intern/guardedalloc/intern/mallocn_intern.h ++++ blender-3.3.0/intern/guardedalloc/intern/mallocn_intern.h +@@ -17,7 +17,7 @@ #undef HAVE_MALLOC_STATS #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ @@ -28,29 +28,31 @@ index aa95615..f7e347d 100644 defined(__GLIBC__) # include # 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 @@ +Index: blender-3.3.0/intern/libc_compat/libc_compat.c +=================================================================== +--- blender-3.3.0.orig/intern/libc_compat/libc_compat.c ++++ blender-3.3.0/intern/libc_compat/libc_compat.c +@@ -13,8 +13,6 @@ # include # include --# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31) +-# if defined(__GLIBC_PREREQ) +-# if __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) +@@ -113,6 +111,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 8e3d489..4d0789b 100644 ---- a/source/blender/blenlib/intern/system.c -+++ b/source/blender/blenlib/intern/system.c -@@ -35,7 +35,9 @@ +-# endif /* __GLIBC_PREREQ(2, 31) */ +-# endif /* __GLIBC_PREREQ */ + #endif /* __linux__ */ +Index: blender-3.3.0/source/blender/blenlib/intern/system.c +=================================================================== +--- blender-3.3.0.orig/source/blender/blenlib/intern/system.c ++++ blender-3.3.0/source/blender/blenlib/intern/system.c +@@ -21,7 +21,9 @@ # include "BLI_winstuff.h" #else @@ -60,7 +62,7 @@ index 8e3d489..4d0789b 100644 # include #endif -@@ -80,7 +82,7 @@ void BLI_system_backtrace(FILE *fp) +@@ -63,7 +65,7 @@ void BLI_system_backtrace(FILE *fp) { /* ------------- */ /* Linux / Apple */ @@ -69,11 +71,11 @@ index 8e3d489..4d0789b 100644 # 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 eeaebd3..93a77a2 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) +Index: blender-3.3.0/source/blender/gpu/GPU_vertex_buffer.h +=================================================================== +--- blender-3.3.0.orig/source/blender/gpu/GPU_vertex_buffer.h ++++ blender-3.3.0/source/blender/gpu/GPU_vertex_buffer.h +@@ -133,7 +133,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GP { unsigned char *data = a->data; a->data += a->stride; @@ -81,11 +83,11 @@ index eeaebd3..93a77a2 100644 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) +Index: blender-3.3.0/source/creator/creator_signals.c +=================================================================== +--- blender-3.3.0.orig/source/creator/creator_signals.c ++++ blender-3.3.0/source/creator/creator_signals.c +@@ -258,7 +258,7 @@ void main_signal_setup_fpe(void) * set breakpoints on sig_handle_fpe */ signal(SIGFPE, sig_handle_fpe); @@ -94,6 +96,3 @@ index 29e12a9..d90da8f 100644 feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); # endif /* defined(__linux__) && defined(__GNUC__) */ # if defined(OSX_SSE_FPE) --- -2.30.1 - diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch index 28683714e126..139bc7fd1dbd 100644 --- a/srcpkgs/blender/patches/0002-fix-linking-issue.patch +++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch @@ -9,17 +9,14 @@ 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) +Index: blender-3.3.0/intern/ghost/CMakeLists.txt +=================================================================== +--- blender-3.3.0.orig/intern/ghost/CMakeLists.txt ++++ blender-3.3.0/intern/ghost/CMakeLists.txt +@@ -562,5 +562,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.30.1 - diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch index 115e1ea6fd03..a504207d2bcc 100644 --- a/srcpkgs/blender/patches/altivec-all.patch +++ b/srcpkgs/blender/patches/altivec-all.patch @@ -1,8 +1,10 @@ This applies a better workaround for C++ type conflicts in AltiVec/C++, allowing it to build on BE ppc(64). ---- a/extern/clew/include/clew.h -+++ b/extern/clew/include/clew.h +Index: blender-3.3.0/extern/clew/include/clew.h +=================================================================== +--- blender-3.3.0.orig/extern/clew/include/clew.h ++++ blender-3.3.0/extern/clew/include/clew.h @@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum; /* Define basic vector types */ diff --git a/srcpkgs/blender/patches/no-Werror-double-promotion.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch index 2d17a6da1818..0710abe513fe 100644 --- a/srcpkgs/blender/patches/no-Werror-double-promotion.patch +++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch @@ -1,11 +1,14 @@ ---- ./intern/cycles/CMakeLists.txt.orig 2021-04-16 20:47:50.466754473 +0200 -+++ ./intern/cycles/CMakeLists.txt 2021-04-16 20:48:06.199903232 +0200 -@@ -336,7 +336,7 @@ endif() - # Warnings - if(CMAKE_COMPILER_IS_GNUCXX) +Index: blender-3.3.0/intern/cycles/kernel/CMakeLists.txt +=================================================================== +--- blender-3.3.0.orig/intern/cycles/kernel/CMakeLists.txt ++++ blender-3.3.0/intern/cycles/kernel/CMakeLists.txt +@@ -947,9 +947,7 @@ endif() + # Warnings to avoid using doubles in the kernel. + if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER_ID MATCHES "Clang") ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") -+ #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") unset(_has_cxxflag_float_conversion) - unset(_has_cxxflag_double_promotion) +- unset(_has_cxxflag_double_promotion) + endif() + + cycles_add_library(cycles_kernel "${LIB}" diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 28befed1faf8..2a59b9c32599 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender -version=3.0.0 -revision=5 +version=3.3.0 +revision=1 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" @@ -19,26 +19,23 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel opencolorio-devel opencollada-devel python3-numpy libXrender-devel OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel - pugixml-devel libXxf86vm-devel" + pugixml-devel libXxf86vm-devel gmp-devel gmpxx-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="3D graphics creation suite" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://www.blender.org" distfiles="https://download.blender.org/source/blender-${version}.tar.xz" -checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb +checksum=22c51a4e66385cb14818aa4d76dcf7fa6d6e103afb0d36916e12ea15988d21f0 python_version=3 -CXXFLAGS="-DNDEBUG" -CFLAGS="$CXXFLAGS" LDFLAGS="-Wl,-z,stack-size=2097152" # Blender tests are executed against a system installation of blender. This # is currently not supported by xbps-src. make_check=no -case "$XBPS_TARGET_MACHINE" in - *-musl) ;; - *) makedepends+=" jemalloc-devel" ;; -esac +if [ "$XBPS_TARGET_LIBC" != musl ]; then + makedepends+=" jemalloc-devel" +fi case "$XBPS_TARGET_MACHINE" in x86_64*)