build(cmake): fix compatibility with cmake 4.x and gcc15 (#448)

Author: ReenigneArcher

.github/workflows/ci.yml

@@ -321,20 +321,15 @@ jobs:
         run: |
           # variables
           declare -A pinned_deps
-          pinned_deps["mingw-w64-${TOOLCHAIN}-cmake"]="3.31.6-1"
-          if [[ ${MSYSTEM} == "ucrt64" ]]; then
-            pinned_deps["mingw-w64-${TOOLCHAIN}-curl"]="8.9.1-2"  # needed when cmake is pinned
-            pinned_deps["mingw-w64-${TOOLCHAIN}-gcc"]="14.2.0-3"
-            pinned_deps["mingw-w64-${TOOLCHAIN}-gcc-libs"]="14.2.0-3"
-            pinned_deps["mingw-w64-${TOOLCHAIN}-nghttp3"]="1.9.0-1"  # needed when cmake is pinned
-          fi
+          # nothing to pin currently
 
           dependencies=(
             "diffutils"
             "git"
             "make"
             "pkg-config"
             "mingw-w64-${TOOLCHAIN}-binutils"
+            "mingw-w64-${TOOLCHAIN}-cmake"
             "mingw-w64-${TOOLCHAIN}-gcc"
             "mingw-w64-${TOOLCHAIN}-make"
             "mingw-w64-${TOOLCHAIN}-nasm"
@@ -408,6 +403,8 @@ jobs:
             # create symlink for shebang bash compatibility
             ln -s /usr/local/bin/bash /bin/bash
           release: ${{ matrix.bsd_release }}
+          run: |
+            git config --global --add safe.directory "*"
           sync: nfs
 
       - name: Setup ENV
@@ -456,7 +453,7 @@ jobs:
           echo "PROCESSOR_COUNT=${PROCESSOR_COUNT}" >> $GITHUB_OUTPUT
           echo "PROCESSOR_COUNT: $PROCESSOR_COUNT"
 
-      - name: Get x265 git history
+      - name: Get submodule history
         run: |
           set -e
 
@@ -465,7 +462,6 @@ jobs:
 
           for repo in "x265_git" "SVT-AV1"; do
             cd $GITHUB_WORKSPACE/third-party/FFmpeg/$repo
-            git config --global --add safe.directory $(pwd)
             git fetch --tags --force origin
           done
 

CMakeLists.txt

@@ -186,9 +186,6 @@ message(STATUS "Detected system name: ${CMAKE_SYSTEM_NAME}")
 message(STATUS "Detected architecture: ${CMAKE_SYSTEM_PROCESSOR}")
 message(STATUS "CI Matrix name should be: '${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}'")
 
-# set generated source path
-set(CMAKE_GENERATED_SRC_PATH ${CMAKE_CURRENT_BINARY_DIR}/generated-src)
-
 if(BUILD_ALL OR BUILD_ALL_SUNSHINE OR BUILD_FFMPEG)
     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ffmpeg/_main.cmake)
 endif()

cmake/apply_git_patch.cmake

@@ -16,8 +16,7 @@ macro(APPLY_GIT_PATCH repo_path patch_path)
                 COMMAND_ECHO STDOUT)
 
         if(${SUCCESS} EQUAL 1)
-            # We don't stop here because it can happen in case of parallel builds
-            message(WARNING "\n::error:: failed to apply the patch patch: ${patch_path}\n")
+            message(FATAL_ERROR "\n::error:: failed to apply the patch: ${patch_path}\n")
         endif()
     endif()
 endmacro()

cmake/ffmpeg/_main.cmake

@@ -1,7 +1,8 @@
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/third-party/FFmpeg/FFmpeg DESTINATION ${CMAKE_GENERATED_SRC_PATH})
+# the destination directory needs to be same level down as the original source directory
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/third-party/FFmpeg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-set(FFMPEG_GENERATED_SRC_PATH ${CMAKE_GENERATED_SRC_PATH}/FFmpeg)
-set(AVCODEC_GENERATED_SRC_PATH ${CMAKE_GENERATED_SRC_PATH}/FFmpeg/libavcodec)
+set(FFMPEG_GENERATED_SRC_PATH ${CMAKE_CURRENT_BINARY_DIR}/FFmpeg/FFmpeg)
+set(AVCODEC_GENERATED_SRC_PATH ${CMAKE_CURRENT_BINARY_DIR}/FFmpeg/libavcodec)
 
 if(WIN32)
     set(BUILD_FFMPEG_VAAPI OFF)

cmake/ffmpeg/amf.cmake

@@ -1,5 +1,7 @@
+set(AMF_GENERATED_SRC_PATH ${CMAKE_CURRENT_BINARY_DIR}/FFmpeg/AMF)
+
 if(BUILD_FFMPEG_ALL_PATCHES OR BUILD_FFMPEG_AMF_PATCHES)
