Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cgal] update to 5.6 #32896

Merged
merged 4 commits into from
Aug 10, 2023
Merged

[cgal] update to 5.6 #32896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22a12aa
[cgal] update to 5.6
lrineau Aug 2, 2023
8cea491
vcpkg x-add-version --all
lrineau Aug 3, 2023
b0def15
update the patch
lrineau Aug 3, 2023
25d1fae
vcpkg x-add-version --all
lrineau Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ports/cgal/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CGAL/cgal
REF v5.5.3
SHA512 9353f42b892a7a331a1c12888c25523340d2f3643c520b58b5bfba5c9d8ce492727060ea56fef47cf5947d4e3e50a2b101fe28cf11680f28f238914f27022207
REF v5.6
SHA512 87817169f49c30d8dc4fa5e61ce9b28be5b1f0a9fcd3ebe0cb08b044631a2455de76c53d3cffaa1984f033f5fe21c9b55f54628fc431b7d3a34b3b3e18ad206d
HEAD_REF master
PATCHES
x86_windows.patch
# Upstream patch: https://github.com/CGAL/cgal/pull/7635
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
2 changes: 1 addition & 1 deletion ports/cgal/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cgal",
"version": "5.5.3",
"version": "5.6",
"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",
Expand Down
24 changes: 24 additions & 0 deletions ports/cgal/x86_windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/Number_types/include/CGAL/boost_mp.h b/Number_types/include/CGAL/boost_mp.h
index 3dcaadcad21..b98980acbc5 100644
--- a/Number_types/include/CGAL/boost_mp.h
+++ b/Number_types/include/CGAL/boost_mp.h
@@ -20,8 +20,18 @@
// easy solution.
// MSVC had trouble with versions <= 1.69:
// https://github.com/boostorg/multiprecision/issues/98
+//
+// Disable also on Windows 32 bits
+// because CGAL/cpp_float.h assumes _BitScanForward64 is available
+// See https://learn.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64
+//
+// Disable also with PowerPC processors, with Boost<1.80 because of that bug:
+// https://github.com/boostorg/multiprecision/pull/421
+//
#if !defined CGAL_DO_NOT_USE_BOOST_MP && \
- (!defined _MSC_VER || BOOST_VERSION >= 107000)
+ (!defined _MSC_VER || BOOST_VERSION >= 107000) && \
+ (!defined _WIN32 || defined _WIN64) && \
+ (BOOST_VERSION >= 108000 || (!defined _ARCH_PPC && !defined _ARCH_PPC64))
#define CGAL_USE_BOOST_MP 1

#include <CGAL/Quotient.h>
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,7 @@
"port-version": 3
},
"cgal": {
"baseline": "5.5.3",
"baseline": "5.6",
"port-version": 0
lrineau marked this conversation as resolved.
Show resolved Hide resolved
},
"cgicc": {
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cgal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "313da2aa8d1221c449a211a4d04a0d5976ae8930",
"version": "5.6",
"port-version": 0
},
{
"git-tree": "2361640f4f9d33c828b66c32b900beda59a63036",
"version": "5.5.3",
Expand Down