From 7725feba47308c8cdeb702065aa8475b0925f236 Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Sun, 12 Nov 2023 16:13:55 +0100
Subject: [PATCH] build: Flatpak fixes

---
 ...com.blitterstudio.amiberry.metainfo.xml.in |  1 +
 flatpak/com.blitterstudio.amiberry.yml        | 73 ++++++-------------
 2 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/flatpak/com.blitterstudio.amiberry.metainfo.xml.in b/flatpak/com.blitterstudio.amiberry.metainfo.xml.in
index 02e93a5ab..4cdc34be5 100644
--- a/flatpak/com.blitterstudio.amiberry.metainfo.xml.in
+++ b/flatpak/com.blitterstudio.amiberry.metainfo.xml.in
@@ -7,6 +7,7 @@
   <summary>An Amiga emulator for Linux</summary>
 
   <metadata_license>FSFAP</metadata_license>
+  <content_rating type="oars-1.0" />
   <project_license>GPL-3.0-or-later</project_license>
   <update_contact>midwan_AT_gmail.com</update_contact>
   <url type="homepage">https://amiberry.com</url>
diff --git a/flatpak/com.blitterstudio.amiberry.yml b/flatpak/com.blitterstudio.amiberry.yml
index bd882d67d..1a190243d 100644
--- a/flatpak/com.blitterstudio.amiberry.yml
+++ b/flatpak/com.blitterstudio.amiberry.yml
@@ -1,12 +1,10 @@
 app-id: com.blitterstudio.amiberry
 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
@@ -22,7 +20,7 @@ finish-args:
   - --socket=pulseaudio
   # Filesystem access
   - --filesystem=host
-  
+
 modules:
   - name: libmpeg2
     config-opts:
@@ -32,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
@@ -46,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/v5.6.2.tar.gz
-        sha256: 4e9feb3ab0039871a25dda9f42a29c9ec1d6160ff68ef7c37fd3205f59c14b97
-
-  - 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
@@ -87,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: v5.6.2
+        commit: b7991a7af6f6b5de8c66883c904a9d99dbd2bb3d
+
       - type: script
         dest-filename: amiberry.sh
         commands: