kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graphics/blender: Fix build with CMake 3.28.2

This commit is contained in:
ryoon 2024-02-11 14:48:14 +00:00
parent 935f6ef887
commit ec7049252d
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/blender/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.215 2024/01/31 21:19:37 ryoon Exp $
# $NetBSD: Makefile,v 1.216 2024/02/11 14:48:14 ryoon Exp $
DISTNAME= blender-4.0.2
CATEGORIES= graphics
@ -50,6 +50,8 @@ CMAKE_ARGS+= -DPYTHON_VERSION=${PYVERSSUFFIX}
CMAKE_ARGS+= -DWITH_PYTHON_INSTALL_NUMPY=OFF
CMAKE_ARGS+= -DWITH_PYTHON_INSTALL_REQUESTS=OFF
CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON
.include "../../graphics/MesaLib/buildlink3.mk"
.if ${MESALIB_SUPPORTS_EGL} == "yes"
#CMAKE_ARGS+= -DWITH_GL_EGL=ON

4
graphics/blender/distinfo
View File

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.72 2024/01/31 21:19:37 ryoon Exp $
$NetBSD: distinfo,v 1.73 2024/02/11 14:48:14 ryoon Exp $
BLAKE2s (blender-4.0.2.tar.xz) = ac0e750c18cb548b93aa634eabe5dfe28ff3a1d34fff2574612dd26de0e4f148
SHA512 (blender-4.0.2.tar.xz) = c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b
Size (blender-4.0.2.tar.xz) = 73281252 bytes
SHA1 (patch-CMakeLists.txt) = edce950efc7e1c3760e19e9bbe671f4194f6675d
SHA1 (patch-CMakeLists.txt) = 5a3977c6a0dfb7524134060c35278f73937488ef
SHA1 (patch-extern_Eigen3_Eigen_src_Core_IO.h) = 791224b988da0383c306e76de5e93cb1cedc960e
SHA1 (patch-extern_glog_src_config.h) = e445c911d4ebb1f7e378c3c46911b55f77ba5608
SHA1 (patch-extern_glog_src_config__netbsd.h) = f379cbcf86bf330d54fbd55cdcb3dbf4b1e7456e

20
graphics/blender/patches/patch-CMakeLists.txt
View File

@ -1,10 +1,20 @@
$NetBSD: patch-CMakeLists.txt,v 1.4 2023/11/08 09:10:30 nros Exp $
$NetBSD: patch-CMakeLists.txt,v 1.5 2024/02/11 14:48:14 ryoon Exp $
CMake 3.28.2 breaks unity build. From: https://projects.blender.org/blender/blender/commit/cf4365e555a759d5b3225bce77858374cb07faad
Enable c++ extensions for alloca on NetBSD
--- CMakeLists.txt.orig 2023-07-05 21:00:26.000000000 +0000
--- CMakeLists.txt.orig 2023-11-02 00:42:24.000000000 +0000
+++ CMakeLists.txt
@@ -1010,6 +1010,7 @@ set(EXETYPE "")
@@ -250,7 +250,7 @@ mark_as_advanced(CPACK_OVERRIDE_PACKAGEN
mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16")
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16" AND NOT ${CMAKE_VERSION} VERSION_EQUAL "3.28.2")
option(WITH_UNITY_BUILD "\
Enable unity build for modules that support it to improve compile times.\n\
WARNING: this option allows files to be built without all necessary headers!\n
@@ -1221,6 +1221,7 @@ set(EXETYPE "")
# C/C++ flags
set(PLATFORM_CFLAGS)
@ -12,7 +22,7 @@ Enable c++ extensions for alloca on NetBSD
# these are added to later on.
set(C_WARNINGS)
@@ -1707,7 +1708,8 @@ set(CMAKE_CXX_STANDARD 17)
@@ -2022,7 +2023,8 @@ set(CMAKE_CXX_STANDARD 17)
# If C++17 is not available, downgrading to an earlier standard is NOT OK.
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Do not enable compiler specific language extensions.
@ -22,7 +32,7 @@ Enable c++ extensions for alloca on NetBSD
# Make MSVC properly report the value of the __cplusplus preprocessor macro
# Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
@@ -1768,7 +1770,7 @@ endif()
@@ -2093,7 +2095,7 @@ endif()
# Include warnings first, so its possible to disable them with user defined flags
# eg: -Wno-uninitialized
set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")