Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_17090516004800"
MIME-Version: 1.0
Date: Tue, 27 Feb 2024 16:33:20 +0000
From: "Manuel Bouyer" <bouyer@netbsd.org>
Subject: CVS commit: pkgsrc/cad/occt
To: pkgsrc-changes@NetBSD.org
Reply-To: bouyer@netbsd.org
Message-Id: <20240227163320.63462FA27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_17090516004800
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	bouyer
Date:		Tue Feb 27 16:33:20 UTC 2024

Modified Files:
	pkgsrc/cad/occt: Makefile distinfo
Added Files:
	pkgsrc/cad/occt/patches: patch-adm_cmake_occt_csf.cmake

Log Message:
Don't unconditionally set dl in INTERFACE_LINK_LIBRARIES; use ${CMAKE_DL_LIBS}
Should fix PR pkg/57938. Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/occt/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/cad/occt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/cad/occt/patches/patch-adm_cmake_occt_csf.cmake

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


--_----------=_17090516004800
Content-Disposition: inline
Content-Length: 2574
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/cad/occt/Makefile
diff -u pkgsrc/cad/occt/Makefile:1.2 pkgsrc/cad/occt/Makefile:1.3
--- pkgsrc/cad/occt/Makefile:1.2	Sun Nov 12 13:20:47 2023
+++ pkgsrc/cad/occt/Makefile	Tue Feb 27 16:33:20 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2023/11/12 13:20:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2024/02/27 16:33:20 bouyer Exp $
 
 DISTNAME=	opencascade-7.7.0
 PKGNAME=	${DISTNAME:S/opencascade/occt/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	https://distfiles.macports.org/opencascade/
 EXTRACT_SUFX=	.tgz

Index: pkgsrc/cad/occt/distinfo
diff -u pkgsrc/cad/occt/distinfo:1.3 pkgsrc/cad/occt/distinfo:1.4
--- pkgsrc/cad/occt/distinfo:1.3	Mon Feb 13 15:59:14 2023
+++ pkgsrc/cad/occt/distinfo	Tue Feb 27 16:33:20 2024
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.3 2023/02/13 15:59:14 tnn Exp $
+$NetBSD: distinfo,v 1.4 2024/02/27 16:33:20 bouyer Exp $
 
 BLAKE2s (opencascade-7.7.0.tgz) = 3ac0f49a8d50e3c5eb86192f3d9d7bb1c52ae58e7f4816d32a9971665bbd0c0b
 SHA512 (opencascade-7.7.0.tgz) = 27ed889bbe95fa40fbb1840788ce0f2c58af67a6fec799f5705f6cad2567fcfeddbe461ba1854b65672392a604f8b41fed1f77b2cc0704f83746a58957d830c7
 Size (opencascade-7.7.0.tgz) = 48391263 bytes
 SHA1 (patch-CMakeLists.txt) = d6f533f8a54881b060e05ed816cb6e9bbfe0c5a8
 SHA1 (patch-adm_cmake_occt__macros.cmake) = 9f17527238443cc770d2def9ad8211f410fae7f4
+SHA1 (patch-adm_cmake_occt_csf.cmake) = df33048718a1ff1f490d1a566dc99573713d3677
 SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = ba177be057941b7077a4525348d0563cb1378213
 SHA1 (patch-src_OSD_OSD__MemInfo.cxx) = 6cd4e1095abcadeb3c2df27b2669853764aa5a32
 SHA1 (patch-src_OSD_OSD__Path.cxx) = 14763ec177b7f571350be6ef7bc36e301d57cd1e

Added files:

Index: pkgsrc/cad/occt/patches/patch-adm_cmake_occt_csf.cmake
diff -u /dev/null pkgsrc/cad/occt/patches/patch-adm_cmake_occt_csf.cmake:1.1
--- /dev/null	Tue Feb 27 16:33:20 2024
+++ pkgsrc/cad/occt/patches/patch-adm_cmake_occt_csf.cmake	Tue Feb 27 16:33:20 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-adm_cmake_occt_csf.cmake,v 1.1 2024/02/27 16:33:20 bouyer Exp $
+
+Don't unconditionally set dl in INTERFACE_LINK_LIBRARIES. PR pkg/57938
+
+--- adm/cmake/occt_csf.cmake.orig	2024-02-27 16:31:30.622735481 +0100
++++ adm/cmake/occt_csf.cmake	2024-02-27 16:31:52.950225741 +0100
+@@ -142,7 +142,7 @@
+       set (CSF_OpenGlLibs "GL EGL")
+     endif()
+     set (CSF_OpenGlesLibs "EGL GLESv2")
+-    set (CSF_dl          "dl")
++    set (CSF_dl          "${CMAKE_DL_LIBS}")
+     if (USE_FREETYPE)
+       set (CSF_fontconfig "fontconfig")
+     endif()


--_----------=_17090516004800--