From owner-dev-commits-ports-all@freebsd.org Mon May 10 06:28:42 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8ADB62D944; Mon, 10 May 2021 06:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FdrjQ5qVlz4n7P; Mon, 10 May 2021 06:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B6BD81F5FA; Mon, 10 May 2021 06:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14A6Sg2r041332; Mon, 10 May 2021 06:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14A6SgVY041331; Mon, 10 May 2021 06:28:42 GMT (envelope-from git) Date: Mon, 10 May 2021 06:28:42 GMT Message-Id: <202105100628.14A6SgVY041331@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: a0ae802e304a - main - - Update Sweet Home 3D to the latest version 6.5.2 - Simplify the way we look for `libj3dcore-ogl.so' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0ae802e304a4bcae0ca4cc9242bc06e1f6b1a7b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 May 2021 06:28:42 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0ae802e304a4bcae0ca4cc9242bc06e1f6b1a7b commit a0ae802e304a4bcae0ca4cc9242bc06e1f6b1a7b Author: Alexey Dokuchaev AuthorDate: 2021-05-10 06:15:48 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-05-10 06:27:35 +0000 - Update Sweet Home 3D to the latest version 6.5.2 - Simplify the way we look for `libj3dcore-ogl.so' Reported by: portscout (about version 6.5) --- cad/sweethome3d/Makefile | 3 +- cad/sweethome3d/distinfo | 6 +- cad/sweethome3d/files/patch-build.xml | 4 +- ...com_eteks_sweethome3d_SweetHome3DBootstrap.java | 153 ++------------------- 4 files changed, 16 insertions(+), 150 deletions(-) diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile index 6e919aeb5b9e..80015c94eea5 100644 --- a/cad/sweethome3d/Makefile +++ b/cad/sweethome3d/Makefile @@ -1,8 +1,7 @@ # Created by: Matthias Petermann PORTNAME= sweethome3d -PORTVERSION= 6.4.2 -PORTREVISION= 1 +PORTVERSION= 6.5.2 CATEGORIES= cad java MASTER_SITES= SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/ DISTNAME= SweetHome3D-${PORTVERSION}-src diff --git a/cad/sweethome3d/distinfo b/cad/sweethome3d/distinfo index 0687116e52c7..44bea243ab27 100644 --- a/cad/sweethome3d/distinfo +++ b/cad/sweethome3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1596915925 -SHA256 (SweetHome3D-6.4.2-src.zip) = 59e6f4d6ef48cbbf4eeffd53c034a3a4aa24af75edec04a0b20244b273528b73 -SIZE (SweetHome3D-6.4.2-src.zip) = 27417764 +TIMESTAMP = 1619200022 +SHA256 (SweetHome3D-6.5.2-src.zip) = e3323f078e49c72e575e2e771f1586a7c18475b42ea32982abb27756b7a81dc8 +SIZE (SweetHome3D-6.5.2-src.zip) = 27550405 diff --git a/cad/sweethome3d/files/patch-build.xml b/cad/sweethome3d/files/patch-build.xml index 7947104c76fd..887430040876 100644 --- a/cad/sweethome3d/files/patch-build.xml +++ b/cad/sweethome3d/files/patch-build.xml @@ -1,6 +1,6 @@ --- build.xml.orig 2017-02-01 12:42:14 UTC +++ build.xml -@@ -237,12 +237,6 @@ +@@ -271,12 +271,6 @@ @@ -8,7 +8,7 @@ - - - -- +- - diff --git a/cad/sweethome3d/files/patch-src_com_eteks_sweethome3d_SweetHome3DBootstrap.java b/cad/sweethome3d/files/patch-src_com_eteks_sweethome3d_SweetHome3DBootstrap.java index d6540609344e..ec57412c2e9d 100644 --- a/cad/sweethome3d/files/patch-src_com_eteks_sweethome3d_SweetHome3DBootstrap.java +++ b/cad/sweethome3d/files/patch-src_com_eteks_sweethome3d_SweetHome3DBootstrap.java @@ -1,145 +1,12 @@ --- src/com/eteks/sweethome3d/SweetHome3DBootstrap.java.orig 2020-04-15 10:23:38 UTC +++ src/com/eteks/sweethome3d/SweetHome3DBootstrap.java -@@ -54,117 +54,31 @@ public class SweetHome3DBootstrap { - String operatingSystemName = System.getProperty("os.name"); - String javaVersion = System.getProperty("java.version"); - String java7Prefix = "1.7.0_"; -- if (operatingSystemName.startsWith("Mac OS X")) { -- if (javaVersion.startsWith("1.6") -- && System.getProperty("com.eteks.sweethome3d.deploymentInformation", "").startsWith("Java Web Start")) { -- // Refuse to let Sweet Home 3D run under Mac OS X with Java Web Start 6 -- String message = Locale.getDefault().getLanguage().equals(Locale.FRENCH.getLanguage()) -- ? "Sweet Home 3D ne peut pas fonctionner avec Java\n" -- + "Web Start 6 sous Mac OS X de façon fiable.\n" -- + "Merci de télécharger le programme d'installation depuis\n" -- + "http://www.sweethome3d.com/fr/download.jsp" -- : "Sweet Home 3D can't reliably run with Java Web Start 6\n" -- + "under Mac OS X.\n" -- + "Please download the installer version from\n" -- + "http://www.sweethome3d.com/download.jsp"; -- JOptionPane.showMessageDialog(null, message); -- System.exit(1); -- } else if (javaVersion.startsWith("1.5") -- || javaVersion.startsWith("1.6")) { -- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { -- "j3dcore.jar", // Main Java 3D jars -- "vecmath.jar", -- "j3dutils.jar", -- "macosx/gluegen-rt.jar", // Mac OS X jars and DLLs for Java 5 or 6 -- "macosx/jogl.jar", -- "macosx/libgluegen-rt.jnilib", -- "macosx/libjogl.jnilib", -- "macosx/libjogl_awt.jnilib", -- "macosx/libjogl_cg.jnilib"})); -- } else if (javaVersion.startsWith(java7Prefix) -- && javaVersion.length() >= java7Prefix.length() + 1 -- && Character.isDigit(javaVersion.charAt(java7Prefix.length())) -- && (javaVersion.length() >= java7Prefix.length() + 2 // Test version on 2 digits -- && Character.isDigit(javaVersion.charAt(java7Prefix.length() + 1)) -- && Integer.parseInt(javaVersion.substring(java7Prefix.length(), java7Prefix.length() + 2)) < 40 -- || javaVersion.length() == java7Prefix.length() + 1 // Test whether version is on 1 digit (i.e. < 40) -- || !Character.isDigit(javaVersion.charAt(java7Prefix.length() + 1)))) { -- // Refuse to let Sweet Home 3D run under Mac OS X with Java 7 before version 7u40 -- String message = Locale.getDefault().getLanguage().equals(Locale.FRENCH.getLanguage()) -- ? "Sous Mac OS X, Sweet Home 3D ne peut fonctionner avec Java 7\n" -- + "qu'à partir de la version Java 7u40. Merci de mettre à jour\n" -- + "votre version de Java ou de lancer Sweet Home 3D sous Java 6." -- : "Under Mac OS X, Sweet Home 3D can run with Java 7 only\n" -- + "from version Java 7u40. Please, update you Java version\n" -- + "or run Sweet Home 3D under Java 6."; -- JOptionPane.showMessageDialog(null, message); -- System.exit(1); -- } else { // Java >= 1.7.0_40 -- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { -- "java3d-1.6/j3dcore.jar", // Mac OS X Java 3D 1.6 jars and DLLs -- "java3d-1.6/vecmath.jar", -- "java3d-1.6/j3dutils.jar", -- "java3d-1.6/gluegen-rt.jar", -- "java3d-1.6/jogl-java3d.jar", -- "java3d-1.6/macosx/libgluegen-rt.jnilib", -- "java3d-1.6/macosx/libjogl_desktop.jnilib", -- "java3d-1.6/macosx/libnativewindow_awt.jnilib", -- "java3d-1.6/macosx/libnativewindow_macosx.jnilib"})); -- // Disable JOGL library loader -- System.setProperty("jogamp.gluegen.UseTempJarCache", "false"); -- } -- } else { // Other OS -- if ("1.5.2".equals(System.getProperty("com.eteks.sweethome3d.j3d.version", "1.6")) -- || "d3d".equals(System.getProperty("j3d.rend", "jogl")) -- || javaVersion.startsWith("1.5")) { -- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { -- "j3dcore.jar", // Main Java 3D jars -- "vecmath.jar", -- "j3dutils.jar"})); -- if ("64".equals(System.getProperty("sun.arch.data.model"))) { -- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { -- "linux/x64/libj3dcore-ogl.so", // Linux 64 bits DLL for Java 3D 1.5.2 -- "windows/x64/j3dcore-ogl.dll"})); // Windows 64 bits DLL for Java 3D 1.5.2 -- } else { -- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { -- "linux/i386/libj3dcore-ogl.so", // Linux 32 bits DLLs -- "linux/i386/libj3dcore-ogl-cg.so", -- "windows/i386/j3dcore-d3d.dll", // Windows 32 bits DLLs -- "windows/i386/j3dcore-ogl.dll", -- "windows/i386/j3dcore-ogl-cg.dll", -- "windows/i386/j3dcore-ogl-chk.dll"})); -- } -- } else { -- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { -- "java3d-1.6/j3dcore.jar", // Java 3D 1.6 jars -- "java3d-1.6/vecmath.jar", -- "java3d-1.6/j3dutils.jar", -- "java3d-1.6/gluegen-rt.jar", -- "java3d-1.6/jogl-java3d.jar"})); -- // Disable JOGL library loader -- System.setProperty("jogamp.gluegen.UseTempJarCache", "false"); -- if ("64".equals(System.getProperty("sun.arch.data.model"))) { -- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { -- "java3d-1.6/linux/amd64/libgluegen-rt.so", // Linux 64 bits DLLs for Java 3D 1.6 -- "java3d-1.6/linux/amd64/libjogl_desktop.so", -- "java3d-1.6/linux/amd64/libnativewindow_awt.so", -- "java3d-1.6/linux/amd64/libnativewindow_x11.so", -- "java3d-1.6/windows/amd64/gluegen-rt.dll", // Windows 64 bits DLLs for Java 3D 1.6 -- "java3d-1.6/windows/amd64/jogl_desktop.dll", -- "java3d-1.6/windows/amd64/nativewindow_awt.dll", -- "java3d-1.6/windows/amd64/nativewindow_win32.dll"})); -- } else { -- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { -- "java3d-1.6/linux/i586/libgluegen-rt.so", // Linux 32 bits DLLs for Java 3D 1.6 -- "java3d-1.6/linux/i586/libjogl_desktop.so", -- "java3d-1.6/linux/i586/libnativewindow_awt.so", -- "java3d-1.6/linux/i586/libnativewindow_x11.so", -- "java3d-1.6/windows/i586/gluegen-rt.dll", // Windows 32 bits DLLs for Java 3D 1.6 -- "java3d-1.6/windows/i586/jogl_desktop.dll", -- "java3d-1.6/windows/i586/nativewindow_awt.dll", -- "java3d-1.6/windows/i586/nativewindow_win32.dll"})); -- } -- } -+ String java8Prefix = "1.8.0_"; -+ -+ Boolean amd64 = "64".equals(System.getProperty("sun.arch.data.model")); -+ Boolean java7 = (null!=javaVersion && javaVersion.startsWith(java7Prefix)); -+ Boolean java8 = (null!=javaVersion && javaVersion.startsWith(java8Prefix)); -+ -+ if (!amd64 && !java7 && !java8) { -+ extensionJarsAndDlls.add("/usr/local/openjdk6/jre/lib/i386/libj3dcore-ogl.so"); -+ } else if (amd64 && !java7 && !java8) { -+ extensionJarsAndDlls.add("/usr/local/openjdk6/jre/lib/amd64/libj3dcore-ogl.so"); -+ } else if (!amd64 && java7) { -+ extensionJarsAndDlls.add("/usr/local/openjdk7/jre/lib/i386/libj3dcore-ogl.so"); -+ } else if (amd64 && java7) { -+ extensionJarsAndDlls.add("/usr/local/openjdk7/jre/lib/amd64/libj3dcore-ogl.so"); -+ } else if (!amd64 && java8) { -+ extensionJarsAndDlls.add("/usr/local/openjdk8/jre/lib/i386/libj3dcore-ogl.so"); -+ } else if (amd64 && java8) { -+ extensionJarsAndDlls.add("/usr/local/openjdk8/jre/lib/amd64/libj3dcore-ogl.so"); -+ } else { -+ String message = "Your combination of JDK version and\n" -+ + "hardware architecture is not supported.\n" -+ + "If you think that this is an error, please\n" -+ + "contact the port maintainer."; -+ JOptionPane.showMessageDialog(null, message); -+ System.exit(1); - } - - String [] applicationPackages = { +@@ -116,6 +116,9 @@ public class SweetHome3DBootstrap { + // Disable JOGL library loader + System.setProperty("jogamp.gluegen.UseTempJarCache", "false"); + } ++ } else if ("FreeBSD".equals(operatingSystemName)) { ++ extensionJarsAndDlls.add(System.getProperty("sun.boot.library.path") ++ + "/libj3dcore-ogl.so"); + } else { // Other OS + if ("1.5.2".equals(System.getProperty("com.eteks.sweethome3d.j3d.version", "1.6")) + || "d3d".equals(System.getProperty("j3d.rend", "jogl"))