From aba1b6575e2ffa38104b9467f7de79fc28eeddcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Thu, 13 Jun 2024 16:00:58 +0300 Subject: [PATCH 1/5] appdata: Fix appdata papercuts - Update homepage URL with a working one. - Add a vcs-browser URL to show the source code repository. - Add missing launchable tag required by flathub. - Remove categories from appdata file. - Add Utulity category to the desktop file More information: [Flathub Metainfo Guidelines](https://docs.flathub.org/docs/for-app-authors/metainfo-guidelines/#description) --- data/com.uploadedlobster.peek.appdata.xml.in | 11 +++-------- data/com.uploadedlobster.peek.desktop.in | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/data/com.uploadedlobster.peek.appdata.xml.in b/data/com.uploadedlobster.peek.appdata.xml.in index fca885bc..f721844f 100644 --- a/data/com.uploadedlobster.peek.appdata.xml.in +++ b/data/com.uploadedlobster.peek.appdata.xml.in @@ -49,13 +49,6 @@ - - Graphics - Utility - GNOME - GTK - - AppMenu HiDpiIcon @@ -63,13 +56,15 @@ Notifications - http://peek.uploadedlobster.com + https://github.com/phw/peek https://github.com/phw/peek#frequently-asked-questions https://github.com/phw/peek/issues + https://github.com/phw/peek peek + com.uploadedlobster.peek.desktop peek diff --git a/data/com.uploadedlobster.peek.desktop.in b/data/com.uploadedlobster.peek.desktop.in index 1ec9720e..67887c9e 100644 --- a/data/com.uploadedlobster.peek.desktop.in +++ b/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 From 2553f8e1c753f5ee4cdcc04f6ddcdcdb15f3f5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Thu, 13 Jun 2024 16:12:19 +0300 Subject: [PATCH 2/5] Update Peek runtime to 46 - Update Peek runtime to 46 since runtime version 44 has reached end-of-life. --- build-aux/flatpak/flatpak-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/flatpak/flatpak-master.yml b/build-aux/flatpak/flatpak-master.yml index aeca09a1..0e74365d 100644 --- a/build-aux/flatpak/flatpak-master.yml +++ b/build-aux/flatpak/flatpak-master.yml @@ -1,6 +1,6 @@ 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 From 2640eeee772671939f3e5f5f919140652e4c7809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Thu, 13 Jun 2024 16:12:49 +0300 Subject: [PATCH 3/5] Use ffmpeg-full sdk extension Use ffmpeg-full sdk extension to reduce build time and package size. --- build-aux/flatpak/flatpak-master.yml | 69 +++------------------------- 1 file changed, 7 insertions(+), 62 deletions(-) diff --git a/build-aux/flatpak/flatpak-master.yml b/build-aux/flatpak/flatpak-master.yml index 0e74365d..e44d55be 100644 --- a/build-aux/flatpak/flatpak-master.yml +++ b/build-aux/flatpak/flatpak-master.yml @@ -4,6 +4,13 @@ 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: @@ -30,68 +37,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: From d83c942e1f4796f86559b652baae68153a838ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Thu, 13 Jun 2024 16:13:30 +0300 Subject: [PATCH 4/5] flatpak: reorder entries - Move the main module the end of the build process - Use dir type instead of git to build the project. - Use DCONF_USER_CONFIG env from manifest. --- build-aux/flatpak/flatpak-master.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build-aux/flatpak/flatpak-master.yml b/build-aux/flatpak/flatpak-master.yml index e44d55be..1976b9cf 100644 --- a/build-aux/flatpak/flatpak-master.yml +++ b/build-aux/flatpak/flatpak-master.yml @@ -25,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 @@ -53,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: @@ -60,12 +67,5 @@ modules: 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: ../../ From 286c45cecb2455385ac84915be77269c452117bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Thu, 13 Jun 2024 16:18:35 +0300 Subject: [PATCH 5/5] Apply same changes Apply same changes to stable yml --- build-aux/flatpak/flatpak-stable.yml | 82 +++++----------------------- 1 file changed, 14 insertions(+), 68 deletions(-) diff --git a/build-aux/flatpak/flatpak-stable.yml b/build-aux/flatpak/flatpak-stable.yml index 7ee38885..8604be69 100644 --- a/build-aux/flatpak/flatpak-stable.yml +++ b/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