git: 4e159d4c047a - main - cad/sweethome3d: update Sweet Home 3D to version 7.5

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4e159d4c047aae753164f4a0ad7eda90caf4067f

commit 4e159d4c047aae753164f4a0ad7eda90caf4067f
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2026-10-04 04:43:34 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2026-10-04 04:43:34 +0000

    cad/sweethome3d: update Sweet Home 3D to version 7.5
    
    - Mitigate long-standing "Surface not cachable" error
      by running with -Dsun.java2d.opengl=true (alternative
      setting -Dsun.java2d.xrender=false should also work)
    - Drop -Xmx1024m from Java options, it made sense when
      default MaxHeapSize value was half the available RAM
      with a minimum of 16 MB and a maximum of 512 MB, but
      had been changed around 2020 to 25% physical memory
      up to 25 GB, so this adjustment is no longer needed
    - Prepare YafaRay renderer for modern CMake while here
    
    JDK issue:      https://bugs.openjdk.org/browse/JDK-8201631
    PR:             274849
    Reported by:    portscout
---
 cad/sweethome3d/Makefile                |  4 ++--
 cad/sweethome3d/distinfo                |  6 +++---
 cad/sweethome3d/files/patch-build.xml   | 10 +++++-----
 cad/sweethome3d/files/sweethome3d.sh.in |  3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index 325cb76df571..ee3bd29f2a8c 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	sweethome3d
-PORTVERSION=	7.1
-PORTREVISION=	3
+PORTVERSION=	7.5
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
@@ -41,6 +40,7 @@ build-yafaray:
 		${WRKSRC_yr}/CMakeConfig/UserConfig.template \
 		> ${WRKSRC_yr}/CMakeConfig/UserConfig.txt
 	cd ${WRKSRC_yr} && cmake \
+		-DCMAKE_POLICY_VERSION_MINIMUM:STRING=3.5 \
 		-DUSER_INSTALL_PREFIX:PATH=${BUILD_WRKSRC}/build/yafaray \
 		. && ${MAKE_CMD} VERBOSE=1 install
 	${MV} ${BUILD_WRKSRC}/build/yafaray/lib/* ${BUILD_WRKSRC}/lib/yafaray
diff --git a/cad/sweethome3d/distinfo b/cad/sweethome3d/distinfo
index a6e208492924..8f007b922520 100644
--- a/cad/sweethome3d/distinfo
+++ b/cad/sweethome3d/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1677865269
-SHA256 (SweetHome3D-7.1-src.zip) = 04b7453410ec918971cf69aeb5d0a8d1284369ffe544f8d49e8b81d2bd39b2a2
-SIZE (SweetHome3D-7.1-src.zip) = 45819131
+TIMESTAMP = 1724255242
+SHA256 (SweetHome3D-7.5-src.zip) = 735ce7c7b7291873432397b97ac341ef60499c1a47a108d64212c1ab91712c6d
+SIZE (SweetHome3D-7.5-src.zip) = 50128977
 SHA256 (puybaret-libYafaRay-ef20db1_GH0.tar.gz) = cbb9266cdc102395763abe02918097504d0f7c057883c0d9cb6aaf0af6a83d6f
 SIZE (puybaret-libYafaRay-ef20db1_GH0.tar.gz) = 1137154
diff --git a/cad/sweethome3d/files/patch-build.xml b/cad/sweethome3d/files/patch-build.xml
index 88ab2adcf8d1..79b1a2aeed47 100644
--- a/cad/sweethome3d/files/patch-build.xml
+++ b/cad/sweethome3d/files/patch-build.xml
@@ -1,15 +1,15 @@
---- build.xml.orig	2022-07-13 08:03:06 UTC
+--- build.xml.orig	2023-09-22 06:22:54 UTC
 +++ build.xml
-@@ -512,7 +512,6 @@ -->
+@@ -530,7 +530,6 @@
        <zipfileset src="build/Help.jar"/>
        <fileset dir="lib">
          <include name="*.jar"/>
 -        <include name="macosx/*.jar"/>
          <include name="java3d-1.6/*.jar"/>
+         <include name="java3d-1.6/i586/gluegen-rt.jar"/>
          <exclude name="java3d-1.6/jogl-all.jar"/>
-       </fileset>
-@@ -520,15 +519,8 @@ -->
-         <include name="java3d-1.6/jogl-java3d.jar"/>
+@@ -540,15 +539,8 @@
+         <include name="java3d-1.6/i586/jogl-java3d.jar"/>
        </fileset>
        <fileset dir="lib">
 -        <include name="windows/**/*.dll"/>
diff --git a/cad/sweethome3d/files/sweethome3d.sh.in b/cad/sweethome3d/files/sweethome3d.sh.in
index 1584b6778854..01fdb37df903 100644
--- a/cad/sweethome3d/files/sweethome3d.sh.in
+++ b/cad/sweethome3d/files/sweethome3d.sh.in
@@ -2,5 +2,6 @@
 
 JAVA="%%LOCALBASE%%/bin/java"
 SH3D_JAR="%%JAVALIBDIR%%/%%JARNAME%%"
+JAVA_OPTIONS="-Dsun.java2d.opengl=true" # or -Dsun.java2d.xrender=false
 
-JAVA_VERSION=%%JAVA_VERSION%% exec "${JAVA}" -Xmx1024m -jar "${SH3D_JAR}" "$@"
+JAVA_VERSION=%%JAVA_VERSION%% exec "${JAVA}" "${JAVA_OPTIONS}" -jar "${SH3D_JAR}" "$@"