Merge branch 'myfreeer:main' into main

escapezn · Jun 23, 2024 · a67a455 · a67a455
2 parents 14a5502 + e6d8436
commit a67a455
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -219,7 +219,7 @@ to update flags which will pass on gcc, g++ and etc.
     - libdovi
     - libva
     - libzvbi
-    - rav1e
+    - svtav1
     - libaribcaption
     - zlib (zlib-ng)
     - zstd
@@ -234,7 +234,7 @@ to update flags which will pass on gcc, g++ and etc.
 - Zip
     - xvidcore (1.3.7)
     - lzo (2.10)
-    - libopenmpt (0.7.6)
+    - libopenmpt (0.7.8)
     - libiconv (1.17)
     - ~~gmp (6.3.0)~~
     - vapoursynth (R65/R63)

diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt
@@ -80,7 +80,7 @@ list(APPEND ep
     glad
     fast_float
     libdovi
-    rav1e
+    svtav1
     libplacebo
     libva
     libzvbi
@@ -141,7 +141,7 @@ add_custom_target(package-fullclean
 )
 
 add_custom_target(cargo-clean
-    COMMAND ${EXEC} cargo install --git https://github.com/matthiaskrgr/cargo-cache.git --no-default-features --features ci-autoclean cargo-cache
+    COMMAND ${EXEC} LD_PRELOAD= cargo install --git https://github.com/matthiaskrgr/cargo-cache.git --no-default-features --features ci-autoclean cargo-cache
     COMMAND ${EXEC} cargo-cache
     COMMAND du -sh ${RUSTUP_LOCATION}
     USES_TERMINAL

diff --git a/packages/libdovi.cmake b/packages/libdovi.cmake
@@ -9,6 +9,7 @@ ExternalProject_Add(libdovi
     PATCH_COMMAND ""
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ${EXEC}
+        LD_PRELOAD=
         CARGO_BUILD_TARGET_DIR=<BINARY_DIR>
         CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
         ${cargo_lto_rustflags}

diff --git a/packages/libopenmpt.cmake b/packages/libopenmpt.cmake
@@ -4,8 +4,8 @@ ExternalProject_Add(libopenmpt
         ogg
         vorbis
         libsdl2
-    URL https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.7.6+release.autotools.tar.gz
-    URL_HASH SHA256=162D72A306BB2E114C24FA25267D0D0A0AC16F39FD95A5C0DFC75A666EE5E4F5
+    URL https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.7.8+release.autotools.tar.gz
+    URL_HASH SHA256=87778C8046A226C6CBFB114F4C8E3E27C121B7B3DCCCE5CB7DE45899250274CC
     DOWNLOAD_DIR ${SOURCE_LOCATION}
     CONFIGURE_COMMAND ${EXEC} autoreconf -fi && CONF=1 <SOURCE_DIR>/configure
         --host=${TARGET_ARCH}

diff --git a/packages/openssl.cmake b/packages/openssl.cmake
@@ -14,7 +14,6 @@ ExternalProject_Add(openssl
     GIT_CLONE_FLAGS "--sparse --filter=tree:0"
     GIT_CLONE_POST_COMMAND "sparse-checkout set --no-cone /* !test"
     GIT_SUBMODULES ""
-    PATCH_COMMAND ${EXEC} git revert --no-edit 25391ac
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ${EXEC} CONF=1 <SOURCE_DIR>/Configure
         --cross-compile-prefix=${TARGET_ARCH}-

diff --git a/packages/rav1e.cmake b/packages/rav1e.cmake
diff --git a/packages/svtav1.cmake b/packages/svtav1.cmake
@@ -0,0 +1,24 @@
+ExternalProject_Add(svtav1
+    GIT_REPOSITORY https://gitlab.com/AOMediaCodec/SVT-AV1.git
+    SOURCE_DIR ${SOURCE_LOCATION}
+    GIT_CLONE_FLAGS "--filter=tree:0"
+    UPDATE_COMMAND ""
+    CONFIGURE_COMMAND ${EXEC} CONF=1 cmake -H<SOURCE_DIR> -B<BINARY_DIR>
+        -G Ninja
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE}
+        -DCMAKE_INSTALL_PREFIX=${MINGW_INSTALL_PREFIX}
+        -DCMAKE_FIND_ROOT_PATH=${MINGW_INSTALL_PREFIX}
+        -DBUILD_SHARED_LIBS=OFF
+        -DENABLE_AVX512=ON
+        -DBUILD_TESTING=OFF
+        -DBUILD_ENC=ON
+        -DSVT_AV1_LTO=OFF
+        -DBUILD_APPS=OFF
+    BUILD_COMMAND ${EXEC} ninja -C <BINARY_DIR>
+    INSTALL_COMMAND ${EXEC} ninja -C <BINARY_DIR> install
+    LOG_DOWNLOAD 1 LOG_UPDATE 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1
+)
+
+force_rebuild_git(svtav1)
+cleanup(svtav1 install)
diff --git a/packages/vapoursynth.cmake b/packages/vapoursynth.cmake
@@ -58,8 +58,9 @@ ExternalProject_Add_Step(vapoursynth download-header
     DEPENDEES generate-lib
     WORKING_DIRECTORY <SOURCE_DIR>
     COMMAND curl -sOL https://raw.githubusercontent.com/vapoursynth/vapoursynth/${rev}/include/VapourSynth.h
+    COMMAND curl -sOL https://raw.githubusercontent.com/vapoursynth/vapoursynth/${rev}/include/VapourSynth4.h
     COMMAND curl -sOL https://raw.githubusercontent.com/vapoursynth/vapoursynth/${rev}/include/VSScript.h
-    COMMAND curl -sOL https://raw.githubusercontent.com/vapoursynth/vapoursynth/${rev}/include/VSHelper.h
+    COMMAND curl -sOL https://raw.githubusercontent.com/vapoursynth/vapoursynth/${rev}/include/VSScript4.h
     LOG 1
 )
 
@@ -68,8 +69,9 @@ ExternalProject_Add_Step(vapoursynth manual-install
     WORKING_DIRECTORY <SOURCE_DIR>
     # Copying header
     COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/VapourSynth.h ${MINGW_INSTALL_PREFIX}/include/vapoursynth/VapourSynth.h
+    COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/VapourSynth4.h ${MINGW_INSTALL_PREFIX}/include/vapoursynth/VapourSynth4.h
     COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/VSScript.h ${MINGW_INSTALL_PREFIX}/include/vapoursynth/VSScript.h
-    COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/VSHelper.h ${MINGW_INSTALL_PREFIX}/include/vapoursynth/VSHelper.h
+    COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/VSScript4.h ${MINGW_INSTALL_PREFIX}/include/vapoursynth/VSScript4.h
     # Copying libs
     ${vapoursynth_manual_install_copy_lib}
     # Copying .pc files

diff --git a/packages/vulkan-header.cmake b/packages/vulkan-header.cmake
@@ -12,6 +12,7 @@ ExternalProject_Add(vulkan-header
         -DCMAKE_INSTALL_PREFIX=${MINGW_INSTALL_PREFIX}
         -DCMAKE_FIND_ROOT_PATH=${MINGW_INSTALL_PREFIX}
         -DBUILD_SHARED_LIBS=OFF
+        -DVULKAN_HEADERS_ENABLE_MODULE=OFF
     BUILD_COMMAND ""
     INSTALL_COMMAND ${EXEC} ninja -C <BINARY_DIR> install
     LOG_DOWNLOAD 1 LOG_UPDATE 1 LOG_CONFIGURE 1 LOG_INSTALL 1

diff --git a/toolchain/gcc/gcc.cmake b/toolchain/gcc/gcc.cmake
@@ -1,9 +1,9 @@
 ExternalProject_Add(gcc
     DEPENDS
         mingw-w64-headers
-    URL https://mirrorservice.org/sites/sourceware.org/pub/gcc/snapshots/13-20240309/gcc-13-20240309.tar.xz
+    URL https://mirrorservice.org/sites/sourceware.org/pub/gcc/snapshots/14-20240615/gcc-14-20240615.tar.xz
     # https://mirrorservice.org/sites/sourceware.org/pub/gcc/snapshots/13-20240309/sha512.sum
-    URL_HASH SHA512=2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e
+    URL_HASH SHA512=d8d757cfbedb7342443ce8de4439653537c46d25e552d88cea0ba9f7aa43ad14fb2b42a32a1dce5ae4eb2ac3849024f6b4e700f2c39330a00a65caa3f5fe29e7
     DOWNLOAD_DIR ${SOURCE_LOCATION}
     CONFIGURE_COMMAND <SOURCE_DIR>/configure
         --target=${TARGET_ARCH}

diff --git a/toolchain/rustup.cmake b/toolchain/rustup.cmake
@@ -6,7 +6,7 @@ ExternalProject_Add(rustup
         curl -sSf https://sh.rustup.rs |
         sh -s -- -y --default-toolchain stable --target x86_64-pc-windows-gnu,i686-pc-windows-gnu --no-modify-path --profile minimal
     BUILD_COMMAND ${EXEC} rustup update
-    INSTALL_COMMAND ${EXEC} cargo install cargo-c --profile=release-strip --features=vendored-openssl
+    INSTALL_COMMAND ${EXEC} LD_PRELOAD= cargo install cargo-c --profile=release-strip --features=vendored-openssl
     LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1
 )