Update DLLs

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 = {

game/LICENSE.lua.txt

@@ -1,4 +1,4 @@
-Copyright © 1994–2023 Lua.org, PUC-Rio.
+Copyright (C) 1994–2024 Lua.org, PUC-Rio.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

game/LICENSE.png.txt

@@ -8,8 +8,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2022 The PNG Reference Library Authors.
- * Copyright (c) 2018-2022 Cosmin Truta.
+ * Copyright (c) 1995-2024 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2024 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.

game/LICENSE.sdl2_image.txt

@@ -0,0 +1,17 @@
+Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.

game/LICENSE.sqlite.txt

@@ -41,7 +41,7 @@ Warranty of Title
 
 SQLite is in the public domain and does not require a license. Even so, some
 organizations want legal proof of their right to use SQLite. Circumstances
-where this might occurs include the following:
+where this might occur include the following:
 
   • Your company desires indemnity against claims of copyright infringement.
   • You are using SQLite in a jurisdiction that does not recognize the public
@@ -56,10 +56,10 @@ If any of the above circumstances apply to you, Hwaci, the company that employs
 all the developers of SQLite, will sell you a Warranty of Title for SQLite. A
 Warranty of Title is a legal document that asserts that the claimed authors of
 SQLite are the true authors, and that the authors have the legal right to
-dedicate the SQLite to the public domain, and that Hwaci will vigorously defend
-against challenges to those claims. All proceeds from the sale of SQLite
-Warranties of Title are used to fund continuing improvement and support of
-SQLite.
+dedicate the SQLite library into the public domain, and that Hwaci will
+vigorously defend against challenges to those claims. All proceeds from the
+sale of SQLite Warranties of Title are used to fund continuing improvement and
+support of SQLite.
 
 Contributed Code
 

installer/dependencies/documents/thirdparty/LICENSE.lua.txt

@@ -1,4 +1,4 @@
-Copyright © 1994–2023 Lua.org, PUC-Rio.
+Copyright (C) 1994–2024 Lua.org, PUC-Rio.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

installer/dependencies/documents/thirdparty/LICENSE.png.txt

@@ -8,8 +8,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2022 The PNG Reference Library Authors.
- * Copyright (c) 2018-2022 Cosmin Truta.
+ * Copyright (c) 1995-2024 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2024 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.

installer/dependencies/documents/thirdparty/LICENSE.sdl2_image.txt

@@ -0,0 +1,17 @@
+Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.

installer/dependencies/documents/thirdparty/LICENSE.sqlite.txt

@@ -41,7 +41,7 @@ Warranty of Title
 
 SQLite is in the public domain and does not require a license. Even so, some
 organizations want legal proof of their right to use SQLite. Circumstances
-where this might occurs include the following:
+where this might occur include the following:
 
   • Your company desires indemnity against claims of copyright infringement.
   • You are using SQLite in a jurisdiction that does not recognize the public
@@ -56,10 +56,10 @@ If any of the above circumstances apply to you, Hwaci, the company that employs
 all the developers of SQLite, will sell you a Warranty of Title for SQLite. A
 Warranty of Title is a legal document that asserts that the claimed authors of
 SQLite are the true authors, and that the authors have the legal right to
-dedicate the SQLite to the public domain, and that Hwaci will vigorously defend
-against challenges to those claims. All proceeds from the sale of SQLite
-Warranties of Title are used to fund continuing improvement and support of
-SQLite.
+dedicate the SQLite library into the public domain, and that Hwaci will
+vigorously defend against challenges to those claims. All proceeds from the
+sale of SQLite Warranties of Title are used to fund continuing improvement and
+support of SQLite.
 
 Contributed Code
 

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"

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 

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}