Update flatpak manifest and appdata entries

build-aux/flatpak/flatpak-master.yml

@@ -1,9 +1,16 @@
 app-id: com.uploadedlobster.peek
 runtime: org.gnome.Platform
-runtime-version: '42'
+runtime-version: '46'
 sdk: org.gnome.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.rust-stable
+add-extensions:
+  - org.freedesktop.Platform.ffmpeg-full:
+    add-ld-path: .
+    autodelete: false
+    directory: lib/ffmpeg
+    no-autodownload: false
+    version: '23.08'
 branch: master
 command: peek
 finish-args:
@@ -18,6 +25,7 @@ finish-args:
   - --filesystem=xdg-videos
   - --metadata=X-DConf=migrate-path=/com/uploadedlobster/peek/
   - --env=LD_LIBRARY_PATH=/app/lib
+  - --env=DCONF_USER_CONFIG_DIR=.config/dconf
 build-options:
   cflags: -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2
   cxxflags: -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2
@@ -30,68 +38,6 @@ cleanup:
   - "*.la"
 
 modules:
-  - name: ffmpeg
-    config-opts:
-      - --disable-debug
-      - --disable-static
-      - --enable-gpl
-      - --enable-libvpx
-      - --enable-libx264
-      - --enable-shared
-      - --enable-libxcb
-      - --enable-libxcb-xfixes
-      - --disable-libxcb-shape
-      - --disable-ffplay
-      - --disable-ffprobe
-      - --disable-doc
-      - --disable-everything
-      - --enable-bsf=vp9_superframe
-      - --enable-decoder=libvpx_vp9
-      - --enable-decoder=png
-      - --enable-decoder=rawvideo
-      - --enable-encoder=apng
-      - --enable-encoder=ffvhuff
-      - --enable-encoder=gif
-      - --enable-encoder=libvpx_vp9
-      - --enable-encoder=libx264
-      - --enable-encoder=png
-      - --enable-demuxer=image2
-      - --enable-demuxer=matroska
-      - --enable-muxer=apng
-      - --enable-muxer=gif
-      - --enable-muxer=image2
-      - --enable-muxer=mp4
-      - --enable-muxer=webm
-      - --enable-filter=crop
-      - --enable-filter=fps
-      - --enable-filter=palettegen
-      - --enable-filter=paletteuse
-      - --enable-filter=scale
-      - --enable-protocol=file
-      - --enable-indev=xcbgrab
-    sources:
-      - type: archive
-        url: https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.xz
-        sha256: eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02
-    modules:
-      - name: yasm
-        cleanup:
-          - "*"
-        sources:
-          - type: archive
-            url: http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
-            sha256: 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
-      - name: libx264
-        config-opts:
-          - --enable-pic
-          - --enable-shared
-        sources:
-          - type: git
-            url: https://code.videolan.org/videolan/x264.git
-            commit: baee400fa9ced6f5481a728138fed6e867b0ff7f
-        cleanup:
-          - /bin/x264
-
   - name: gifski
     buildsystem: simple
     build-options:
@@ -108,19 +54,18 @@ modules:
       - cargo build --release --features=openmp --verbose
       - install -Dm755 target/release/gifski /app/bin/gifski
 
+  - name: keybinder3
+    sources:
+      - type: archive
+        url: https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz
+        sha256: e6e3de4e1f3b201814a956ab8f16dfc8a262db1937ff1eee4d855365398c6020
+
   - name: peek
     buildsystem: meson
     config-opts:
       - --buildtype=release
     build-options:
       cflags: -L/app/lib
     sources:
-      - type: git
-        url: ../..
-        branch: main
-    modules:
-      - name: keybinder3
-        sources:
-          - type: archive
-            url: https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz
-            sha256: e6e3de4e1f3b201814a956ab8f16dfc8a262db1937ff1eee4d855365398c6020
+      - type: dir
+        path: ../../

build-aux/flatpak/flatpak-stable.yml

@@ -4,6 +4,13 @@ runtime-version: '42'
 sdk: org.gnome.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.rust-stable
+add-extensions:
+  - org.freedesktop.Platform.ffmpeg-full:
+    add-ld-path: .
+    autodelete: false
+    directory: lib/ffmpeg
+    no-autodownload: false
+    version: '23.08'
 branch: stable
 command: peek
 finish-args:
@@ -18,6 +25,7 @@ finish-args:
   - --filesystem=xdg-videos
   - --metadata=X-DConf=migrate-path=/com/uploadedlobster/peek/
   - --env=LD_LIBRARY_PATH=/app/lib
+  - --env=DCONF_USER_CONFIG_DIR=.config/dconf
 build-options:
   cflags: -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2
   cxxflags: -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2
