diff --git a/Readme b/Readme index 8b56e9a41..128b6125d 100644 --- a/Readme +++ b/Readme @@ -155,7 +155,7 @@ History - Updated codecs - - updated Monkey's Audio to version 5.23 + - updated Monkey's Audio to version 5.24 - Updated translations diff --git a/Readme.de b/Readme.de index 66c4554df..9bc95d00b 100644 --- a/Readme.de +++ b/Readme.de @@ -155,7 +155,7 @@ Geschichte - Aktualisierte Codecs - - Monkey's Audio auf Version 5.23 aktualisiert + - Monkey's Audio auf Version 5.24 aktualisiert - Aktualisierte Übersetzungen diff --git a/packaging/flatpak/org.freac.freac.json b/packaging/flatpak/org.freac.freac.json index 3cc57099f..42a2f20db 100644 --- a/packaging/flatpak/org.freac.freac.json +++ b/packaging/flatpak/org.freac.freac.json @@ -98,13 +98,13 @@ "sources": [ { "type": "archive", - "url": "https://monkeysaudio.com/files/MAC_SDK_523.zip", - "sha256": "1c7e3c9e774fa9212ee8f1f79e38926959a9928576e77274745c3ef3ab8a6286", + "url": "https://monkeysaudio.com/files/MAC_SDK_524.zip", + "sha256": "dec92080e06e30fabb3565ad6f9987394c77b3af105291d2965ddf0a3b473fb8", "strip-components": 0 }, { "type": "patch", - "path": "patches/mac-sdk-5.23-gcc.patch" + "path": "patches/mac-sdk-5.24-gcc.patch" } ] }, diff --git a/packaging/flatpak/patches/mac-sdk-5.23-gcc.patch b/packaging/flatpak/patches/mac-sdk-5.24-gcc.patch similarity index 81% rename from packaging/flatpak/patches/mac-sdk-5.23-gcc.patch rename to packaging/flatpak/patches/mac-sdk-5.24-gcc.patch index 257f2c465..41fcfd629 100644 --- a/packaging/flatpak/patches/mac-sdk-5.23-gcc.patch +++ b/packaging/flatpak/patches/mac-sdk-5.24-gcc.patch @@ -1,6 +1,6 @@ -diff -Naur mac-sdk-5.23/Makefile mac-sdk-5.23-gcc/Makefile ---- mac-sdk-5.23/Makefile 1970-01-01 00:00:00 +0000 -+++ mac-sdk-5.23-gcc/Makefile 2019-11-21 21:28:57 +0000 +diff -Naur mac-sdk-5.24/Makefile mac-sdk-5.24-gcc/Makefile +--- mac-sdk-5.24/Makefile 1970-01-01 00:00:00 +0000 ++++ mac-sdk-5.24-gcc/Makefile 2019-11-21 21:28:57 +0000 @@ -0,0 +1,8 @@ +all: + $(MAKE) -f Source/Projects/NonWindows/Makefile @@ -10,9 +10,9 @@ diff -Naur mac-sdk-5.23/Makefile mac-sdk-5.23-gcc/Makefile + +clean: + $(MAKE) -f Source/Projects/NonWindows/Makefile clean -diff -Naur mac-sdk-5.23/Shared/All.h mac-sdk-5.23-gcc/Shared/All.h ---- mac-sdk-5.23/Shared/All.h 2020-03-12 23:31:00 +0000 -+++ mac-sdk-5.23-gcc/Shared/All.h 2020-03-14 11:49:57 +0000 +diff -Naur mac-sdk-5.24/Shared/All.h mac-sdk-5.24-gcc/Shared/All.h +--- mac-sdk-5.24/Shared/All.h 2020-03-21 23:42:27 +0000 ++++ mac-sdk-5.24-gcc/Shared/All.h 2020-03-22 12:08:53 +0000 @@ -86,46 +86,17 @@ #define ENABLE_COMPRESSION_MODE_HIGH #define ENABLE_COMPRESSION_MODE_EXTRA_HIGH @@ -78,9 +78,9 @@ diff -Naur mac-sdk-5.23/Shared/All.h mac-sdk-5.23-gcc/Shared/All.h #define strcpy_s(A, B, C) strcpy(A, C) #define _tcscat_s(A, B, C) _tcscat(A, C) #endif -diff -Naur mac-sdk-5.23/Shared/NoWindows.h mac-sdk-5.23-gcc/Shared/NoWindows.h ---- mac-sdk-5.23/Shared/NoWindows.h 2019-12-03 22:21:06 +0000 -+++ mac-sdk-5.23-gcc/Shared/NoWindows.h 2019-12-15 10:16:26 +0000 +diff -Naur mac-sdk-5.24/Shared/NoWindows.h mac-sdk-5.24-gcc/Shared/NoWindows.h +--- mac-sdk-5.24/Shared/NoWindows.h 2019-12-03 22:21:06 +0000 ++++ mac-sdk-5.24-gcc/Shared/NoWindows.h 2019-12-15 10:16:26 +0000 @@ -48,7 +48,7 @@ #define _totlower towlower #define _totupper towupper @@ -90,9 +90,9 @@ diff -Naur mac-sdk-5.23/Shared/NoWindows.h mac-sdk-5.23-gcc/Shared/NoWindows.h #define _tcscpy wcscpy #define _tcslen wcslen -diff -Naur mac-sdk-5.23/Source/Console/Console.cpp mac-sdk-5.23-gcc/Source/Console/Console.cpp ---- mac-sdk-5.23/Source/Console/Console.cpp 2020-01-16 23:41:58 +0000 -+++ mac-sdk-5.23-gcc/Source/Console/Console.cpp 2020-01-27 22:39:38 +0000 +diff -Naur mac-sdk-5.24/Source/Console/Console.cpp mac-sdk-5.24-gcc/Source/Console/Console.cpp +--- mac-sdk-5.24/Source/Console/Console.cpp 2020-01-16 23:41:58 +0000 ++++ mac-sdk-5.24-gcc/Source/Console/Console.cpp 2020-01-27 22:39:38 +0000 @@ -21,7 +21,12 @@ #define UNDEFINED_MODE -1 @@ -107,9 +107,9 @@ diff -Naur mac-sdk-5.23/Source/Console/Console.cpp mac-sdk-5.23-gcc/Source/Conso #define _tmain(argc, argv) main(argc, argv) #define _tcscpy_s(dst, num, src) strcpy(dst, src) #define _tcsncpy_s(dst, num, src, count) strncpy(dst, src, count) -diff -Naur mac-sdk-5.23/Source/Shared/All.h mac-sdk-5.23-gcc/Source/Shared/All.h ---- mac-sdk-5.23/Source/Shared/All.h 2020-03-12 23:31:00 +0000 -+++ mac-sdk-5.23-gcc/Source/Shared/All.h 2020-03-14 11:49:57 +0000 +diff -Naur mac-sdk-5.24/Source/Shared/All.h mac-sdk-5.24-gcc/Source/Shared/All.h +--- mac-sdk-5.24/Source/Shared/All.h 2020-03-21 23:42:27 +0000 ++++ mac-sdk-5.24-gcc/Source/Shared/All.h 2020-03-22 12:08:53 +0000 @@ -86,46 +86,17 @@ #define ENABLE_COMPRESSION_MODE_HIGH #define ENABLE_COMPRESSION_MODE_EXTRA_HIGH @@ -175,9 +175,9 @@ diff -Naur mac-sdk-5.23/Source/Shared/All.h mac-sdk-5.23-gcc/Source/Shared/All.h #define strcpy_s(A, B, C) strcpy(A, C) #define _tcscat_s(A, B, C) _tcscat(A, C) #endif -diff -Naur mac-sdk-5.23/Source/Shared/NoWindows.h mac-sdk-5.23-gcc/Source/Shared/NoWindows.h ---- mac-sdk-5.23/Source/Shared/NoWindows.h 2019-12-03 22:21:06 +0000 -+++ mac-sdk-5.23-gcc/Source/Shared/NoWindows.h 2019-12-15 10:16:26 +0000 +diff -Naur mac-sdk-5.24/Source/Shared/NoWindows.h mac-sdk-5.24-gcc/Source/Shared/NoWindows.h +--- mac-sdk-5.24/Source/Shared/NoWindows.h 2019-12-03 22:21:06 +0000 ++++ mac-sdk-5.24-gcc/Source/Shared/NoWindows.h 2019-12-15 10:16:26 +0000 @@ -48,7 +48,7 @@ #define _totlower towlower #define _totupper towupper @@ -187,8 +187,8 @@ diff -Naur mac-sdk-5.23/Source/Shared/NoWindows.h mac-sdk-5.23-gcc/Source/Shared #define _tcscpy wcscpy #define _tcslen wcslen -diff -Naur mac-sdk-5.23/configure mac-sdk-5.23-gcc/configure ---- mac-sdk-5.23/configure 1970-01-01 00:00:00 +0000 -+++ mac-sdk-5.23-gcc/configure 2019-11-21 21:28:57 +0000 +diff -Naur mac-sdk-5.24/configure mac-sdk-5.24-gcc/configure +--- mac-sdk-5.24/configure 1970-01-01 00:00:00 +0000 ++++ mac-sdk-5.24-gcc/configure 2019-11-21 21:28:57 +0000 @@ -0,0 +1 @@ +#!/bin/sh diff --git a/packaging/snapcraft/patches/mac-sdk-5.23-gcc.patch b/packaging/snapcraft/patches/mac-sdk-5.24-gcc.patch similarity index 81% rename from packaging/snapcraft/patches/mac-sdk-5.23-gcc.patch rename to packaging/snapcraft/patches/mac-sdk-5.24-gcc.patch index 257f2c465..41fcfd629 100644 --- a/packaging/snapcraft/patches/mac-sdk-5.23-gcc.patch +++ b/packaging/snapcraft/patches/mac-sdk-5.24-gcc.patch @@ -1,6 +1,6 @@ -diff -Naur mac-sdk-5.23/Makefile mac-sdk-5.23-gcc/Makefile ---- mac-sdk-5.23/Makefile 1970-01-01 00:00:00 +0000 -+++ mac-sdk-5.23-gcc/Makefile 2019-11-21 21:28:57 +0000 +diff -Naur mac-sdk-5.24/Makefile mac-sdk-5.24-gcc/Makefile +--- mac-sdk-5.24/Makefile 1970-01-01 00:00:00 +0000 ++++ mac-sdk-5.24-gcc/Makefile 2019-11-21 21:28:57 +0000 @@ -0,0 +1,8 @@ +all: + $(MAKE) -f Source/Projects/NonWindows/Makefile @@ -10,9 +10,9 @@ diff -Naur mac-sdk-5.23/Makefile mac-sdk-5.23-gcc/Makefile + +clean: + $(MAKE) -f Source/Projects/NonWindows/Makefile clean -diff -Naur mac-sdk-5.23/Shared/All.h mac-sdk-5.23-gcc/Shared/All.h ---- mac-sdk-5.23/Shared/All.h 2020-03-12 23:31:00 +0000 -+++ mac-sdk-5.23-gcc/Shared/All.h 2020-03-14 11:49:57 +0000 +diff -Naur mac-sdk-5.24/Shared/All.h mac-sdk-5.24-gcc/Shared/All.h +--- mac-sdk-5.24/Shared/All.h 2020-03-21 23:42:27 +0000 ++++ mac-sdk-5.24-gcc/Shared/All.h 2020-03-22 12:08:53 +0000 @@ -86,46 +86,17 @@ #define ENABLE_COMPRESSION_MODE_HIGH #define ENABLE_COMPRESSION_MODE_EXTRA_HIGH @@ -78,9 +78,9 @@ diff -Naur mac-sdk-5.23/Shared/All.h mac-sdk-5.23-gcc/Shared/All.h #define strcpy_s(A, B, C) strcpy(A, C) #define _tcscat_s(A, B, C) _tcscat(A, C) #endif -diff -Naur mac-sdk-5.23/Shared/NoWindows.h mac-sdk-5.23-gcc/Shared/NoWindows.h ---- mac-sdk-5.23/Shared/NoWindows.h 2019-12-03 22:21:06 +0000 -+++ mac-sdk-5.23-gcc/Shared/NoWindows.h 2019-12-15 10:16:26 +0000 +diff -Naur mac-sdk-5.24/Shared/NoWindows.h mac-sdk-5.24-gcc/Shared/NoWindows.h +--- mac-sdk-5.24/Shared/NoWindows.h 2019-12-03 22:21:06 +0000 ++++ mac-sdk-5.24-gcc/Shared/NoWindows.h 2019-12-15 10:16:26 +0000 @@ -48,7 +48,7 @@ #define _totlower towlower #define _totupper towupper @@ -90,9 +90,9 @@ diff -Naur mac-sdk-5.23/Shared/NoWindows.h mac-sdk-5.23-gcc/Shared/NoWindows.h #define _tcscpy wcscpy #define _tcslen wcslen -diff -Naur mac-sdk-5.23/Source/Console/Console.cpp mac-sdk-5.23-gcc/Source/Console/Console.cpp ---- mac-sdk-5.23/Source/Console/Console.cpp 2020-01-16 23:41:58 +0000 -+++ mac-sdk-5.23-gcc/Source/Console/Console.cpp 2020-01-27 22:39:38 +0000 +diff -Naur mac-sdk-5.24/Source/Console/Console.cpp mac-sdk-5.24-gcc/Source/Console/Console.cpp +--- mac-sdk-5.24/Source/Console/Console.cpp 2020-01-16 23:41:58 +0000 ++++ mac-sdk-5.24-gcc/Source/Console/Console.cpp 2020-01-27 22:39:38 +0000 @@ -21,7 +21,12 @@ #define UNDEFINED_MODE -1 @@ -107,9 +107,9 @@ diff -Naur mac-sdk-5.23/Source/Console/Console.cpp mac-sdk-5.23-gcc/Source/Conso #define _tmain(argc, argv) main(argc, argv) #define _tcscpy_s(dst, num, src) strcpy(dst, src) #define _tcsncpy_s(dst, num, src, count) strncpy(dst, src, count) -diff -Naur mac-sdk-5.23/Source/Shared/All.h mac-sdk-5.23-gcc/Source/Shared/All.h ---- mac-sdk-5.23/Source/Shared/All.h 2020-03-12 23:31:00 +0000 -+++ mac-sdk-5.23-gcc/Source/Shared/All.h 2020-03-14 11:49:57 +0000 +diff -Naur mac-sdk-5.24/Source/Shared/All.h mac-sdk-5.24-gcc/Source/Shared/All.h +--- mac-sdk-5.24/Source/Shared/All.h 2020-03-21 23:42:27 +0000 ++++ mac-sdk-5.24-gcc/Source/Shared/All.h 2020-03-22 12:08:53 +0000 @@ -86,46 +86,17 @@ #define ENABLE_COMPRESSION_MODE_HIGH #define ENABLE_COMPRESSION_MODE_EXTRA_HIGH @@ -175,9 +175,9 @@ diff -Naur mac-sdk-5.23/Source/Shared/All.h mac-sdk-5.23-gcc/Source/Shared/All.h #define strcpy_s(A, B, C) strcpy(A, C) #define _tcscat_s(A, B, C) _tcscat(A, C) #endif -diff -Naur mac-sdk-5.23/Source/Shared/NoWindows.h mac-sdk-5.23-gcc/Source/Shared/NoWindows.h ---- mac-sdk-5.23/Source/Shared/NoWindows.h 2019-12-03 22:21:06 +0000 -+++ mac-sdk-5.23-gcc/Source/Shared/NoWindows.h 2019-12-15 10:16:26 +0000 +diff -Naur mac-sdk-5.24/Source/Shared/NoWindows.h mac-sdk-5.24-gcc/Source/Shared/NoWindows.h +--- mac-sdk-5.24/Source/Shared/NoWindows.h 2019-12-03 22:21:06 +0000 ++++ mac-sdk-5.24-gcc/Source/Shared/NoWindows.h 2019-12-15 10:16:26 +0000 @@ -48,7 +48,7 @@ #define _totlower towlower #define _totupper towupper @@ -187,8 +187,8 @@ diff -Naur mac-sdk-5.23/Source/Shared/NoWindows.h mac-sdk-5.23-gcc/Source/Shared #define _tcscpy wcscpy #define _tcslen wcslen -diff -Naur mac-sdk-5.23/configure mac-sdk-5.23-gcc/configure ---- mac-sdk-5.23/configure 1970-01-01 00:00:00 +0000 -+++ mac-sdk-5.23-gcc/configure 2019-11-21 21:28:57 +0000 +diff -Naur mac-sdk-5.24/configure mac-sdk-5.24-gcc/configure +--- mac-sdk-5.24/configure 1970-01-01 00:00:00 +0000 ++++ mac-sdk-5.24-gcc/configure 2019-11-21 21:28:57 +0000 @@ -0,0 +1 @@ +#!/bin/sh diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a6dce1553..fcfe603fa 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -91,8 +91,8 @@ parts: libmac: after: [ patches ] - source: https://freac.org/patches/MAC_SDK_523.zip - source-checksum: sha256/1c7e3c9e774fa9212ee8f1f79e38926959a9928576e77274745c3ef3ab8a6286 + source: https://freac.org/patches/MAC_SDK_524.zip + source-checksum: sha256/dec92080e06e30fabb3565ad6f9987394c77b3af105291d2965ddf0a3b473fb8 source-subdir: . plugin: make make-parameters: [ prefix=/usr ] @@ -100,7 +100,7 @@ parts: - CXXFLAGS: "$CXXFLAGS -O3 -funroll-loops" override-build: | if [ `lscpu | grep -i 'byte order' | awk '{ print tolower($3) }'` = "little" ]; then - patch -p1 < $SNAPCRAFT_STAGE/mac-sdk-5.23-gcc.patch + patch -p1 < $SNAPCRAFT_STAGE/mac-sdk-5.24-gcc.patch snapcraftctl build fi prime: diff --git a/tools/build-codecs b/tools/build-codecs index f6b44b007..c4a9e7965 100755 --- a/tools/build-codecs +++ b/tools/build-codecs @@ -109,7 +109,7 @@ libcdio_paranoia_version=10.2+2.0.1 libogg_version=1.3.4 libsamplerate_version=0.1.9 libsndfile_version=1.0.28 -mac_version=5.23 +mac_version=5.24 mp4v2_version=2.0.0 mpg123_version=1.25.13 musepack_version=4.75