diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 6971f55c8..a780cbfb2 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -49,9 +49,13 @@ $zlib_version = "1.3" $zlib_link = "https://github.com/madler/zlib/archive/refs/tags/v$zlib_version.zip" $zlib_output = "zlib.zip" -$libmpv_link = "https://deac-fra.dl.sourceforge.net/project/mpv-player-windows/64bit-v3/mpv-x86_64-v3-20231126-git-6898d57.7z" +$libmpv_link = "https://deac-fra.dl.sourceforge.net/project/mpv-player-windows/libmpv/mpv-dev-x86_64-v3-20231112-git-7cab30c.7z" $libmpv_output = "mpv.zip" +$ytdlp_version = "2023.11.16" +$ytdlp_link = "https://github.com/yt-dlp/yt-dlp/releases/download/$ytdlp_version/yt-dlp.exe" +$libmpv_output = "yt-dlp.exe" + Invoke-WebRequest -Uri "$maria_link" -OutFile "$maria_output" & ".\resources\scripts\7za\7za.exe" x "$maria_output" @@ -64,9 +68,12 @@ Invoke-WebRequest -Uri "$zlib_link" -OutFile "$zlib_output" Invoke-WebRequest -Uri "$libmpv_link" -OutFile "$libmpv_output" & ".\resources\scripts\7za\7za.exe" x "$libmpv_output" -ompv +Invoke-WebRequest -Uri "$ytdlp_link" -OutFile "$libmpv_output" + $cmake_path = "$old_pwd\cmake-$cmake_version-windows-x86_64\bin\cmake.exe" $zlib_path = "$old_pwd\zlib-$zlib_version" $libmpv_path = "$old_pwd\mpv" +$ytdlp_path = "$old_pwd\$libmpv_output" # Download Qt itself. $qt_path = "$old_pwd\qt" @@ -157,8 +164,9 @@ if ($git_tag -eq "devbuild") { } if ($use_webengine -eq "ON") { - # Copy libmpv. + # Copy libmpv and yt-dlp. Copy-Item -Path "$libmpv_path\libmpv*.dll" -Destination ".\app\" + Copy-Item -Path "$ytdlp_path" -Destination ".\app\" $packagebase = "rssguard-${git_tag}-${git_revision}-win" } diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt index 916c988fd..17bb005d9 100644 --- a/src/librssguard/CMakeLists.txt +++ b/src/librssguard/CMakeLists.txt @@ -551,6 +551,8 @@ elseif(ENABLE_MEDIAPLAYER_LIBMPV) NO_CACHE REQUIRED ) + + message(STATUS "Found libmpv: ${LibMPV_LIBRARIES}.") endif() if(NO_LITE)