CI: Update Artifact actions to v4

.github/workflows/android-macos-python.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   build-android:
     name: ${{ matrix.ndk-arch }} on ${{ matrix.arch }} Android
-    runs-on: macos-11
+    runs-on: macos-13
     strategy:
       matrix:
         ndk-arch: [x86_64]
@@ -150,13 +150,13 @@ jobs:
         pushd build-boost/Boost-for-Android/libiconv-libicu-android/${{ matrix.ndk-arch }}/
         zip -r -9 -q ../../../../FreeOrionSDK_${{ steps.cmake-dist-version.outputs.dist-version }}_Android-${{ matrix.ndk-arch }}.zip lib/libicui18n.a lib/libicuuc.a lib/libicudata.a lib/libiconv.so
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       name: Artifacts
       if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
       with:
-        name: python SDK
+        name: python ${{ matrix.ndk-arch }} SDK
         path: |
-          python39.zip
+          ${{ matrix.ndk-arch == 'x86_64' && 'python39.zip' || '' }}
           FreeOrionSDK_${{ steps.cmake-dist-version.outputs.dist-version }}_Android-${{ matrix.ndk-arch }}.zip
 
     - name: Prepare Release

.github/workflows/macos.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11]
+        os: [macos-13]
     env:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
       HOMEBREW_NO_AUTO_UPDATE: 1
@@ -21,14 +21,14 @@ jobs:
         run: |
           mkdir build
           cd build
-          xcversion select 11.7
+          xcodes select 14.1
           cmake -DCMAKE_XCODE_BUILD_SYSTEM=1 ..
       - name: Build
         run: |
           cd build
           cmake --build . --config RelWithDebInfo
       - name: Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
         with:
           name: MacOS SDK

.github/workflows/windows.yml

@@ -32,10 +32,10 @@ jobs:
           cd build
           cmake --build . --config RelWithDebInfo -- /verbosity:d
       - name: Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
         with:
-          name: Windows SDK
+          name: Windows ${{ matrix.toolset }}-${{ matrix.arch }} SDK
           path: |
             build/FreeOrionSDK_*_MSVC-${{ matrix.toolset }}-${{ matrix.arch }}.zip
       - name: Prepare Release

CMakeLists.txt

@@ -31,6 +31,7 @@ function(ExternalProject_PatchSet TARGET_NAME RESULT)
         else()
             set(${RESULT} ${${RESULT}} COMMAND)
         endif()
+        set(${RESULT} ${${RESULT}} ${CMAKE_COMMAND} -E echo "Appliying patch ${_PATCH} ..." COMMAND)
         set(${RESULT} ${${RESULT}} ${PATCH_EXECUTABLE} -p1 < ${_PATCH})
     endforeach()
     if(NOT ${RESULT})
@@ -373,9 +374,9 @@ if(WIN32)
 else()
     set(SDL_CONFIGURE_FLAGS
         -DBUILD_SHARED_LIBS=ON
-        -DBUILD_FRAMEWORK=ON
+	-DBUILD_FRAMEWORK=OFF
     )
-    set(SDL_CONFIGURE_INSTALL_DIR ${SDK_INSTALL_DIR}/Frameworks)
+    set(SDL_CONFIGURE_INSTALL_DIR ${SDK_INSTALL_DIR})
 endif()
 
 ExternalProject_PatchSet(sdl SDL_PATCHSET)
@@ -393,9 +394,10 @@ ExternalProject_Add(sdl
         -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_}
         -DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
         -DSDL_STATIC=OFF
-        -DDIRECTX=OFF
-        -DRENDER_D3D=OFF
-        -DVIDEO_VULKAN=OFF
+        -DSDL_DIRECTX=OFF
+        -DSDL_RENDER_D3D=OFF
+        -DSDL_VULKAN=OFF
+        -DSDL2_DISABLE_SDL2MAIN=ON
         ${SDL_CONFIGURE_FLAGS}
     INSTALL_DIR ${SDL_CONFIGURE_INSTALL_DIR}
 )
@@ -555,7 +557,7 @@ else()
     list(GET _VS_PLATFORM_TOOLSET 0 _VS_PLATFORM_TOOLSET_VERSION)
     list(GET _VS_PLATFORM_TOOLSET 1 _VS_PLATFORM_TOOLSET_TARGET)
     math(EXPR _VS_PLATFORM_TOOLSET_VERSION "${_VS_PLATFORM_TOOLSET_VERSION}/10")
