From 875ad1d11a5b6f31b61c8cf8e0b616245b0cbb05 Mon Sep 17 00:00:00 2001 From: David Lane <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 1 Nov 2025 21:02:15 -0400 Subject: [PATCH] build(deps): bump boost to 1.89 (#4253) --- .github/workflows/ci-windows.yml | 1 + cmake/dependencies/Boost_Sunshine.cmake | 4 ++-- packaging/linux/flatpak/modules/boost.json | 6 +++--- packaging/sunshine.rb | 1 + src/platform/common.h | 2 +- src/platform/linux/misc.cpp | 2 +- src/platform/windows/input.cpp | 7 ------- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 76ce9d94..2ad2f982 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -161,6 +161,7 @@ jobs: # dependencies dependencies=( "git" + "mingw-w64-${TOOLCHAIN}-boost" "mingw-w64-${TOOLCHAIN}-cmake" "mingw-w64-${TOOLCHAIN}-cppwinrt" "mingw-w64-${TOOLCHAIN}-curl-winssl" diff --git a/cmake/dependencies/Boost_Sunshine.cmake b/cmake/dependencies/Boost_Sunshine.cmake index eb2ac409..0bffabc4 100644 --- a/cmake/dependencies/Boost_Sunshine.cmake +++ b/cmake/dependencies/Boost_Sunshine.cmake @@ -3,7 +3,7 @@ # include_guard(GLOBAL) -set(BOOST_VERSION "1.87.0") +set(BOOST_VERSION "1.89.0") set(BOOST_COMPONENTS filesystem locale @@ -55,7 +55,7 @@ if(NOT Boost_FOUND) # Limit boost to the required libraries only set(BOOST_INCLUDE_LIBRARIES ${BOOST_COMPONENTS}) set(BOOST_URL "https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}-cmake.tar.xz") # cmake-lint: disable=C0301 - set(BOOST_HASH "SHA256=7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5") + set(BOOST_HASH "SHA256=67acec02d0d118b5de9eb441f5fb707b3a1cdd884be00ca24b9a73c995511f74") if(CMAKE_VERSION VERSION_LESS "3.24.0") FetchContent_Declare( diff --git a/packaging/linux/flatpak/modules/boost.json b/packaging/linux/flatpak/modules/boost.json index 79eadba4..c78661da 100644 --- a/packaging/linux/flatpak/modules/boost.json +++ b/packaging/linux/flatpak/modules/boost.json @@ -3,14 +3,14 @@ "buildsystem": "simple", "build-commands": [ "cd tools/build && bison -y -d -o src/engine/jamgram.cpp src/engine/jamgram.y", - "./bootstrap.sh --prefix=$FLATPAK_DEST --with-libraries=filesystem,locale,log,program_options,system", + "./bootstrap.sh --prefix=$FLATPAK_DEST --with-libraries=filesystem,locale,log,program_options", "./b2 install variant=release link=shared runtime-link=shared cxxflags=\"$CXXFLAGS\"" ], "sources": [ { "type": "archive", - "url": "https://github.com/boostorg/boost/releases/download/boost-1.87.0/boost-1.87.0-cmake.tar.xz", - "sha256": "7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5" + "url": "https://github.com/boostorg/boost/releases/download/boost-1.89.0/boost-1.89.0-cmake.tar.xz", + "sha256": "67acec02d0d118b5de9eb441f5fb707b3a1cdd884be00ca24b9a73c995511f74" } ] } diff --git a/packaging/sunshine.rb b/packaging/sunshine.rb index e1ba8a25..159778a8 100644 --- a/packaging/sunshine.rb +++ b/packaging/sunshine.rb @@ -35,6 +35,7 @@ class Sunshine < Formula depends_on "miniupnpc" depends_on "openssl" depends_on "opus" + depends_on "boost" => :recommended depends_on "icu4c" => :recommended on_linux do diff --git a/src/platform/common.h b/src/platform/common.h index d764f56d..5ba57027 100644 --- a/src/platform/common.h +++ b/src/platform/common.h @@ -15,7 +15,7 @@ #include #ifndef _WIN32 #include - #include + #include #endif // local includes diff --git a/src/platform/linux/misc.cpp b/src/platform/linux/misc.cpp index 9da87337..6fd18cd7 100644 --- a/src/platform/linux/misc.cpp +++ b/src/platform/linux/misc.cpp @@ -43,7 +43,7 @@ using namespace std::literals; namespace fs = std::filesystem; -namespace bp = boost::process; +namespace bp = boost::process::v1; window_system_e window_system; diff --git a/src/platform/windows/input.cpp b/src/platform/windows/input.cpp index 02310ec3..85273609 100644 --- a/src/platform/windows/input.cpp +++ b/src/platform/windows/input.cpp @@ -22,13 +22,6 @@ #include "src/logging.h" #include "src/platform/common.h" -#ifdef __MINGW32__ -DECLARE_HANDLE(HSYNTHETICPOINTERDEVICE); -WINUSERAPI HSYNTHETICPOINTERDEVICE WINAPI CreateSyntheticPointerDevice(POINTER_INPUT_TYPE pointerType, ULONG maxCount, POINTER_FEEDBACK_MODE mode); -WINUSERAPI BOOL WINAPI InjectSyntheticPointerInput(HSYNTHETICPOINTERDEVICE device, CONST POINTER_TYPE_INFO *pointerInfo, UINT32 count); -WINUSERAPI VOID WINAPI DestroySyntheticPointerDevice(HSYNTHETICPOINTERDEVICE device); -#endif - namespace platf { using namespace std::literals;