diff --git a/dldlls.py b/dldlls.py index 768199ce1..7cbffb7a5 100755 --- a/dldlls.py +++ b/dldlls.py @@ -6,7 +6,7 @@ import sys import os -sha = '97b88f326c429bccab263f809a16798c3e1ec6b5' +sha = '67f6a4f9305a2ee1508215ad4a861f23f7b8e3da' filename = 'usdx-dlls-i686' urlbase = 'https://api.github.com/repos/UltraStar-Deluxe/mxe/' headers = { diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index 882c95fce..8de9d2ee6 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -89,6 +89,16 @@ IfFileExists $INSTDIR\libtiff-5.dll 0 +2 Delete "$INSTDIR\libtiff-5.dll" IfFileExists $INSTDIR\libwebp-4.dll 0 +2 Delete "$INSTDIR\libwebp-4.dll" +IfFileExists $INSTDIR\avcodec-60.dll 0 +2 +Delete "$INSTDIR\avcodec-60.dll" +IfFileExists $INSTDIR\avformat-60.dll 0 +2 +Delete "$INSTDIR\avformat-60.dll" +IfFileExists $INSTDIR\avutil-58.dll 0 +2 +Delete "$INSTDIR\avutil-58.dll" +IfFileExists $INSTDIR\swresample-4.dll 0 +2 +Delete "$INSTDIR\swresample-4.dll" +IfFileExists $INSTDIR\swscale-7.dll 0 +2 +Delete "$INSTDIR\swscale-7.dll" RMDir /r "$INSTDIR\Themes" RMDir /r "$INSTDIR\Skins" diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index e4deadb90..34c61ad7a 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -94,6 +94,11 @@ Delete "$INSTDIR\libtiff-6.dll" Delete "$INSTDIR\libwebp-7.dll" Delete "$INSTDIR\libdav1d.dll" + Delete "$INSTDIR\avcodec-61.dll" + Delete "$INSTDIR\avformat-61.dll" + Delete "$INSTDIR\avutil-59.dll" + Delete "$INSTDIR\swresample-5.dll" + Delete "$INSTDIR\swscale-8.dll" StrCpy $0 "$INSTDIR\songs" Call un.DeleteIfEmpty diff --git a/src/config-win.inc b/src/config-win.inc index 9460386b6..d7d2d28e5 100644 --- a/src/config-win.inc +++ b/src/config-win.inc @@ -15,49 +15,48 @@ {$IFEND} {$DEFINE HaveFFmpeg} -//the required DLLs can be downloaded here: https://ffmpeg.zeranoe.com/builds/win32/shared/ +//the required DLLs can be built with MXE {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF (0 > 0) or (6 > 0)} - {$DEFINE FFMPEG_DIR := 'ffmpeg-6.0'} - {$DEFINE FF_API_OLD_DECODE_AUDIO} + {$IF (0 > 0) or (7 > 0)} + {$DEFINE FFMPEG_DIR := 'ffmpeg-7.0'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} {$DEFINE useOLD_FFMPEG} {$IFEND} {$ENDIF} {$IF Defined(IncludeConstants)} - FFMPEG_VERSION_INT = 6000000; - av__codec = 'avcodec-60'; - LIBAVCODEC_VERSION_MAJOR = 60; + FFMPEG_VERSION_INT = 7000000; + av__codec = 'avcodec-61'; + LIBAVCODEC_VERSION_MAJOR = 61; LIBAVCODEC_VERSION_MINOR = 3; LIBAVCODEC_VERSION_RELEASE = 100; - av__format = 'avformat-60'; - LIBAVFORMAT_VERSION_MAJOR = 60; - LIBAVFORMAT_VERSION_MINOR = 3; + av__format = 'avformat-61'; + LIBAVFORMAT_VERSION_MAJOR = 61; + LIBAVFORMAT_VERSION_MINOR = 1; LIBAVFORMAT_VERSION_RELEASE = 100; - av__util = 'avutil-58'; - LIBAVUTIL_VERSION_MAJOR = 58; - LIBAVUTIL_VERSION_MINOR = 2; + av__util = 'avutil-59'; + LIBAVUTIL_VERSION_MAJOR = 59; + LIBAVUTIL_VERSION_MINOR = 8; LIBAVUTIL_VERSION_RELEASE = 100; {$IFEND} {$IFEND} {$DEFINE HaveSWResample} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} - sw__resample = 'swresample-4'; - LIBSWRESAMPLE_VERSION_MAJOR = 4; - LIBSWRESAMPLE_VERSION_MINOR = 10; + sw__resample = 'swresample-5'; + LIBSWRESAMPLE_VERSION_MAJOR = 5; + LIBSWRESAMPLE_VERSION_MINOR = 1; LIBSWRESAMPLE_VERSION_RELEASE = 100; {$IFEND} {$DEFINE HaveSWScale} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} - sw__scale = 'swscale-7'; - LIBSWSCALE_VERSION_MAJOR = 7; + sw__scale = 'swscale-8'; + LIBSWSCALE_VERSION_MAJOR = 8; LIBSWSCALE_VERSION_MINOR = 1; LIBSWSCALE_VERSION_RELEASE = 100; {$IFEND}