From 073a9a3d2e381856f3ae6ff50b68b7f613ef79cd Mon Sep 17 00:00:00 2001
From: Kevin Degeling <contact@kevindegeling.nl>
Date: Thu, 3 Jun 2021 16:35:45 +0200
Subject: [PATCH] Switch to a shared-module

---
 org.zdoom.GZDoom.yaml | 32 +-------------------------------
 shared-modules        |  2 +-
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml
index ea98bf2..82f61a7 100644
--- a/org.zdoom.GZDoom.yaml
+++ b/org.zdoom.GZDoom.yaml
@@ -41,37 +41,7 @@ modules:
     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
-  config-opts:
-  - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-  sources:
-  - type: archive
-    url: https://github.com/coelckers/ZMusic/archive/1.1.8.tar.gz
-    sha256: 73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68
-
-# This builds both the application code and
-# the custom game data
-- name: gzdoom
-  buildsystem: cmake-ninja
-  config-opts:
-  - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-  sources:
-  - type: git
-    url: https://github.com/coelckers/gzdoom.git
-    tag: g4.6.0
-    commit: c320db66f4b31256d5ad400610a2e1fab028dfe7
-  - type: file
-    url: https://github.com/coelckers/gzdoom/raw/g4.6.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
-  - type: patch
-    path: description.patch
-  - type: shell
-    commands:
-    - install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2
+- shared-modules/gzdoom/gzdoom.json
 
 - name: launcher
   buildsystem: simple
diff --git a/shared-modules b/shared-modules
index 45cc381..2c3a597 160000
--- a/shared-modules
+++ b/shared-modules
@@ -1 +1 @@
-Subproject commit 45cc381cdb43da1f22bc61baba4e390792eb5f8b
+Subproject commit 2c3a597e00f806744299af22782d49cb85353abc