From 5d62f9798d3476e7eff97de206fccd3f9bec3883 Mon Sep 17 00:00:00 2001 From: Kevin Degeling Date: Sat, 22 May 2021 15:13:56 +0200 Subject: [PATCH 1/4] Update ZMusic to 1.1.7 --- org.zdoom.GZDoom.yaml | 7 +++++-- shared-modules | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml index 6801d8f..1bc12da 100644 --- a/org.zdoom.GZDoom.yaml +++ b/org.zdoom.GZDoom.yaml @@ -29,6 +29,9 @@ cleanup: modules: +# Upgrading to 2.2.x can only be done with ZMusic 1.1.8 which is not out yet +# FluidSynth 2.2.x will also include a proper SDL2 backend which should resolve +# the warning messages you now get. - shared-modules/linux-audio/fluidsynth2.json # Music library behind zdoom @@ -38,8 +41,8 @@ modules: - -DCMAKE_BUILD_TYPE=RelWithDebInfo sources: - type: archive - url: https://github.com/coelckers/ZMusic/archive/1.1.3.tar.gz - sha256: 5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf + url: https://github.com/coelckers/ZMusic/archive/1.1.7.tar.gz + sha256: 3800e40da5015fb3eee408b0639d69ece49cfd0d00466292e48b8ff94383d9f2 # This builds both the application code and # the custom game data diff --git a/shared-modules b/shared-modules index ca1664c..a79072c 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit ca1664c5d1d94899432f364f006c582898afbae2 +Subproject commit a79072c2f6cd6c5b1a6cb8ccec649cfb87608926 From 2630138c336c1ee1238c0be83117cd5d2154c0f8 Mon Sep 17 00:00:00 2001 From: Kevin Degeling Date: Sat, 22 May 2021 15:14:23 +0200 Subject: [PATCH 2/4] Include game-music-emu --- org.zdoom.GZDoom.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml index 1bc12da..4b35049 100644 --- a/org.zdoom.GZDoom.yaml +++ b/org.zdoom.GZDoom.yaml @@ -34,6 +34,15 @@ modules: # the warning messages you now get. - shared-modules/linux-audio/fluidsynth2.json +- name: game-music-emu + buildsystem: cmake + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + sources: + - type: archive + url: https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.3.tar.gz + sha256: 626e8a104e0dadd10ef6519a67aca880c7b40f81471659f1935b61754e12fc7b + # Music library behind zdoom - name: zmusic buildsystem: cmake-ninja From 4e34bd69f628d88569a89013760818b783974ac6 Mon Sep 17 00:00:00 2001 From: Kevin Degeling Date: Sat, 22 May 2021 15:34:45 +0200 Subject: [PATCH 3/4] Include aditional audio libraries --- org.zdoom.GZDoom.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml index 4b35049..9e8d4d9 100644 --- a/org.zdoom.GZDoom.yaml +++ b/org.zdoom.GZDoom.yaml @@ -29,6 +29,32 @@ cleanup: modules: +- name: mpg123 + buildsystem: autotools + sources: + - type: archive + url: https://sourceforge.net/projects/mpg123/files/mpg123/1.27.2/mpg123-1.27.2.tar.bz2 + sha256: 52f6ceb962c05db0c043bb27acf5a721381f5f356ac4610e5221f50293891b04 + +- name: libsdnfile + buildsystem: cmake + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DBUILD_SHARED_LIBS=ON + sources: + - type: archive + url: https://github.com/libsndfile/libsndfile/archive/refs/tags/1.0.31.tar.gz + sha256: 8cdee0acb06bb0a3c1a6ca524575643df8b1f3a55a0893b4dd9f829d08263785 + +- name: openal + buildsystem: cmake + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + sources: + - type: archive + url: https://github.com/kcat/openal-soft/archive/refs/tags/1.21.1.tar.gz + sha256: 8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f + # Upgrading to 2.2.x can only be done with ZMusic 1.1.8 which is not out yet # FluidSynth 2.2.x will also include a proper SDL2 backend which should resolve # the warning messages you now get. From 55837243869cbbb25b0fb311bc4ed19528034e19 Mon Sep 17 00:00:00 2001 From: Kevin Degeling Date: Sat, 22 May 2021 15:58:39 +0200 Subject: [PATCH 4/4] Update FluidSynth to 2.2.0 Remove unused libs, ensure compatibility with ZMusic through toggle --- org.zdoom.GZDoom.yaml | 33 ++++----------------------------- shared-modules | 2 +- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml index 9e8d4d9..d924cbf 100644 --- a/org.zdoom.GZDoom.yaml +++ b/org.zdoom.GZDoom.yaml @@ -29,35 +29,7 @@ cleanup: modules: -- name: mpg123 - buildsystem: autotools - sources: - - type: archive - url: https://sourceforge.net/projects/mpg123/files/mpg123/1.27.2/mpg123-1.27.2.tar.bz2 - sha256: 52f6ceb962c05db0c043bb27acf5a721381f5f356ac4610e5221f50293891b04 - -- name: libsdnfile - buildsystem: cmake - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_SHARED_LIBS=ON - sources: - - type: archive - url: https://github.com/libsndfile/libsndfile/archive/refs/tags/1.0.31.tar.gz - sha256: 8cdee0acb06bb0a3c1a6ca524575643df8b1f3a55a0893b4dd9f829d08263785 - -- name: openal - buildsystem: cmake - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - sources: - - type: archive - url: https://github.com/kcat/openal-soft/archive/refs/tags/1.21.1.tar.gz - sha256: 8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f - -# Upgrading to 2.2.x can only be done with ZMusic 1.1.8 which is not out yet -# FluidSynth 2.2.x will also include a proper SDL2 backend which should resolve -# the warning messages you now get. +- shared-modules/linux-audio/libinstpatch.json - shared-modules/linux-audio/fluidsynth2.json - name: game-music-emu @@ -74,6 +46,9 @@ modules: buildsystem: cmake-ninja config-opts: - -DCMAKE_BUILD_TYPE=RelWithDebInfo + # Required with FluidSynth 2.2.x + # Should be fixed with ZMusic 1.1.8 + - -DDYN_FLUIDSYNTH=OFF sources: - type: archive url: https://github.com/coelckers/ZMusic/archive/1.1.7.tar.gz diff --git a/shared-modules b/shared-modules index a79072c..0e412f4 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit a79072c2f6cd6c5b1a6cb8ccec649cfb87608926 +Subproject commit 0e412f4bb009443fa7940334e9d895bf9008f900