diff --git a/gzdoom/0001-Fix-libxmp-playback.patch b/gzdoom/0001-Fix-libxmp-playback.patch deleted file mode 100644 index cf778797..00000000 --- a/gzdoom/0001-Fix-libxmp-playback.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f6facdaa683e7159b7569d5287a088da352a7c92 Mon Sep 17 00:00:00 2001 -From: Andrew Rabert -Date: Sat, 11 Jan 2025 00:26:08 -0500 -Subject: [PATCH] Fix libxmp playback Fixes crashing when the int16_buffer is - smaller than the desired len. Particularly, I was seeing the int16_buffer - with a size of 0. - ---- - source/streamsources/music_libxmp.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/streamsources/music_libxmp.cpp b/source/streamsources/music_libxmp.cpp -index e235b06..999e046 100644 ---- a/source/streamsources/music_libxmp.cpp -+++ b/source/streamsources/music_libxmp.cpp -@@ -126,7 +126,7 @@ bool XMPSong::SetSubsong(int subsong) - - bool XMPSong::GetData(void *buffer, size_t len) - { -- if ((len / 4) < int16_buffer.size()) -+ if ((len / 4) > int16_buffer.size()) - int16_buffer.resize(len / 4); - - int ret = xmp_play_buffer(context, (void*)int16_buffer.data(), len / 2, m_Looping? INT_MAX : 0); --- -2.47.1 - diff --git a/gzdoom/gzdoom.json b/gzdoom/gzdoom.json index 961eacc8..5b9801d4 100644 --- a/gzdoom/gzdoom.json +++ b/gzdoom/gzdoom.json @@ -41,7 +41,10 @@ "./zmusic.json", { "name": "libsndfile", - "buildsystem": "autotools", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ], "sources": [ { "type": "archive", diff --git a/gzdoom/zmusic.json b/gzdoom/zmusic.json index 8ab443b9..5f76d346 100644 --- a/gzdoom/zmusic.json +++ b/gzdoom/zmusic.json @@ -7,18 +7,14 @@ "sources": [ { "type": "archive", - "url": "https://github.com/zdoom/ZMusic/archive/1.1.14.tar.gz", - "sha256": "f04410fe4ea08136f37703e7715c27df4c8532ace1e721cf40c6f303a93acc54", + "url": "https://github.com/zdoom/ZMusic/archive/1.2.0.tar.gz", + "sha256": "fc8419a5fa80faa2363a57711e4ec4670b3628aecf1dc9b4306f4add0ce09d2b", "x-checker-data": { "type": "anitya", "project-id": 153600, "stable-only": true, "url-template": "https://github.com/zdoom/ZMusic/archive/$version.tar.gz" - } - }, - { - "type": "patch", - "path": "0001-Fix-libxmp-playback.patch" + } } ] }