[cgal] update to 6.2 (#51911)

This commit is contained in:
Laurent Rineau 2026-06-18 23:05:33 +02:00 committed by GitHub
parent 46c9f8d839
commit 17216e0455
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 33 additions and 3 deletions

View File

@ -0,0 +1,20 @@
diff --git a/Installation/include/CGAL/gdb_autoload.h b/Installation/include/CGAL/gdb_autoload.h
index fa676fda69b..6acf832c8ba 100644
--- a/Installation/include/CGAL/gdb_autoload.h
+++ b/Installation/include/CGAL/gdb_autoload.h
@@ -25,11 +25,13 @@
// Use inline assembly to embed the .debug_gdb_scripts section
__asm__(
- ".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
- ".ascii \"\\4gdb.inlined-script.CGAL\\n\"\n"
+ ".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
+ ".byte 4\n"
+ ".ascii \"gdb.inlined-script.CGAL\\n\"\n"
".ascii \"import gdb\\n\"\n"
".ascii \"path=[line.strip() for line in gdb.execute('info sources', to_string=True).split(',') if line.count('include/CGAL/gdb_autoload.h')][0].replace('/include/CGAL/gdb_autoload.h', '')\\n\"\n"
".ascii \"gdb.execute('source ' + path + '/share/gdb/auto-load/cgal_printers.py')\\n\"\n"
+ ".byte 0\n"
".popsection\n"
);

View File

@ -4,8 +4,13 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CGAL/cgal
REF v${VERSION}
SHA512 cddf1634e9b69a82748b75d071c728d02acc7286f3ca7c7379116d320e1b88cd597b06db17c539be81665a61b1257fe658e2c723a45a3fc92dfe0c464d40c487
SHA512 d49b046ca87ef467efad066a4574aa04faa43941c65f2bc5b0b5e530b1d738d5bdc0f1d8c8a339f5ec49b3567d19fd959239ebe0bc6530bea41a1d4066c63f18
HEAD_REF master
PATCHES
# upstream commit from the 6.2.x-branch (planned for CGAL version 6.2.1):
# https://github.com/CGAL/cgal/commit/eb2257df4da4c52c75fe384e803d9a6376057b8a
# > fix <CGAL/gdb_autoload.h>: end the section with a null byte
CGAL-6.2.0-gdb_autoload.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"

View File

@ -1,6 +1,6 @@
{
"name": "cgal",
"version": "6.1.2",
"version": "6.2",
"description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.",
"homepage": "https://github.com/CGAL/cgal",
"license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0",

View File

@ -1685,7 +1685,7 @@
"port-version": 0
},
"cgal": {
"baseline": "6.1.2",
"baseline": "6.2",
"port-version": 0
},
"cgicc": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ee44afa940e03a2edfb5bf1576952aff668a2e2a",
"version": "6.2",
"port-version": 0
},
{
"git-tree": "1a4a18d2cc49224afb19525a9fc9a59990634867",
"version": "6.1.2",