From 473936c8cd741e62c2924d9c1c4f5c53eccade9a Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 11:47:23 -0300 Subject: [PATCH 01/10] Update org.srb2.SRB2.yaml --- org.srb2.SRB2.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index 97b9661..d23e43e 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -53,6 +53,21 @@ modules: stable-only: true url-template: https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$version+release.autotools.tar.gz + - name: sdl-mixer-x + buildsystem: autotools + no-autogen: true + build-options: + strip: false + no-debuginfo: true + cleanup: + - /include + - /lib/*.a + - /lib/*.la + sources: + - type: git + url: https://github.com/WohlSoft/SDL-Mixer-X.git + commit: 7181c771aa29deaea8bfbe6098613c3a929e9189 + - name: srb2 buildsystem: simple build-options: @@ -64,7 +79,7 @@ modules: env: ARCH_MAKE_ARGS: LINUX64=1 X86_64=1 build-commands: - - make -C src -j $FLATPAK_BUILDER_N_JOBS NOUPX=1 SDL=1 $ARCH_MAKE_ARGS + - make -C src -j $FLATPAK_BUILDER_N_JOBS NOUPX=1 SDL=1 HAVE_MIXERX=1 $ARCH_MAKE_ARGS - install -D -m 755 -t $FLATPAK_DEST/bin bin/lsdl2srb2 - install -D -m 644 srb2.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/$FLATPAK_ID.png - install -D -m 755 srb2.sh $FLATPAK_DEST/bin/srb2 From c81f5e58b11463dab2e04244e4b7e69fdf151988 Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 12:12:36 -0300 Subject: [PATCH 02/10] Update org.srb2.SRB2.yaml --- org.srb2.SRB2.yaml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index d23e43e..0a8eb86 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -54,19 +54,29 @@ modules: url-template: https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$version+release.autotools.tar.gz - name: sdl-mixer-x - buildsystem: autotools - no-autogen: true - build-options: - strip: false - no-debuginfo: true + buildsystem: cmake cleanup: - /include - - /lib/*.a - /lib/*.la + - /lib/*.so + - /lib/pkgconfig + - /share/doc sources: - type: git - url: https://github.com/WohlSoft/SDL-Mixer-X.git + url: https://github.com/WohlSoft/SDL-Mixer-X commit: 7181c771aa29deaea8bfbe6098613c3a929e9189 + build-options: + - -DCMAKE_BUILD_TYPE=Release + - -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=ON + - -DAUDIO_CODECS_BUILD_LOCAL_SDL2=ON + post-install: | + mkdir -p $FLATPAK_DESTDIR/$FLATPAK_INSTALL_LIB_DIR/pkgconfig + mv $FLATPAK_DESTDIR/$FLATPAK_INSTALL_PREFIX/lib/pkgconfig/sdl_mixer_x.pc $FLATPAK_DESTDIR/$FLATPAK_INSTALL_LIB_DIR/pkgconfig/ + build-commands: + - cmake $CMAKE_ARGS .. + - make -j$(nproc) + install-commands: + - make install DESTDIR=$FLATPAK_DESTDIR - name: srb2 buildsystem: simple From f2f5b8e4d2ed1b11a11c4bb7ccac46e28ddd373f Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 12:28:53 -0300 Subject: [PATCH 03/10] Update org.srb2.SRB2.yaml --- org.srb2.SRB2.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index 0a8eb86..23da803 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -73,6 +73,8 @@ modules: mkdir -p $FLATPAK_DESTDIR/$FLATPAK_INSTALL_LIB_DIR/pkgconfig mv $FLATPAK_DESTDIR/$FLATPAK_INSTALL_PREFIX/lib/pkgconfig/sdl_mixer_x.pc $FLATPAK_DESTDIR/$FLATPAK_INSTALL_LIB_DIR/pkgconfig/ build-commands: + - mkdir build + - cd build - cmake $CMAKE_ARGS .. - make -j$(nproc) install-commands: From ba6666f9cafcbaa8f6d4302c726d1c1b42424885 Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 13:35:35 -0300 Subject: [PATCH 04/10] Update org.srb2.SRB2.yaml --- org.srb2.SRB2.yaml | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index 23da803..f719a10 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -54,31 +54,18 @@ modules: url-template: https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$version+release.autotools.tar.gz - name: sdl-mixer-x - buildsystem: cmake - cleanup: - - /include - - /lib/*.la - - /lib/*.so - - /lib/pkgconfig - - /share/doc + buildsystem: cmake-ninja + builddir: true + config-opts: + - -DCMAKE_BUILD_TYPE=Release sources: - type: git url: https://github.com/WohlSoft/SDL-Mixer-X + tag: 2.6.0 commit: 7181c771aa29deaea8bfbe6098613c3a929e9189 - build-options: - - -DCMAKE_BUILD_TYPE=Release - - -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=ON - - -DAUDIO_CODECS_BUILD_LOCAL_SDL2=ON - post-install: | - mkdir -p $FLATPAK_DESTDIR/$FLATPAK_INSTALL_LIB_DIR/pkgconfig - mv $FLATPAK_DESTDIR/$FLATPAK_INSTALL_PREFIX/lib/pkgconfig/sdl_mixer_x.pc $FLATPAK_DESTDIR/$FLATPAK_INSTALL_LIB_DIR/pkgconfig/ - build-commands: - - mkdir build - - cd build - - cmake $CMAKE_ARGS .. - - make -j$(nproc) - install-commands: - - make install DESTDIR=$FLATPAK_DESTDIR + x-checker-data: + type: git + tag-pattern: ^([\d.]+)$ - name: srb2 buildsystem: simple From 088f8e9a4008874d377b1f270f6303dca4e5d732 Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 13:50:31 -0300 Subject: [PATCH 05/10] Update org.srb2.SRB2.yaml: missing SDL mixer dependency --- org.srb2.SRB2.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index f719a10..d55617f 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -12,6 +12,7 @@ finish-args: - --persist=.srb2 modules: - shared-modules/glu/glu-9.json + - shared-modules/SDL/SDL_mixer-1.2.12.json - name: game-music-emu buildsystem: cmake-ninja From 621cf57f2d41943d838ab77493eeb1d5e30f3815 Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 14:48:38 -0300 Subject: [PATCH 06/10] Update org.srb2.SRB2.yaml: SDL2 --- org.srb2.SRB2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index d55617f..a03b1ab 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -12,7 +12,7 @@ finish-args: - --persist=.srb2 modules: - shared-modules/glu/glu-9.json - - shared-modules/SDL/SDL_mixer-1.2.12.json + - shared-modules/SDL2/SDL2-with-libdecor.json - name: game-music-emu buildsystem: cmake-ninja From e791bcdcff83ba56876caef26b870c7eb0a9c5ad Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 15:27:44 -0300 Subject: [PATCH 07/10] Update org.srb2.SRB2.yaml: SDL2 without libdecor Hope that's the fix --- org.srb2.SRB2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index a03b1ab..18a34de 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -12,7 +12,7 @@ finish-args: - --persist=.srb2 modules: - shared-modules/glu/glu-9.json - - shared-modules/SDL2/SDL2-with-libdecor.json + - shared-modules/SDL2/SDL2-no-libdecor.json - name: game-music-emu buildsystem: cmake-ninja From af5837b2b205a17e2549dd5dd293113d2394514c Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 16:11:09 -0300 Subject: [PATCH 08/10] Update org.srb2.SRB2.yaml --- org.srb2.SRB2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index 18a34de..424fc5d 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -12,7 +12,7 @@ finish-args: - --persist=.srb2 modules: - shared-modules/glu/glu-9.json - - shared-modules/SDL2/SDL2-no-libdecor.json + - shared-modules/SDL2/SDL2-with-libdecor.json - name: game-music-emu buildsystem: cmake-ninja @@ -79,7 +79,7 @@ modules: env: ARCH_MAKE_ARGS: LINUX64=1 X86_64=1 build-commands: - - make -C src -j $FLATPAK_BUILDER_N_JOBS NOUPX=1 SDL=1 HAVE_MIXERX=1 $ARCH_MAKE_ARGS + - make -C src -j $FLATPAK_BUILDER_N_JOBS NOUPX=1 SDL=1 HAVE_MIXERX=1 $ARCH_MAKE_ARGS LDFLAGS="-lstdc++" - install -D -m 755 -t $FLATPAK_DEST/bin bin/lsdl2srb2 - install -D -m 644 srb2.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/$FLATPAK_ID.png - install -D -m 755 srb2.sh $FLATPAK_DEST/bin/srb2 From fb6fc3b66b61da896eaf6c96d03d371b7138e840 Mon Sep 17 00:00:00 2001 From: riomccloud Date: Wed, 3 Apr 2024 23:32:02 -0300 Subject: [PATCH 09/10] Set DSDL_MIXER_X_SHARED=ON on SDL Mixer X --- org.srb2.SRB2.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index 424fc5d..0c41125 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -59,6 +59,7 @@ modules: builddir: true config-opts: - -DCMAKE_BUILD_TYPE=Release + - -DSDL_MIXER_X_SHARED=ON sources: - type: git url: https://github.com/WohlSoft/SDL-Mixer-X @@ -79,7 +80,7 @@ modules: env: ARCH_MAKE_ARGS: LINUX64=1 X86_64=1 build-commands: - - make -C src -j $FLATPAK_BUILDER_N_JOBS NOUPX=1 SDL=1 HAVE_MIXERX=1 $ARCH_MAKE_ARGS LDFLAGS="-lstdc++" + - make -C src -j $FLATPAK_BUILDER_N_JOBS NOUPX=1 SDL=1 HAVE_MIXERX=1 $ARCH_MAKE_ARGS - install -D -m 755 -t $FLATPAK_DEST/bin bin/lsdl2srb2 - install -D -m 644 srb2.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/$FLATPAK_ID.png - install -D -m 755 srb2.sh $FLATPAK_DEST/bin/srb2 From 54f4e9c156f526299760345f011540967ac00668 Mon Sep 17 00:00:00 2001 From: riomccloud Date: Mon, 8 Apr 2024 13:00:53 -0300 Subject: [PATCH 10/10] Update org.srb2.SRB2.yaml: build FluidSynth --- org.srb2.SRB2.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/org.srb2.SRB2.yaml b/org.srb2.SRB2.yaml index 0c41125..d79f1cd 100644 --- a/org.srb2.SRB2.yaml +++ b/org.srb2.SRB2.yaml @@ -54,6 +54,20 @@ modules: stable-only: true url-template: https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$version+release.autotools.tar.gz + - name: fluidsynth + buildsystem: cmake-ninja + builddir: true + config-opts: + - -DCMAKE_BUILD_TYPE=Release + sources: + - type: git + url: https://github.com/FluidSynth/fluidsynth + tag: v2.3.5 + commit: 619fc5c3380513146cd05e17decf8d747b02bba4 + x-checker-data: + type: git + tag-pattern: ^(v[\d.]+)$ + - name: sdl-mixer-x buildsystem: cmake-ninja builddir: true