Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable SDL mixer X #76

Merged
merged 9 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions org.srb2.SRB2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,8 @@ finish-args:
- --device=all
- --persist=.srb2
modules:
- name: game-music-emu
buildsystem: cmake-ninja
cleanup:
- /include
- /lib/*.so
- /lib/pkgconfig
sources:
- type: archive
url: https://github.com/libgme/game-music-emu/archive/refs/tags/0.6.3.tar.gz
sha256: 4c5a7614acaea44e5cb1423817d2889deb82674ddbc4e3e1291614304b86fca0
x-checker-data:
type: anitya
project-id: 866
stable-only: true
url-template: https://github.com/libgme/game-music-emu/archive/refs/tags/$version.tar.gz
- shared-modules/linux-audio/fluidsynth2.json
- shared-modules/gzdoom/game-music-emu.json

- name: libopenmpt
config-opts:
Expand All @@ -51,6 +38,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: cmake-ninja
builddir: true
config-opts:
- -DCMAKE_BUILD_TYPE=Release
- -DSDL_MIXER_X_SHARED=ON
sources:
- type: git
url: https://github.com/WohlSoft/SDL-Mixer-X
tag: 2.6.0
commit: 7181c771aa29deaea8bfbe6098613c3a929e9189
x-checker-data:
type: git
tag-pattern: ^([\d.]+)$

- name: miniupnpc
buildsystem: cmake-ninja
config-opts:
Expand All @@ -70,16 +72,15 @@ modules:
- name: srb2
buildsystem: simple
build-options:
arch:
aarch64:
env:
ARCH_MAKE_ARGS: LINUX64=1
x86_64:
env:
ARCH_MAKE_ARGS: LINUX64=1 X86_64=1
env:
libgme_ARGS: -DSRB2_CONFIG_USE_GME=ON -Dlibgme_INCLUDE_DIR=/app/include/gme -Dlibgme_LIBRARY=/app/lib/libgme.so
libopenmpt_ARGS: -Dlibopenmpt_INCLUDE_DIR=/app/include/libopenmpt -Dlibopenmpt_LIBRARY=/app/lib/libopenmpt.so
miniupnp_ARGS: -Dlibminiupnpc_INCLUDE_DIR=/app/include/miniupnpc -Dlibminiupnpc_LIBRARY=/app/lib/libminiupnpc.so
EXE_NAME_ARGS: -DSRB2_SDL2_EXE_NAME=lsdl2srb2
build-commands:
- make -C src -j $FLATPAK_BUILDER_N_JOBS $ARCH_MAKE_ARGS
- install -D -m 755 -t $FLATPAK_DEST/bin bin/lsdl2srb2
- cmake -B build.cmake $libgme_ARGS $libopenmpt_ARGS $miniupnp_ARGS $EXE_NAME_ARGS -G "Unix Makefiles"
- make --directory=build.cmake --keep-going -j $FLATPAK_BUILDER_N_JOBS
- install -D -m 755 -t $FLATPAK_DEST/bin build.cmake/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
- install -D -m 644 -t $FLATPAK_DEST/share/applications $FLATPAK_ID.desktop
Expand Down
2 changes: 1 addition & 1 deletion shared-modules
Submodule shared-modules updated 70 files
+41 −0 .github/workflows/ci.yml
+30 −0 .github/workflows/update.yaml
+1 −0 .gitignore
+6 −5 CODEOWNERS
+18 −3 README.md
+4 −0 SDL/SDL-1.2.15.json
+6 −0 SDL/SDL_image-1.2.12.json
+5 −0 SDL/SDL_mixer-1.2.12.json
+6 −0 SDL/SDL_ttf-2.0.11.json
+27 −0 SDL/sdl-sysloadso-buffer-length.patch
+2 −2 SDL/sdl12-compat.json
+0 −15 SDL2/README.md
+0 −22 SDL2/SDL2-no-libdecor.json
+0 −23 SDL2/SDL2-with-libdecor.json
+281 −0 gtk2/gtk2-gcc14.patch
+4 −1 gtk2/gtk2.json
+2 −2 gudev/gudev.json
+27 −0 gzdoom/0001-Fix-libxmp-playback.patch
+20 −0 gzdoom/game-music-emu.json
+13 −54 gzdoom/gzdoom.json
+24 −0 gzdoom/zmusic.json
+51 −0 libayatana-appindicator/0001-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch
+44 −0 libayatana-appindicator/0001-Make-introspection-configurable.patch
+116 −0 libayatana-appindicator/libayatana-appindicator-gtk3.json
+2 −4 libcanberra/libcanberra.json
+0 −6 libdecor/README.md
+0 −18 libdecor/libdecor-0.1.1.json
+0 −34 libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
+0 −12 libmad/libmad-0.15.1b-cflags-O2.patch
+0 −146 libmad/libmad-0.15.1b-cflags.patch
+0 −37 libmad/libmad-0.15.1b-multiarch.patch
+0 −13 libmad/libmad-0.15.1b-ppc.patch
+9 −42 libmad/libmad.json
+0 −12 libmad/libmad.thumb.diff
+0 −11 libmad/mad.pc
+2 −2 libsecret/libsecret.json
+2 −2 libusb/libusb.json
+1 −0 linux-audio/fftw3f.json
+2 −2 linux-audio/fluidsynth2-static.json
+2 −2 linux-audio/fluidsynth2.json
+0 −23 linux-audio/jack2.json
+3 −0 linux-audio/ladspa.json
+14 −11 linux-audio/lash.json
+3 −1 linux-audio/libinstpatch.json
+94 −0 linux-audio/lilv-static.json
+2 −0 linux-audio/lilv.json
+6 −2 linux-audio/lrdf.json
+13 −0 linux-audio/patches/lash-build.patch
+21 −0 lua5.1/0004-Fix-stack-overflow-in-vararg-functions.patch
+4 −0 lua5.1/lua-5.1.5.json
+2 −7 lua5.3/lua-5.3.5.json
+45 −0 lua5.3/luaconf.patch
+7 −10 lua5.4/lua-5.4.json
+32 −0 lua5.4/luaconf.patch
+7 −7 luajit/luajit.json
+27 −0 lzo/lzo.json
+2 −2 mac/mac.json
+34 −0 pygame/cython-fixes.patch
+25 −0 pygame/glib.patch
+0 −105 pygame/portmidi-no-java.patch
+49 −7 pygame/pygame-1.9.6.json
+0 −54 qt4/disable-sslv3.patch
+0 −11 qt4/fixgcc11.patch
+0 −31 qt4/fixgcc9.patch
+0 −118 qt4/qt4-4.8.7-minimal.json
+0 −514 qt4/qt4-aarch64.patch
+0 −409 qt4/qt4-openssl-1.1.patch
+6 −1 smpeg/smpeg-0.4.5.json
+22 −0 squashfs-tools/squashfs-tools.json
+62 −0 update-checker.sh