Merge branch 'cooker-0.8.0b' of https://github.com/XargonWan/RetroDECK into cooker-0.8.0b

net.retrodeck.retrodeck.yml

@@ -484,7 +484,7 @@ modules:
         install VkLayer_FROG_gamescope_wsi.x86_64.json
         /app/share/vulkan/implicit_layer.d/VkLayer_FROG_gamescope_wsi.x86_64.json
     modules:
-      - rd-submodules/retroarch/modules/libpng/libpng-1.6.35.json
+      - rd-submodules/retroarch/modules/libpng/libpng-1.6.json
       - rd-submodules/retroarch/modules/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
       - rd-submodules/shared-modules/SDL/SDL-1.2.15.json
       - rd-submodules/shared-modules/SDL/SDL_image-1.2.12.json
@@ -495,11 +495,11 @@ modules:
       # certificate glu issue
       #- rd-submodules/shared-modules/gudev/gudev.json
       - rd-submodules/retroarch/modules/libbz2/libbz2-1.0.8.json
-      - rd-submodules/retroarch/modules/xrandr/xrandr-1.5.1.json
+      - rd-submodules/retroarch/modules/xrandr/xrandr-1.5.json
       - rd-submodules/retroarch/modules/libaio/libaio-0.3.112.json
       # certificate issue, check glu module for more info
       #- rd-submodules/shared-modules/glu/glu-9.json
-      - rd-submodules/shared-modules/libdecor/libdecor-0.1.1.json
+      - rd-submodules/shared-modules/libdecor/libdecor.json
       - rd-submodules/retroarch/modules/gamemode/gamemode-1.8.json
   - name: retroarch-filers-video
     subdir: gfx/video_filters
@@ -1207,80 +1207,7 @@ modules:
   # SOLARUS - END
 
   # GZDoom - Start
-  # This is broken, so for the moment we're manual adding a previous version
-  # - rd-submodules/shared-modules/gzdoom/gzdoom.json
-
-  - name: libsndfile
-    buildsystem: autotools
-    sources:
-      - type: archive
-        url: >-
-          https://github.com/libsndfile/libsndfile/releases/download/1.2.2/libsndfile-1.2.2.tar.xz
-        sha256: 3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e
-        x-checker-data:
-          type: anitya
-          project-id: 13277
-          stable-only: true
-          url-template: >-
-            https://github.com/libsndfile/libsndfile/releases/download/$version/libsndfile-$version.tar.xz
-  - name: game-music-emu
-    buildsystem: cmake-ninja
-    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
-        x-checker-data:
-          type: anitya
-          project-id: 866
-          stable-only: true
-          url-template: >-
-            https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$version.tar.gz
-  - name: zmusic
-    buildsystem: cmake-ninja
-    config-opts:
-      - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
-    sources:
-      - type: archive
-        url: https://github.com/zdoom/ZMusic/archive/1.1.12.tar.gz
-        sha256: da818594b395aa9174561a36362332b0ab8e7906d2e556ec47669326e67613d4
-        x-checker-data:
-          type: anitya
-          project-id: 153600
-          stable-only: true
-          url-template: https://github.com/zdoom/ZMusic/archive/$version.tar.gz
-  - name: gzdoom
-    buildsystem: cmake-ninja
-    config-opts:
-      - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
-    cleanup:
-      - /lib/*.a
-      - /lib/*.la
-      - /lib/pkgconfig
-      - /include
-    sources:
-      - type: git
-        url: https://github.com/zdoom/gzdoom.git
-        tag: g4.11.2
-        commit: df5a3c1a9c673aed528813aead6002c833ac24ac
-        x-checker-data:
-          type: anitya
-          project-id: 17531
-          stable-only: true
-          tag-template: g$version
-      - type: file
-        url: https://github.com/zdoom/gzdoom/raw/g4.11.2/soundfont/gzdoom.sf2
-        sha256: a9058609b07c1f0e0c1f420e76c2e80ba78136e6173e836caab51ffb13e552f1
-      - type: patch
-        path: rd-submodules/shared-modules/gzdoom/description.patch
-    post-install:
-      - install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2
-    modules:
-      - rd-submodules/shared-modules/linux-audio/libinstpatch.json
-      - rd-submodules/shared-modules/linux-audio/fluidsynth2.json
-
+  - rd-submodules/shared-modules/gzdoom/gzdoom.json
   # GZDoom - END
   
   # MAME - Start