From: Luciogi <Luciogi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [Broken] flowblade: update to 2.12.0.2, Enforce X11
Date: Wed, 31 Jan 2024 14:08:54 +0100 [thread overview]
Message-ID: <20240131130854.C099824066@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47195@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages flowblade
https://github.com/void-linux/void-packages/pull/47195
[Broken] flowblade: update to 2.12.0.2, Enforce X11
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/47195.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-flowblade-47195.patch --]
[-- Type: text/x-diff, Size: 4514 bytes --]
From e923726f0098cfb618d499bc9367c343a447b5b1 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
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 <realtiaz@gmail.com>"
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 <lucigithubcommit@skiff.com>
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 <realtiaz@gmail.com>"
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
+}
next prev parent reply other threads:[~2024-01-31 13:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 14:41 [PR PATCH] flowblade: update to 2.10.0.4 Luciogi
2023-12-11 6:13 ` [PR PATCH] [Updated] " Luciogi
2024-01-31 13:08 ` Luciogi [this message]
2024-01-31 13:10 ` [PR PATCH] [Updated] flowblade: update to 2.12.0.2, Enforce X11 Luciogi
2024-01-31 13:11 ` Luciogi
2024-01-31 13:14 ` [PR PATCH] [Updated] flowblade: update to 2.12.0.2, force X11 Luciogi
2024-01-31 13:19 ` Luciogi
2024-01-31 13:21 ` Luciogi
2024-05-01 1:47 ` github-actions
2024-05-15 1:48 ` [PR PATCH] [Closed]: " github-actions
2024-05-16 23:39 ` zlice
2024-05-17 12:50 ` Luciogi
2024-05-17 12:54 ` zlice
2024-05-17 13:32 ` Luciogi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240131130854.C099824066@inbox.vuxu.org \
--to=luciogi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).