build: flatpak fixes

BlitterStudio · Nov 12, 2023 · b3168c1 · b3168c1
1 parent 199de53
commit b3168c1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 52 deletions.
diff --git a/conf/amiberry.conf b/conf/amiberry.conf
@@ -1,10 +1,10 @@
 Quickstart=1
 read_config_descriptions=yes
-write_logfile=no
+write_logfile=yes
 default_line_mode=0
 rctrl_as_ramiga=no
 gui_joystick_control=yes
-use_sdl2_render_thread=yes
+use_sdl2_render_thread=no
 default_multithreaded_drawing=yes
 input_default_mouse_speed=100
 input_keyboard_as_joystick_stop_keypresses=no

diff --git a/flatpak/128x128.png b/flatpak/128x128.png
diff --git a/flatpak/32x32.png b/flatpak/32x32.png
diff --git a/flatpak/48x48.png b/flatpak/48x48.png
diff --git a/flatpak/64x64.png b/flatpak/64x64.png
diff --git a/flatpak/com.blitterstudio.amiberry.yml b/flatpak/com.blitterstudio.amiberry.yml
@@ -1,13 +1,10 @@
 app-id: com.blitterstudio.amiberry
-branch: preview
 runtime: org.freedesktop.Platform
-runtime-version: "22.08"
+runtime-version: "23.08"
 sdk: org.freedesktop.Sdk
 command: amiberry.sh
 rename-icon: amiberry
 copy-icon: true
-build-options:
-  no-debuginfo: true
 finish-args:
   - --device=all
   # X11 + XShm access
@@ -33,7 +30,8 @@ modules:
       - /bin
       - /include
       - /lib/pkgconfig
-      - /lib/*.la
+      - "*.la"
+      - "*.a"
     sources:
       - type: archive
         url: http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz
@@ -47,36 +45,23 @@ modules:
     buildsystem: autotools
     cleanup:
       - /include
-      - /lib/*.la
-      - /lib/*.a
+      - "*.la"
+      - "*.a"
     sources:
-      - type: archive
-        url: https://github.com/BlitterStudio/amiberry/raw/master/external/libserialport/libserialport-0.1.1.tar.gz
-        sha256: 4e3573e3bdbb6b0a872f32c4826d1b6b630dcc3eeb5f05d0501bb79d738a09ea
+      - type: git
+        url: https://github.com/sigrokproject/libserialport
+        tag: libserialport-0.1.1
+        commit: 348a6d353af8ac142f68fbf9fe0f4d070448d945
 
   - name: amiberry
     only-arches:
       - x86_64
     post-install:
       - install -Dp -m 755 amiberry /app/bin/amiberry
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-    builddir: true
-
-    sources:
-      - type: archive
-        url: https://github.com/BlitterStudio/amiberry/archive/refs/tags/latest-preview.tar.gz
-        sha256: c003c228e77d9dc5042a1167460a8c7e80572250b08da0e6c059864b43452d2f
-
-  - name: desktop
-    buildsystem: simple
-    build-commands:
-      - install -D -m644 -t /app/share/applications/ ${FLATPAK_ID}.desktop
-      - install -D -m644 -t /app/share/metainfo/ ${FLATPAK_ID}.metainfo.xml
-      - install -D -m755 -t /app/bin/ amiberry.sh
-      - for i in 32 48 64 128 256;do install -Dm644 ${i}x${i}.png /app/share/icons/hicolor/${i}x${i}/apps/amiberry.png;done
-#     - install -Dm644 com.blitterstudio.amiberry.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
+      - install -D -m644 -t /app/share/applications/ flatpak/${FLATPAK_ID}.desktop
+      - install -D -m644 -t /app/share/metainfo/ flatpak/${FLATPAK_ID}.metainfo.xml
+      - install -D -m755 -t /app/bin/ ./amiberry.sh
+      - install -Dm644 flatpak/256x256.png /app/share/icons/hicolor/256x256/apps/amiberry.png
       - mkdir -p /app/data
       - cp -R abr /app/data
       - cp -R conf /app/data
@@ -88,29 +73,16 @@ modules:
       - cp -R savestates /app/data
       - cp -R screenshots /app/data
       - cp -R whdboot /app/data
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+
     sources:
-      - type: file
-        path: com.blitterstudio.amiberry.desktop
-      - type: file
-        path: com.blitterstudio.amiberry.metainfo.xml
-      - type: dir
-        path: ..
-      - type: file
-        path: com.blitterstudio.amiberry.metainfo.xml
-      - type: file
-        path: com.blitterstudio.amiberry.desktop
-      - type: file
-        path: 32x32.png
-      - type: file
-        path: 48x48.png
-      - type: file
-        path: 64x64.png
-      - type: file
-        path: 128x128.png
-      - type: file
-        path: 256x256.png
-#     - type: file
-#       path: com.blitterstudio.amiberry.svg
+      - type: git
+        url: https://github.com/BlitterStudio/amiberry
+        tag: latest-preview
+        commit: 725bd48c4ffb60a01dda49551b898621f9cde0aa
+
       - type: script
         dest-filename: amiberry.sh
         commands: