mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-05-08 19:32:39 +08:00
remove SDL1 version and make SDL2 default
this mirrors what is done on flathub
This commit is contained in:
Robert de Rooy
parent
78e5688d32
commit
ccfff3e342
@ -1,92 +0,0 @@
|
||||
app-id: com.dosbox_x.DOSBox-X-sdl2
|
||||
runtime: org.freedesktop.Platform
|
||||
runtime-version: '21.08'
|
||||
sdk: org.freedesktop.Sdk
|
||||
|
||||
command: dosbox-x
|
||||
|
||||
finish-args: # flatpak permissions
|
||||
- --device=all # needed for gamepads and serial/parallel
|
||||
- --share=ipc # needed for X11
|
||||
- --share=network # needed for networking (NE2000, IPX)
|
||||
- --socket=x11 # default to X11 due to FS issues
|
||||
- --socket=pulseaudio
|
||||
- --filesystem=home
|
||||
|
||||
cleanup:
|
||||
- '/include'
|
||||
- '/lib/pkgconfig'
|
||||
- '/share/aclocal'
|
||||
- '/share/man'
|
||||
- '*.la'
|
||||
- '*.a'
|
||||
- '/share/doc'
|
||||
|
||||
modules:
|
||||
|
||||
# Build Mesa GLU
|
||||
- name: GLU
|
||||
config-opts:
|
||||
- --disable-static
|
||||
sources:
|
||||
- type: archive
|
||||
url: https://mesa.freedesktop.org/archive/glu/glu-9.0.1.tar.xz
|
||||
sha256: fb5a4c2dd6ba6d1c21ab7c05129b0769544e1d68e1e3b0ffecb18e73c93055bc
|
||||
cleanup:
|
||||
- /include
|
||||
- /lib/*.a
|
||||
- /lib/*.la
|
||||
- /lib/pkgconfig
|
||||
|
||||
# Build FluidSynth
|
||||
- name: FluidSynth
|
||||
buildsystem: cmake-ninja
|
||||
config-opts:
|
||||
- -DLIB_SUFFIX=
|
||||
cleanup:
|
||||
- /bin
|
||||
- /include
|
||||
- /lib/pkgconfig
|
||||
- /share/man
|
||||
- "*.so"
|
||||
sources:
|
||||
- type: archive
|
||||
url: https://github.com/FluidSynth/fluidsynth/archive/v2.1.5.tar.gz
|
||||
sha256: b539b7c65a650b56f01cd60a4e83c6125c217c5a63c0c214ef6274894a677d00
|
||||
|
||||
# Build libslirp for networking
|
||||
- name: libslirp
|
||||
buildsystem: meson
|
||||
cleanup:
|
||||
- "/include"
|
||||
- "/lib/pkgconfig"
|
||||
sources:
|
||||
- type: git
|
||||
url: https://gitlab.freedesktop.org/slirp/libslirp
|
||||
tag: "v4.6.1"
|
||||
x-checker-data:
|
||||
type: anitya
|
||||
project-id: 96796
|
||||
stable-only: true
|
||||
tag-template: v$version
|
||||
|
||||
# Build DOSBox-X SDL2
|
||||
- name: dosbox-x
|
||||
rm-configure: true
|
||||
config-opts:
|
||||
- --enable-core-inline
|
||||
- --enable-debug=heavy
|
||||
- --enable-sdl2
|
||||
cleanup:
|
||||
- /share/man
|
||||
sources:
|
||||
- type: dir
|
||||
path: ../..
|
||||
post-install:
|
||||
- install -Dm644 /app/share/applications/com.dosbox_x.DOSBox-X.desktop /app/share/applications/${FLATPAK_ID}.desktop
|
||||
- install -Dm644 /app/share/icons/hicolor/scalable/apps/dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
|
||||
- install -Dm644 /app/share/metainfo/com.dosbox_x.DOSBox-X.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
|
||||
- desktop-file-edit --set-key=Icon --set-value=${FLATPAK_ID} /app/share/applications/${FLATPAK_ID}.desktop
|
||||
- desktop-file-edit --set-key=Name --set-value="DOSBox-X SDL2" /app/share/applications/${FLATPAK_ID}.desktop
|
||||
- appstream-util modify /app/share/metainfo/${FLATPAK_ID}.metainfo.xml id dosbox-x-sdl2
|
||||
- appstream-util modify /app/share/metainfo/${FLATPAK_ID}.metainfo.xml name "DOSBox-X SDL2"
|
||||
@ -1,4 +1,4 @@
|
||||
app-id: com.dosbox_x.DOSBox-X
|
||||
app-id: com.dosbox_x.DOSBox-X-sdl2
|
||||
runtime: org.freedesktop.Platform
|
||||
runtime-version: '21.08'
|
||||
sdk: org.freedesktop.Sdk
|
||||
@ -7,9 +7,9 @@ command: dosbox-x
|
||||
|
||||
finish-args: # flatpak permissions
|
||||
- --device=all # needed for gamepads and serial/parallel
|
||||
- --share=ipc # needed for X11
|
||||
- --share=ipc # needed for X11
|
||||
- --share=network # needed for networking (NE2000, IPX)
|
||||
- --socket=x11
|
||||
- --socket=x11 # default to X11 due to FS issues
|
||||
- --socket=pulseaudio
|
||||
- --filesystem=home
|
||||
|
||||
@ -70,21 +70,23 @@ modules:
|
||||
stable-only: true
|
||||
tag-template: v$version
|
||||
|
||||
# Build DOSBox-X SDL1
|
||||
# Build DOSBox-X SDL2
|
||||
- name: dosbox-x
|
||||
rm-configure: true
|
||||
config-opts:
|
||||
- --enable-core-inline
|
||||
- --enable-debug=heavy
|
||||
- --enable-sdl2
|
||||
cleanup:
|
||||
- /share/man
|
||||
sources:
|
||||
- type: dir
|
||||
path: ../..
|
||||
buildsystem: simple
|
||||
build-commands:
|
||||
# We need to first build the included (modified) SDL1, otherwise the build will fail
|
||||
- cd vs/sdl ; ./build-dosbox.sh
|
||||
# Build the SDL1 debugger enabled version of DOSBox-X
|
||||
- ./build-debug
|
||||
- make bindir=/app/bin prefix=/app install
|
||||
cleanup:
|
||||
- /share/man
|
||||
post-install:
|
||||
- install -Dm644 /app/share/applications/com.dosbox_x.DOSBox-X.desktop /app/share/applications/${FLATPAK_ID}.desktop
|
||||
- install -Dm644 /app/share/icons/hicolor/scalable/apps/dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
|
||||
- install -Dm644 /app/share/metainfo/com.dosbox_x.DOSBox-X.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
|
||||
- desktop-file-edit --set-key=Icon --set-value=${FLATPAK_ID} /app/share/applications/${FLATPAK_ID}.desktop
|
||||
- desktop-file-edit --set-key=Name --set-value="DOSBox-X SDL2" /app/share/applications/${FLATPAK_ID}.desktop
|
||||
- appstream-util modify /app/share/metainfo/${FLATPAK_ID}.metainfo.xml id dosbox-x-sdl2
|
||||
- appstream-util modify /app/share/metainfo/${FLATPAK_ID}.metainfo.xml name "DOSBox-X SDL2"
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [[ ! -x $(which flatpak-builder) ]]; then
|
||||
echo Please install flatpak-builder
|
||||
exit
|
||||
fi
|
||||
|
||||
if [[ ! $(flatpak list|grep org.freedesktop.Sdk|wc -l) -ge 1 ]]; then
|
||||
echo Please ensure the necessary SDK and matching runtime are installed by running:
|
||||
echo flatpak install flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
|
||||
exit
|
||||
fi
|
||||
|
||||
flatpak-builder --repo=myrepo --force-clean build-flatpak contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml
|
||||
if [ $? -eq 0 ]; then
|
||||
echo
|
||||
echo You can now install the flatpak by running the following commands:
|
||||
echo
|
||||
echo flatpak --user remote-add --no-gpg-verify myrepo myrepo
|
||||
echo flatpak --user install myrepo com.dosbox_x.DOSBox-X-sdl2
|
||||
echo
|
||||
echo You can then run the flatpak as follows:
|
||||
echo flatpak run com.dosbox_x.DOSBox-X-sdl2
|
||||
echo
|
||||
echo Or you can test it without installing by running:
|
||||
echo flatpak-builder --run build-flatpak contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml dosbox-x
|
||||
fi
|
||||
@ -11,17 +11,17 @@ if [[ ! $(flatpak list|grep org.freedesktop.Sdk|wc -l) -ge 1 ]]; then
|
||||
exit
|
||||
fi
|
||||
|
||||
flatpak-builder --repo=myrepo --force-clean build-flatpak contrib/linux/com.dosbox_x.DOSBox-X.yaml
|
||||
flatpak-builder --repo=myrepo --force-clean build-flatpak contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml
|
||||
if [ $? -eq 0 ]; then
|
||||
echo
|
||||
echo You can now install the flatpak by running the following commands:
|
||||
echo
|
||||
echo flatpak --user remote-add --no-gpg-verify myrepo myrepo
|
||||
echo flatpak --user install myrepo com.dosbox_x.DOSBox-X
|
||||
echo flatpak --user install myrepo com.dosbox_x.DOSBox-X-sdl2
|
||||
echo
|
||||
echo You can then run the flatpak as follows:
|
||||
echo flatpak run com.dosbox_x.DOSBox-X
|
||||
echo flatpak run com.dosbox_x.DOSBox-X-sdl2
|
||||
echo
|
||||
echo Or you can test it without installing by running:
|
||||
echo flatpak-builder --run build-flatpak contrib/linux/com.dosbox_x.DOSBox-X.yaml dosbox-x
|
||||
echo flatpak-builder --run build-flatpak contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml dosbox-x
|
||||
fi
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user