From 94861b8397c8305a3fbe9ca523a88104e277f6eb Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 17 Dec 2025 11:21:29 +0100 Subject: [PATCH 1/4] [ci] update build dependencies --- scripts/bundle-mac-os.sh | 16 ++++++++-------- scripts/mingw.sh | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/bundle-mac-os.sh b/scripts/bundle-mac-os.sh index 1c76012ae..fbda69520 100755 --- a/scripts/bundle-mac-os.sh +++ b/scripts/bundle-mac-os.sh @@ -133,17 +133,17 @@ CMAKE_ARGS="-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \ if [ ! -d $SRC ]; then mkdir -p $SRC cd $SRC - git clone --depth 1 -b openssl-3.5.0 https://github.com/openssl/openssl.git - git clone --depth 1 -b v1.3.1 https://github.com/madler/zlib.git - git clone --depth 1 -b uriparser-0.9.8 https://github.com/uriparser/uriparser.git + git clone --depth 1 -b openssl-3.6.0 https://github.com/openssl/openssl.git + git clone --depth 1 -b v1.3.1.2 https://github.com/madler/zlib.git + git clone --depth 1 -b uriparser-1.0.0 https://github.com/uriparser/uriparser.git git clone --depth 1 -b json-c-0.18-20240915 https://github.com/json-c/json-c.git - git clone --depth 1 -b release-3.2.10 https://github.com/libsdl-org/SDL.git + git clone --depth 1 -b release-3.2.28 https://github.com/libsdl-org/SDL.git git clone --depth 1 --shallow-submodules --recurse-submodules -b release-3.2.2 https://github.com/libsdl-org/SDL_ttf.git git clone --depth 1 --shallow-submodules --recurse-submodules -b release-3.2.4 https://github.com/libsdl-org/SDL_image.git - git clone --depth 1 --shallow-submodules --recurse-submodules -b v1.0.28-0 https://github.com/libusb/libusb-cmake.git - git clone --depth 1 -b n7.1.1 https://github.com/FFmpeg/FFmpeg.git - git clone --depth 1 -b v2.4.1 https://github.com/cisco/openh264.git - git clone --depth 1 -b v1.5.2 https://gitlab.xiph.org/xiph/opus.git + git clone --depth 1 --shallow-submodules --recurse-submodules -b v1.0.29-0 https://github.com/libusb/libusb-cmake.git + git clone --depth 1 -b n8.0.1 https://github.com/FFmpeg/FFmpeg.git + git clone --depth 1 -b v2.6.0 https://github.com/cisco/openh264.git + git clone --depth 1 -b v1.6 https://gitlab.xiph.org/xiph/opus.git git clone --depth 1 -b v2.0.3 https://github.com/mstorsjo/fdk-aac.git fi diff --git a/scripts/mingw.sh b/scripts/mingw.sh index eb94fb217..c115af2fe 100755 --- a/scripts/mingw.sh +++ b/scripts/mingw.sh @@ -139,7 +139,7 @@ mkdir -p "$BUILD_BASE" cd "$SRC_BASE" if [ $CLONE -ne 0 ]; then do_clone v1.3.1 https://github.com/madler/zlib.git zlib - do_clone uriparser-0.9.8 https://github.com/uriparser/uriparser.git uriparser + do_clone uriparser-1.0.0 https://github.com/uriparser/uriparser.git uriparser do_clone json-c-0.18-20240915 https://github.com/json-c/json-c.git json-c do_clone release-3.2.28 https://github.com/libsdl-org/SDL.git SDL if [ $FFMPEG -ne 0 ]; then @@ -152,7 +152,7 @@ if [ $CLONE -ne 0 ]; then do_clone release-3.2.4 https://github.com/libsdl-org/SDL_image.git SDL_image do_clone release-3.2.2 https://github.com/libsdl-org/SDL_ttf.git SDL_ttf do_clone v2.0.3 https://github.com/mstorsjo/fdk-aac.git fdk-aac - do_clone v1.5.2 https://gitlab.xiph.org/xiph/opus.git opus + do_clone v1.6 https://gitlab.xiph.org/xiph/opus.git opus do_download https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/ libressl-4.2.1.tar.gz 6d5c2f58583588ea791f4c8645004071d00dfa554a5bf788a006ca1eb5abd70b libressl fi From bbf45320ad757691f893ea2c18a013d6c9b1db03 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 17 Dec 2025 10:44:31 +0100 Subject: [PATCH 2/4] changelog --- ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8fa5a1f3d..66cd063f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +# 2025-12-17 Version 3.20.0 + +## What's Changed +* Mingw fixes (#12070) +* [crypto,certificate_data] add some hostname sanitation (#12072) +* [client,common]: Fix loading of rdpsnd channel (#12074) +* [client,sdl] set touch and pen hints (#12076) + +For a complete and detailed change log since the last release run: +git log 3.20.0...3.19.1 + # 2025-12-12 Version 3.19.1 ## What's Changed From b8e790a02ede8dd64ff7177fb9027d1844e66bb6 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 17 Dec 2025 10:56:05 +0100 Subject: [PATCH 3/4] release-3.20.0 --- cmake/GetProjectVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/GetProjectVersion.cmake b/cmake/GetProjectVersion.cmake index 6c69b5554..6313c5429 100644 --- a/cmake/GetProjectVersion.cmake +++ b/cmake/GetProjectVersion.cmake @@ -4,7 +4,7 @@ option(USE_GIT_FOR_REVISION "Extract git tag/commit" OFF) function(get_project_version VERSION_MAJOR VERSION_MINOR VERSION_REVISION VERSION_SUFFIX GIT_REVISION) # Default version, hard codec per release - set(RAW_VERSION_STRING "3.19.2-dev0") + set(RAW_VERSION_STRING "3.20.0") set(VERSION_REGEX "^(.*)([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)") From cb761e1d9c419d0673e9e546e738e22428d1c8f0 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 17 Dec 2025 10:56:23 +0100 Subject: [PATCH 4/4] dev-cycle-3.20.1-dev0 --- cmake/GetProjectVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/GetProjectVersion.cmake b/cmake/GetProjectVersion.cmake index 6313c5429..af135fd8a 100644 --- a/cmake/GetProjectVersion.cmake +++ b/cmake/GetProjectVersion.cmake @@ -4,7 +4,7 @@ option(USE_GIT_FOR_REVISION "Extract git tag/commit" OFF) function(get_project_version VERSION_MAJOR VERSION_MINOR VERSION_REVISION VERSION_SUFFIX GIT_REVISION) # Default version, hard codec per release - set(RAW_VERSION_STRING "3.20.0") + set(RAW_VERSION_STRING "3.20.1-dev0") set(VERSION_REGEX "^(.*)([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)")