Merge pull request #3305 from rderooy/master

Cleanup flatpak
joncampbell123 · Feb 28, 2022 · 56e78a5 · 56e78a5
2 parents 7ebe6a9 + ef9fcda
commit 56e78a5
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 143 deletions.
diff --git a/contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml b/contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml
diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.yaml b/contrib/linux/com.dosbox_x.DOSBox-X.yaml
@@ -1,15 +1,16 @@
+---
 app-id: com.dosbox_x.DOSBox-X
 runtime: org.freedesktop.Platform
-runtime-version: '20.08'
+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
+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 fullscreen issues
   - --socket=pulseaudio
   - --filesystem=home
 
@@ -24,21 +25,21 @@ cleanup:
 
 modules:
 
-# Build Mesa GLU
+  # 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
+        url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz
+        sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
     cleanup:
       - /include
       - /lib/*.a
       - /lib/*.la
       - /lib/pkgconfig
-  
-# Build FluidSynth
+
+  # Build FluidSynth
   - name: FluidSynth
     buildsystem: cmake-ninja
     config-opts:
@@ -51,35 +52,35 @@ modules:
       - "*.so"
     sources:
       - type: archive
-        url: https://github.com/FluidSynth/fluidsynth/archive/v2.1.5.tar.gz
-        sha256: b539b7c65a650b56f01cd60a4e83c6125c217c5a63c0c214ef6274894a677d00
+        url: https://github.com/FluidSynth/fluidsynth/archive/v2.2.4.tar.gz
+        sha256: 83cb1dba04c632ede74f0c0717018b062c0e00b639722203b23f77a961afd390
 
-# Build libslirp for networking
+  # Build libslirp for networking
   - name: libslirp
     buildsystem: meson
     cleanup:
       - "/include"
       - "/lib/pkgconfig"
     sources:
-      - type: archive
-        url: https://gitlab.freedesktop.org/slirp/libslirp/uploads/a30aeca3c6ad23f176065d0ee832957b/libslirp-4.4.0.tar.xz
-        sha256: e903fc14c26030b51711bd7f098697c2393f237199e3681c2e22ea013c3635a7
+      - 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 SDL1
+  # Build DOSBox-X SDL2
   - name: dosbox-x
-    rm-configure: true
+    buildsystem: autotools
+    config-opts:
+      - --enable-core-inline
+      - --enable-debug=heavy
+      - --enable-sdl2
     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/icons/hicolor/scalable/apps/dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
       - desktop-file-edit --set-key=Icon --set-value=${FLATPAK_ID} /app/share/applications/${FLATPAK_ID}.desktop
diff --git a/contrib/linux/dosbox-x.spec.in b/contrib/linux/dosbox-x.spec.in
@@ -25,7 +25,12 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: ncurses-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: SDL2-devel
+
+# Does not exist on RHEL8 EPEL for some reason
+%if 0%{?fedora} || 0%{?el7}
 BuildRequires: SDL2_net-devel
+%endif
+
 BuildRequires: zlib-devel
 
 Requires:      fluid-soundfont-gm

diff --git a/make-flatpak-sdl2.sh b/make-flatpak-sdl2.sh
diff --git a/make-flatpak.sh b/make-flatpak.sh
@@ -7,7 +7,7 @@ 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//20.08 org.freedesktop.Sdk//20.08
+	echo flatpak install flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
 	exit
 fi