From 20fe816c7d3cd22dfac8afc6b76cf6f2dada9501 Mon Sep 17 00:00:00 2001 From: Kevin Degeling Date: Fri, 30 Oct 2020 21:42:31 +0100 Subject: [PATCH 1/3] Update shared modules --- .gitmodules | 3 +++ shared-modules | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 shared-modules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..ea3adf1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "shared-modules"] + path = shared-modules + url = https://github.com/flathub/shared-modules diff --git a/shared-modules b/shared-modules new file mode 160000 index 0000000..ca1664c --- /dev/null +++ b/shared-modules @@ -0,0 +1 @@ +Subproject commit ca1664c5d1d94899432f364f006c582898afbae2 From eba510a0532727ad35a9366950f95152d7f2852e Mon Sep 17 00:00:00 2001 From: Kevin Degeling Date: Fri, 30 Oct 2020 21:48:10 +0100 Subject: [PATCH 2/3] Audio dependency updates --- org.zdoom.GZDoom.yaml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml index 5be6665..3938256 100644 --- a/org.zdoom.GZDoom.yaml +++ b/org.zdoom.GZDoom.yaml @@ -29,15 +29,7 @@ cleanup: modules: -- name: fluidsynth - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DLIB_SUFFIX= - sources: - - type: archive - url: https://github.com/FluidSynth/fluidsynth/archive/v1.1.11.tar.gz - sha256: da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8 +- shared-modules/linux-audio/fluidsynth2.json # Music library behind zdoom - name: zmusic @@ -46,8 +38,8 @@ modules: - -DCMAKE_BUILD_TYPE=RelWithDebInfo sources: - type: archive - url: https://github.com/coelckers/ZMusic/archive/1.1.0.tar.gz - sha256: 69255ddb62ecb238474bc57e3f761a593006a22eef90c4e786ef613d9a643b3a + url: https://github.com/coelckers/ZMusic/archive/1.1.3.tar.gz + sha256: 5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf # This builds both the application code and # the custom game data From 1d623d6ab521ba5e881bbb041eec93249cb26f8e Mon Sep 17 00:00:00 2001 From: Kevin Degeling Date: Sat, 31 Oct 2020 12:58:01 +0100 Subject: [PATCH 3/3] GZDoom g4.5.0 --- org.zdoom.GZDoom.appdata.xml | 10 ++++++++++ org.zdoom.GZDoom.yaml | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/org.zdoom.GZDoom.appdata.xml b/org.zdoom.GZDoom.appdata.xml index 014b046..bd30ef8 100644 --- a/org.zdoom.GZDoom.appdata.xml +++ b/org.zdoom.GZDoom.appdata.xml @@ -70,6 +70,16 @@ + + +

Updated release package to GZDoom 4.5.0

+
+
+ + +

Updated release package to GZDoom 4.4.2

+
+

Updated release package to GZDoom 4.4.1

diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml index 3938256..6801d8f 100644 --- a/org.zdoom.GZDoom.yaml +++ b/org.zdoom.GZDoom.yaml @@ -50,10 +50,10 @@ modules: sources: - type: git url: https://github.com/coelckers/gzdoom.git - tag: g4.4.2 - commit: 04e53b815f8c1653cc77d5b6b376d99f93110be6 + tag: g4.5.0 + commit: 3037c08840f209f9f6b6d7e6c2c69632472a5d54 - type: file - url: https://github.com/coelckers/gzdoom/raw/g4.4.2/soundfont/gzdoom.sf2 + url: https://github.com/coelckers/gzdoom/raw/g4.5.0/soundfont/gzdoom.sf2 sha256: fca3e514b635a21789d4224e84865d2954a2a914d46b64aa8219ddb565c44869 # I've discussed these patches upstream and a special -DFLATPAK_BUNDLE has been approved # https://forum.zdoom.org/viewtopic.php?f=15&t=68365&sid=884a41102b499f98ed9c76a62ee0e41d