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.

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

Update vcpkg to 2023.07.21 #1444

Merged
merged 2 commits into from
Aug 4, 2023
Merged

Update vcpkg to 2023.07.21 #1444

merged 2 commits into from
Aug 4, 2023

Conversation

dpogue
Copy link
Member

@dpogue dpogue commented Aug 1, 2023

Also make sure we get (older) working versions of a few dependencies.

Port Version Changes

  • curl
    8.1.2 -> 8.2.0

  • libjpeg-turbo
    2.1.5.1#1 -> 2.1.5.1#2

  • libuuid
    1.0.3#13 -> 1.0.3#14

  • openal-soft
    1.23.0#1 -> 1.23.0#2

  • openssl
    3.1.1 -> 3.0.8#2
    ⚠️ We're intentionally downgrading here to fix an issue where OpenSSL 3.1.x causes crashes on macOS Apple Silicon (AArch64) in debug mode

  • physx
    No change, but version is locked to 4.1.2#6 to prevent upgrading to PhysX 5

@dpogue dpogue force-pushed the vcpkg-2023.07.21 branch 2 times, most recently from 65775ea to 844e98d Compare August 1, 2023 13:24

# This is a terrible hack because meson seems to suck.
if(PORT STREQUAL cairo)
set(VCPKG_LIBRARY_LINKAGE dynamic)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Windows, we make python3 and cairo dynamic libraries because otherwise we run into issues trying to run the Python interpreter to generate the resource.dat files. On macOS, we definitely need python to be a static library because it will cause codesigning issues, but it's unclear if that will cause issues for resource.dat generation.

@dpogue
Copy link
Member Author

dpogue commented Aug 1, 2023

@Hoikas Do we need the -plasma triplets for Windows or is it okay to use overlay triplets and just re-declare x64-windows.cmake and x86-windows.cmake with our modifications?

@Hoikas
Copy link
Member

Hoikas commented Aug 1, 2023

I don't think hiding any of the official triplets (eg x86-windows, x64-osx) is a good idea. I'm not certain that vcpkg allows overlay triplets to mask official triplets in this way. If it does, however, in my mind, the official triplets have a well understood output by the C++ community. Changing that output seems like a gotcha. After all, VCPKG_TARGET_TRIPLET is still a user-configurable option in CMake, we just put our opinion on things to make certain libraries build in the way that we prefer. The official Windows triplets produce perfectly working libraries for us, just not in our preferred linkage. So, I don't see why we should hide something that works perfectly fine.

@dpogue
Copy link
Member Author

dpogue commented Aug 1, 2023

It appears (based on how the macOS triplets are working here) that overlay triplets work the same way as overlay ports and mask the official ones.

That said, if we prefer to keep our triplets with a suffix, then I'll figure out how best to do that for the macOS ones as well.

@Hoikas Hoikas mentioned this pull request Aug 1, 2023
@dpogue dpogue force-pushed the vcpkg-2023.07.21 branch 5 times, most recently from 2cfbd57 to 7e00965 Compare August 2, 2023 14:19
cmake/VcpkgToolchain.cmake Outdated Show resolved Hide resolved
cmake/VcpkgToolchain.cmake Outdated Show resolved Hide resolved
cmake/VcpkgToolchain.cmake Outdated Show resolved Hide resolved
vcpkg.json Outdated Show resolved Hide resolved
dpogue and others added 2 commits August 2, 2023 22:17
Also make sure we get (older) working versions of a few dependencies.
Co-Authored-By: Colin Cornaby <colin.cornaby@mac.com>
Co-Authored-By: Adam Johnson <AdamJohnso@gmail.com>
@dpogue dpogue merged commit 83f53fb into H-uru:master Aug 4, 2023
@dpogue dpogue deleted the vcpkg-2023.07.21 branch August 4, 2023 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants