CVS commit: pkgsrc/graphics/blender

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Nov  8 09:10:30 UTC 2023

Modified Files:
        pkgsrc/graphics/blender: Makefile distinfo
        pkgsrc/graphics/blender/patches: patch-CMakeLists.txt

Log Message:
blender: turn on c++ extensions using cmake, instead of USE_LANGUAGES


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 pkgsrc/graphics/blender/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/graphics/blender/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/blender/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/blender/Makefile
diff -u pkgsrc/graphics/blender/Makefile:1.207 pkgsrc/graphics/blender/Makefile:1.208
--- pkgsrc/graphics/blender/Makefile:1.207      Tue Nov  7 20:34:51 2023
+++ pkgsrc/graphics/blender/Makefile    Wed Nov  8 09:10:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2023/11/07 20:34:51 nros Exp $
+# $NetBSD: Makefile,v 1.208 2023/11/08 09:10:30 nros Exp $
 
 DISTNAME=      blender-3.6.4
 PKGREVISION=   2
@@ -12,10 +12,7 @@ COMMENT=     Fully integrated 3D graphics cr
 LICENSE=       gnu-gpl-v2
 
 USE_CMAKE=     yes
-USE_LANGUAGES= c gnu++17
-
-# Do not use alloca() in libc.
-BUILDLINK_TRANSFORM+=  rm:-std=c++17
+USE_LANGUAGES= c c++
 
 # GCC 11.0.0 or later is required.
 GCC_REQD+=     12

Index: pkgsrc/graphics/blender/distinfo
diff -u pkgsrc/graphics/blender/distinfo:1.70 pkgsrc/graphics/blender/distinfo:1.71
--- pkgsrc/graphics/blender/distinfo:1.70       Sun Oct 15 19:53:20 2023
+++ pkgsrc/graphics/blender/distinfo    Wed Nov  8 09:10:30 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.70 2023/10/15 19:53:20 ryoon Exp $
+$NetBSD: distinfo,v 1.71 2023/11/08 09:10:30 nros Exp $
 
 BLAKE2s (blender-3.6.4.tar.xz) = ded83757e4ca9dff559dd36b4a59ae0a3d9e95c2f3948b83300f890a91f7dfdb
 SHA512 (blender-3.6.4.tar.xz) = 9121a31147f9f269cb7f64e4297c6a6ec517d37fa449876d1a55b3975562c8a0307730f64725a8e35e96d1e75e06f6f0d95da3d1c7a657c403708e6a8f31115e
 Size (blender-3.6.4.tar.xz) = 70443936 bytes
-SHA1 (patch-CMakeLists.txt) = d6600dbd26b30df21f9dd0b49f4e14287af9f34a
+SHA1 (patch-CMakeLists.txt) = edce950efc7e1c3760e19e9bbe671f4194f6675d
 SHA1 (patch-extern_Eigen3_Eigen_src_Core_IO.h) = 791224b988da0383c306e76de5e93cb1cedc960e
 SHA1 (patch-extern_Eigen3_Eigen_src_Core_arch_CUDA_Half.h) = ee35286558e5590495f1c973ae99ede32048ac38
 SHA1 (patch-extern_glog_src_config.h) = e445c911d4ebb1f7e378c3c46911b55f77ba5608

Index: pkgsrc/graphics/blender/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/blender/patches/patch-CMakeLists.txt:1.3 pkgsrc/graphics/blender/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/graphics/blender/patches/patch-CMakeLists.txt:1.3    Tue Apr 18 14:31:59 2023
+++ pkgsrc/graphics/blender/patches/patch-CMakeLists.txt        Wed Nov  8 09:10:30 2023
@@ -1,8 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2023/04/18 14:31:59 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2023/11/08 09:10:30 nros Exp $
 
---- CMakeLists.txt.orig        2023-02-22 09:20:39.000000000 +0000
+Enable c++ extensions for alloca on NetBSD
+
+--- CMakeLists.txt.orig        2023-07-05 21:00:26.000000000 +0000
 +++ CMakeLists.txt
-@@ -993,6 +993,7 @@ set(EXETYPE "")
+@@ -1010,6 +1010,7 @@ set(EXETYPE "")
  
  # C/C++ flags
  set(PLATFORM_CFLAGS)
@@ -10,7 +12,17 @@ $NetBSD: patch-CMakeLists.txt,v 1.3 2023
  
  # these are added to later on.
  set(C_WARNINGS)
-@@ -1749,7 +1750,7 @@ endif()
+@@ -1707,7 +1708,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.
+-set(CMAKE_CXX_EXTENSIONS OFF)
++# Sorry needed for alloca on NetBSD
++set(CMAKE_CXX_EXTENSIONS ON)
+ 
+ # 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()
  # 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}")