-    file(GLOB FFMPEG_AMF_PATCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/AMF/*.patch)
+    file(GLOB FFMPEG_AMF_PATCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/FFmpeg/AMF/*.patch)
 
     foreach(patch_file ${FFMPEG_AMF_PATCH_FILES})
         APPLY_GIT_PATCH(${FFMPEG_GENERATED_SRC_PATH} ${patch_file})
@@ -9,7 +11,7 @@ endif()
 set(AMF_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR}/usr/local/include/AMF)
 add_custom_target(amf ALL
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${CMAKE_CURRENT_SOURCE_DIR}/third-party/FFmpeg/AMF/amf/public/include"
+            "${AMF_GENERATED_SRC_PATH}/amf/public/include"
             "${AMF_TARGET_DIR}"
         COMMENT "Copying AMF headers"
 )

cmake/ffmpeg/ffmpeg.cmake

@@ -1,5 +1,5 @@
 if(BUILD_FFMPEG_ALL_PATCHES OR BUILD_FFMPEG_CBS_PATCHES)
-    file(GLOB FFMPEG_CBS_PATCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/cbs/*.patch)
+    file(GLOB FFMPEG_CBS_PATCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/FFmpeg/cbs/*.patch)
 
     foreach(patch_file ${FFMPEG_CBS_PATCH_FILES})
         APPLY_GIT_PATCH(${FFMPEG_GENERATED_SRC_PATH} ${patch_file})
@@ -139,7 +139,7 @@ endif()
 string(REPLACE ";" " " FFMPEG_EXTRA_CONFIGURE "${FFMPEG_EXTRA_CONFIGURE}")
 message(STATUS "FFmpeg configure options: ${FFMPEG_EXTRA_CONFIGURE}")
 
-set(WORKING_DIR ${FFMPEG_GENERATED_SRC_PATH})
+set(WORKING_DIR "${FFMPEG_GENERATED_SRC_PATH}")
 UNIX_PATH(WORKING_DIR_UNIX ${WORKING_DIR})
 add_custom_target(ffmpeg ALL
         COMMAND ${SHELL_CMD} "PKG_CONFIG_PATH='${PKG_CONFIG_PATH}' \

cmake/ffmpeg/mf.cmake

@@ -1,5 +1,5 @@
 if(BUILD_FFMPEG_ALL_PATCHES OR BUILD_FFMPEG_MF_PATCHES)
-    file(GLOB FFMPEG_MF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/MF/*.patch)
+    file(GLOB FFMPEG_MF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/FFmpeg/MF/*.patch)
 
     foreach(patch_file ${FFMPEG_MF_FILES})
         APPLY_GIT_PATCH(${FFMPEG_GENERATED_SRC_PATH} ${patch_file})

cmake/ffmpeg/nv_codec_headers.cmake

@@ -1,12 +1,15 @@
+set(NV_CODEC_HEADERS_GENERATED_SRC_PATH ${CMAKE_CURRENT_BINARY_DIR}/FFmpeg/nv-codec-headers)
+
 if(BUILD_FFMPEG_ALL_PATCHES OR BUILD_FFMPEG_NV_CODEC_HEADERS_PATCHES)
-    file(GLOB FFMPEG_NV_CODEC_HEADER_PATCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/nv-codec-headers/*.patch)
+    file(GLOB FFMPEG_NV_CODEC_HEADER_PATCH_FILES
+            ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/FFmpeg/nv-codec-headers/*.patch)
 
     foreach(patch_file ${FFMPEG_NV_CODEC_HEADER_PATCH_FILES})
         APPLY_GIT_PATCH(${FFMPEG_GENERATED_SRC_PATH} ${patch_file})
     endforeach()
 endif()
 
-set(WORKING_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third-party/FFmpeg/nv-codec-headers")
+set(WORKING_DIR "${NV_CODEC_HEADERS_GENERATED_SRC_PATH}")
 UNIX_PATH(WORKING_DIR_UNIX ${WORKING_DIR})
 UNIX_PATH(DEST_DIR_UNIX ${CMAKE_CURRENT_BINARY_DIR})
 add_custom_target(nv-codec-headers ALL

cmake/ffmpeg/svt_av1.cmake

@@ -1,5 +1,7 @@
+set(SVT_AV1_GENERATED_SRC_PATH ${CMAKE_CURRENT_BINARY_DIR}/FFmpeg/SVT-AV1)
+
 if(BUILD_FFMPEG_ALL_PATCHES OR BUILD_FFMPEG_SVT_AV1_PATCHES)
-    file(GLOB FFMPEG_SVT_AV1_PATCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/SVT-AV1/*.patch)
+    file(GLOB FFMPEG_SVT_AV1_PATCH_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/FFmpeg/SVT-AV1/*.patch)
 
     foreach(patch_file ${FFMPEG_SVT_AV1_PATCH_FILES})
         APPLY_GIT_PATCH(${FFMPEG_GENERATED_SRC_PATH} ${patch_file})
@@ -12,8 +14,11 @@ set(BUILD_DEC OFF CACHE BOOL "Build decoders")
 set(ENABLE_AVX512 ON CACHE BOOL "Enable AVX512")
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries")
 
+# disable LTO because it forces projects linking against our pre-build to use the same compiler version
+set(SVT_AV1_LTO OFF CACHE BOOL "Enable Link Time Optimization (LTO)")
+
 # build SVT-AV1
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third-party/FFmpeg/SVT-AV1 SVT-AV1 SYSTEM)
+add_subdirectory(${SVT_AV1_GENERATED_SRC_PATH} SVT-AV1 SYSTEM)
 add_dependencies(${CMAKE_PROJECT_NAME} SvtAv1Enc)
 
 # install SVT-AV1 as a build target, this must be installed before building FFmpeg
@@ -25,4 +30,4 @@ add_custom_target(SvtAv1
 add_dependencies(SvtAv1 SvtAv1Enc)
 add_dependencies(${CMAKE_PROJECT_NAME} SvtAv1)
 
-# PKG_CONFIG_PATH alraedy set since this is installed directly to the prefix
+# PKG_CONFIG_PATH already set since this is installed directly to the prefix

cmake/ffmpeg/vaapi.cmake

@@ -1,5 +1,5 @@
 if(BUILD_FFMPEG_ALL_PATCHES OR BUILD_FFMPEG_VAAPI_PATCHES)
-    file(GLOB FFMPEG_VAAPI_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/VAAPI/*.patch)
+    file(GLOB FFMPEG_VAAPI_FILES ${CMAKE_CURRENT_SOURCE_DIR}/patches/FFmpeg/FFmpeg/VAAPI/*.patch)
 
     foreach(patch_file ${FFMPEG_VAAPI_FILES})
         APPLY_GIT_PATCH(${FFMPEG_GENERATED_SRC_PATH} ${patch_file})