jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build(deps): pin boost to 1.87 (#3794)

Browse source
This commit is contained in:
ReenigneArcher 2025-04-13 20:30:07 -04:00 • committed by GitHub
commit 955c0fd8e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.codeql-prebuild-cpp-Windows.sh
View file

@ -7,7 +7,6 @@ pacman --noconfirm -Syu
# install dependencies # install dependencies
dependencies=( dependencies=(
"git" "git"
"mingw-w64-ucrt-x86_64-boost"
"mingw-w64-ucrt-x86_64-cmake" "mingw-w64-ucrt-x86_64-cmake"
"mingw-w64-ucrt-x86_64-cppwinrt" "mingw-w64-ucrt-x86_64-cppwinrt"
"mingw-w64-ucrt-x86_64-curl-winssl" "mingw-w64-ucrt-x86_64-curl-winssl"

1
.codeql-prebuild-cpp-macOS.sh
View file

@ -7,7 +7,6 @@ eval "$(/usr/local/bin/brew shellenv)"
# install dependencies # install dependencies
dependencies=( dependencies=(
"boost"
"cmake" "cmake"
"miniupnpc" "miniupnpc"
"ninja" "ninja"

1
.github/workflows/CI.yml vendored
View file

@ -833,7 +833,6 @@ jobs:
update: true update: true
install: >- install: >-
git git
mingw-w64-ucrt-x86_64-boost
mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-cmake
mingw-w64-ucrt-x86_64-cppwinrt mingw-w64-ucrt-x86_64-cppwinrt
mingw-w64-ucrt-x86_64-curl-winssl mingw-w64-ucrt-x86_64-curl-winssl

31
cmake/dependencies/Boost_Sunshine.cmake
View file

@ -3,13 +3,25 @@
# #
include_guard(GLOBAL) include_guard(GLOBAL)
set(BOOST_VERSION 1.86) set(BOOST_VERSION "1.87.0")
set(BOOST_COMPONENTS set(BOOST_COMPONENTS
filesystem filesystem
locale locale
log log
program_options program_options
system) # system is not used by Sunshine, but by Simple-Web-Server, added here for convenience system
)
# system is not used by Sunshine, but by Simple-Web-Server, added here for convenience
# algorithm, preprocessor, scope, and uuid are not used by Sunshine, but by libdisplaydevice, added here for convenience
if(WIN32)
list(APPEND BOOST_COMPONENTS
algorithm
preprocessor
scope
uuid
)
endif()
if(BOOST_USE_STATIC) if(BOOST_USE_STATIC)
set(Boost_USE_STATIC_LIBS ON) # cmake-lint: disable=C0103 set(Boost_USE_STATIC_LIBS ON) # cmake-lint: disable=C0103
@ -18,9 +30,9 @@ endif()
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.30") if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.30")
cmake_policy(SET CMP0167 NEW) # Get BoostConfig.cmake from upstream cmake_policy(SET CMP0167 NEW) # Get BoostConfig.cmake from upstream
endif() endif()
find_package(Boost CONFIG ${BOOST_VERSION} COMPONENTS ${BOOST_COMPONENTS}) find_package(Boost CONFIG ${BOOST_VERSION} EXACT COMPONENTS ${BOOST_COMPONENTS})
if(NOT Boost_FOUND) if(NOT Boost_FOUND)
message(STATUS "Boost v${BOOST_VERSION}.x package not found in the system. Falling back to FetchContent.") message(STATUS "Boost v${BOOST_VERSION} package not found in the system. Falling back to FetchContent.")
include(FetchContent) include(FetchContent)
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
@ -41,12 +53,9 @@ if(NOT Boost_FOUND)
set(BOOST_ENABLE_CMAKE ON) set(BOOST_ENABLE_CMAKE ON)
# Limit boost to the required libraries only # Limit boost to the required libraries only
set(BOOST_INCLUDE_LIBRARIES set(BOOST_INCLUDE_LIBRARIES ${BOOST_COMPONENTS})
${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_URL set(BOOST_HASH "SHA256=7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5")
"https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-cmake.tar.xz")
set(BOOST_HASH
"MD5=D02759931CEDC02ADED80402906C5EB6")
if(CMAKE_VERSION VERSION_LESS "3.24.0") if(CMAKE_VERSION VERSION_LESS "3.24.0")
FetchContent_Declare( FetchContent_Declare(
@ -77,7 +86,7 @@ if(NOT Boost_FOUND)
set(Boost_FOUND TRUE) # cmake-lint: disable=C0103 set(Boost_FOUND TRUE) # cmake-lint: disable=C0103
set(Boost_INCLUDE_DIRS # cmake-lint: disable=C0103 set(Boost_INCLUDE_DIRS # cmake-lint: disable=C0103
"$<BUILD_INTERFACE:${Boost_SOURCE_DIR}/libs/headers/include>;$<INSTALL_INTERFACE:include/boost-1_85>") "$<BUILD_INTERFACE:${Boost_SOURCE_DIR}/libs/headers/include>")
if(WIN32) if(WIN32)
# Windows build is failing to create .h file in this directory # Windows build is failing to create .h file in this directory

4
packaging/linux/flatpak/modules/boost.json
View file

@ -9,8 +9,8 @@
"sources": [ "sources": [
{ {
"type": "archive", "type": "archive",
"url": "https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-cmake.tar.xz", "url": "https://github.com/boostorg/boost/releases/download/boost-1.87.0/boost-1.87.0-cmake.tar.xz",
"sha256": "2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57" "sha256": "7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5"
} }
] ]
} }

1
packaging/sunshine.rb
View file

@ -35,7 +35,6 @@ class @PROJECT_NAME@ < Formula
depends_on "miniupnpc" depends_on "miniupnpc"
depends_on "openssl" depends_on "openssl"
depends_on "opus" depends_on "opus"
depends_on "boost" => :recommended
depends_on "icu4c" => :recommended depends_on "icu4c" => :recommended
on_linux do on_linux do