From e923726f0098cfb618d499bc9367c343a447b5b1 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Mon, 13 Nov 2023 19:31:28 +0500 Subject: [PATCH 1/2] flowblade: update to 2.10.0.4. --- srcpkgs/flowblade/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template index f1a43ae189ed7..ac4e8b44cd6be 100644 --- a/srcpkgs/flowblade/template +++ b/srcpkgs/flowblade/template @@ -1,17 +1,19 @@ # Template file for 'flowblade' pkgname=flowblade -version=2.8.0.3 +# Reminder for 2.12.x: (drop python3-dbus) +version=2.10.0.4 revision=1 build_wrksrc=flowblade-trunk build_style=python3-module make_install_args="--install-lib=${DESTDIR}/usr/share/flowblade" hostmakedepends="python3-setuptools" # https://github.com/jliljebl/flowblade/blob/master/flowblade-trunk/docs/DEPENDENCIES.md -depends="frei0r-plugins gmic mlt-python3 python3-Pillow python3-dbus gtk+3 - python3-gobject python3-numpy swh-plugins" +depends="frei0r-plugins gmic mlt mlt-python3 python3-cairo python3-Pillow python3-dbus python3-gobject python3-numpy gtk+3 + swh-plugins gdk-pixbuf pango librsvg SDL_image swh-plugins" short_desc="Non-linear video editor for Linux" maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://jliljebl.github.io/flowblade/" distfiles="https://github.com/jliljebl/flowblade/archive/v${version}.tar.gz" -checksum=3753363d15caa6f1901118132a87f92d3b5e843c325775dbd83b30ee4d2a9bbf +checksum=9431dc80a3ff3a899953cd5864c00335b355fb44c0601895b0dd57268b40bdf9 +make_check=no # no tests to run From 608ba34d94f7509f2b8c989c1df4abe8705bbcad Mon Sep 17 00:00:00 2001 From: Luciogi Date: Mon, 11 Dec 2023 10:52:17 +0500 Subject: [PATCH 2/2] flowblade: update to 2.12.0.2, force x11, otherwise it crashes on wayland --- srcpkgs/flowblade/INSTALL.msg | 3 +++ srcpkgs/flowblade/files/enforce-x11.sh | 4 ++++ srcpkgs/flowblade/template | 18 +++++++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100755 srcpkgs/flowblade/INSTALL.msg create mode 100644 srcpkgs/flowblade/files/enforce-x11.sh diff --git a/srcpkgs/flowblade/INSTALL.msg b/srcpkgs/flowblade/INSTALL.msg new file mode 100755 index 0000000000000..01eb04f66a186 --- /dev/null +++ b/srcpkgs/flowblade/INSTALL.msg @@ -0,0 +1,3 @@ +WARNING: Use + /usr/bin/flowblade.sh +to run diff --git a/srcpkgs/flowblade/files/enforce-x11.sh b/srcpkgs/flowblade/files/enforce-x11.sh new file mode 100644 index 0000000000000..da38502411cf7 --- /dev/null +++ b/srcpkgs/flowblade/files/enforce-x11.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +# Flowblade does not support wayland and it crashes +GDK_BACKEND=x11 /usr/bin/flowblade $@ diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template index ac4e8b44cd6be..19b71fe71d402 100644 --- a/srcpkgs/flowblade/template +++ b/srcpkgs/flowblade/template @@ -1,19 +1,27 @@ # Template file for 'flowblade' pkgname=flowblade -# Reminder for 2.12.x: (drop python3-dbus) -version=2.10.0.4 +version=2.12.0.2 revision=1 build_wrksrc=flowblade-trunk build_style=python3-module make_install_args="--install-lib=${DESTDIR}/usr/share/flowblade" hostmakedepends="python3-setuptools" # https://github.com/jliljebl/flowblade/blob/master/flowblade-trunk/docs/DEPENDENCIES.md -depends="frei0r-plugins gmic mlt mlt-python3 python3-cairo python3-Pillow python3-dbus python3-gobject python3-numpy gtk+3 +depends="frei0r-plugins gmic mlt7 mlt7-python3 python3-cairo python3-Pillow python3-gobject python3-numpy gtk+3 swh-plugins gdk-pixbuf pango librsvg SDL_image swh-plugins" short_desc="Non-linear video editor for Linux" maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://jliljebl.github.io/flowblade/" -distfiles="https://github.com/jliljebl/flowblade/archive/v${version}.tar.gz" -checksum=9431dc80a3ff3a899953cd5864c00335b355fb44c0601895b0dd57268b40bdf9 +distfiles="https://github.com/jliljebl/flowblade/archive/v${version}.tar.gz>${pkgname}-v${version}.tar.gz" +checksum=f9c8598a373fc71e9493b4079a7a67c7afe3583939cdf1998600971988286f7d make_check=no # no tests to run + +do_patch() { + # Desktop file should run /usr/bin/flowblade.sh + vsed -i installdata/io.github.jliljebl.Flowblade.desktop -e 's#env.*#/usr/bin/flowblade.sh %f#' +} +post_install() { + # Enforce X11, otherwise it crashes on wayland + vinstall "${FILESDIR}/enforce-x11.sh" 0755 /usr/bin flowblade.sh +}