@@ -30,68 +38,6 @@ cleanup:
   - "*.la"
 
 modules:
-  - name: ffmpeg
-    config-opts:
-      - --disable-debug
-      - --disable-static
-      - --enable-gpl
-      - --enable-libvpx
-      - --enable-libx264
-      - --enable-shared
-      - --enable-libxcb
-      - --enable-libxcb-xfixes
-      - --disable-libxcb-shape
-      - --disable-ffplay
-      - --disable-ffprobe
-      - --disable-doc
-      - --disable-everything
-      - --enable-bsf=vp9_superframe
-      - --enable-decoder=libvpx_vp9
-      - --enable-decoder=png
-      - --enable-decoder=rawvideo
-      - --enable-encoder=apng
-      - --enable-encoder=ffvhuff
-      - --enable-encoder=gif
-      - --enable-encoder=libvpx_vp9
-      - --enable-encoder=libx264
-      - --enable-encoder=png
-      - --enable-demuxer=image2
-      - --enable-demuxer=matroska
-      - --enable-muxer=apng
-      - --enable-muxer=gif
-      - --enable-muxer=image2
-      - --enable-muxer=mp4
-      - --enable-muxer=webm
-      - --enable-filter=crop
-      - --enable-filter=fps
-      - --enable-filter=palettegen
-      - --enable-filter=paletteuse
-      - --enable-filter=scale
-      - --enable-protocol=file
-      - --enable-indev=xcbgrab
-    sources:
-      - type: archive
-        url: https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.xz
-        sha256: eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02
-    modules:
-      - name: yasm
-        cleanup:
-          - "*"
-        sources:
-          - type: archive
-            url: http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
-            sha256: 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
-      - name: libx264
-        config-opts:
-          - --enable-pic
-          - --enable-shared
-        sources:
-          - type: git
-            url: https://code.videolan.org/videolan/x264.git
-            commit: baee400fa9ced6f5481a728138fed6e867b0ff7f
-        cleanup:
-          - /bin/x264
-
   - name: gifski
     buildsystem: simple
     build-options:
@@ -108,6 +54,12 @@ modules:
       - cargo build --release --features=openmp --verbose
       - install -Dm755 target/release/gifski /app/bin/gifski
 
+  - name: keybinder3
+    sources:
+      - type: archive
+      url: https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz
+      sha256: e6e3de4e1f3b201814a956ab8f16dfc8a262db1937ff1eee4d855365398c6020
+
   - name: peek
     buildsystem: meson
     config-opts:
@@ -118,9 +70,3 @@ modules:
       - type: git
         url: ../..
         branch: 1.5.1
-    modules:
-      - name: keybinder3
-        sources:
-          - type: archive
-            url: https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz
-            sha256: e6e3de4e1f3b201814a956ab8f16dfc8a262db1937ff1eee4d855365398c6020

data/com.uploadedlobster.peek.appdata.xml.in

@@ -49,27 +49,22 @@
     </screenshot>
   </screenshots>
 
-  <categories>
-    <category>Graphics</category>
-    <category>Utility</category>
-    <category>GNOME</category>
-    <category>GTK</category>
-  </categories>
-
   <kudos>
     <kudo>AppMenu</kudo>
     <kudo>HiDpiIcon</kudo>
     <kudo>ModernToolkit</kudo>
     <kudo>Notifications</kudo>
   </kudos>
 
-  <url type="homepage">http://peek.uploadedlobster.com</url>
+  <url type="homepage">https://github.com/phw/peek</url>
   <!-- <url type="help">http://peek.uploadedlobster.com</url> -->
   <url type="faq">https://github.com/phw/peek#frequently-asked-questions</url>
   <url type="bugtracker">https://github.com/phw/peek/issues</url>
+  <url type="vcs-browser">https://github.com/phw/peek</url>
   <!-- <url type="translate">https://hosted.weblate.org/projects/peek/translations/</url> -->
 
   <translation type="gettext">peek</translation>
+  <launchable type="desktop-id">com.uploadedlobster.peek.desktop</launchable>
 
   <provides>
     <binary>peek</binary>

data/com.uploadedlobster.peek.desktop.in

@@ -6,7 +6,7 @@ Comment=Record short animated GIF images from your screen
 Keywords=screencast;screen recorder;screen capture;GIF;WebM;APNG;
 Icon=com.uploadedlobster.peek
 Type=Application
-Categories=GTK;GNOME;Graphics;2DGraphics;AudioVideo;Video;Recorder;
+Categories=GTK;GNOME;Graphics;2DGraphics;AudioVideo;Video;Recorder;Utility;
 StartupNotify=true
 Terminal=false
 DBusActivatable=true