-    set(_VS_PLATFORM_TOOLSET_VERSION "${_VS_PLATFORM_TOOLSET_VERSION}.0")
+    set(_VS_PLATFORM_TOOLSET_VERSION "${_VS_PLATFORM_TOOLSET_VERSION}.3")
     set(BOOST_CONFIGURE_FLAGS
         debug-store=database
     )
@@ -570,6 +572,7 @@ else()
         list(APPEND BOOST_CONFIGURE_FLAGS define=BOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_VISTA)
     endif()
     set(BOOST_TOOLSET msvc-${_VS_PLATFORM_TOOLSET_VERSION})
+    message(STATUS "Boost toolset is msvc-${_VS_PLATFORM_TOOLSET_VERSION} for ${CMAKE_VS_PLATFORM_TOOLSET}")
     set(BOOST_OSX_SYSROOT "")
 endif()
 

Sources.cmake

@@ -34,9 +34,9 @@ set(FREETYPE_VERSION 2.9)
 set(FREETYPE_URL http://downloads.sourceforge.net/project/freetype/freetype2/${FREETYPE_VERSION}/freetype-${FREETYPE_VERSION}.tar.gz)
 set(FREETYPE_MD5 d23a1b246e78890458c6672cb45eacd0)
 
-set(SDL_VERSION 2.0.12)
+set(SDL_VERSION 2.26.0)
 set(SDL_URL https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
-set(SDL_MD5 783b6f2df8ff02b19bb5ce492b99c8ff)
+set(SDL_MD5 35bc58cfe41b8fb6c8e6646be26fa47e)
 
 set(LIBOGG_VERSION 1.3.2)
 set(LIBOGG_URL http://downloads.xiph.org/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz)

patches/sdl/0001-CMake-Install-pdb-file-for-Debug-and-RelWithDebInfo-.patch

@@ -12,8 +12,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 8f1e828d1..aa17932b6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1947,6 +1947,13 @@ if(NOT (WINDOWS OR CYGWIN))
-   install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal")
+@@ -2848,6 +2848,13 @@ if(NOT (WINDOWS OR CYGWIN))
+   endif()
  endif()
 
 +if(SDL_SHARED AND (MSVC_VERSION GREATER 1500) AND (NOT CMAKE_VERSION VERSION_LESS "3.1"))
@@ -25,7 +25,7 @@ index 8f1e828d1..aa17932b6 100644
 +
  ##### Uninstall target #####
 
- if(NOT TARGET uninstall)
+ if(NOT SDL2_DISABLE_UNINSTALL)
 -- 
 2.14.3
 

patches/sdl/0002-CMake-Remove-so-names.patch

@@ -0,0 +1,36 @@
+From b9cfc3565b4d56adc5f022a5ab18c89959bc9476 Mon Sep 17 00:00:00 2001
+From: O01eg <o01eg@yandex.ru>
+Date: Wed, 25 Dec 2024 10:40:02 +0400
+Subject: [PATCH 2/2] CMake: Remove so-names
+
+---
+ CMakeLists.txt | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a596eec..b509bb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3290,9 +3290,7 @@ if(SDL_SHARED)
+   if(APPLE)
+     # FIXME: Remove SOVERSION in SDL3
+     set_target_properties(SDL2 PROPERTIES
+-      MACOSX_RPATH 1
+-      SOVERSION 0
+-      OUTPUT_NAME "SDL2-${LT_RELEASE}")
++      MACOSX_RPATH 1)
+   elseif(UNIX AND NOT ANDROID)
+     set_target_properties(SDL2 PROPERTIES
+       VERSION ${LT_VERSION}
+@@ -3518,7 +3516,7 @@ if(NOT SDL2_DISABLE_INSTALL)
+     install(FILES ${SDL2_BINARY_DIR}/sdl2.pc
+             DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+   endif()
+-  if(NOT (WINDOWS OR CYGWIN) OR MINGW)
++  if(NOT (WINDOWS OR CYGWIN OR APPLE) OR MINGW)
+     if(SDL_SHARED)
+       set(SOEXT ${CMAKE_SHARED_LIBRARY_SUFFIX}) # ".so", ".dylib", etc.
+       get_target_property(SONAME SDL2 OUTPUT_NAME)
+-- 
+2.45.2
+