unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Lilah Tascheter via Guix-patches via <guix-patches@gnu.org>
To: 64521@debbugs.gnu.org
Cc: rg@raghavgururajan.name, Lilah Tascheter <lilah@lunabee.space>,
	liliana.prikler@gmail.com, maxim.cournoyer@gmail.com,
	juli@incana.org
Subject: [bug#64521] [PATCH 2/2] gnu: tuba: Fix videoplayer crash and webp support.
Date: Sat,  8 Jul 2023 00:11:21 -0500	[thread overview]
Message-ID: <e45dca52be7ff8d71589c151be9b53897a3cddc0.1688793035.git.lilah@lunabee.space> (raw)
In-Reply-To: <628b4da693ff055a279df3658646bc379c8f033d.1688793035.git.lilah@lunabee.space>

* gnu/packages/mastodon.scm (tuba)[arguments]<phases: Add lib-vars-wrap
  phase to set GST_PLUGIN_SYSTEM_PATH and GDK_PIXBUF_MODULE_FILE
  variables.

  (tuba)[native-inputs]: Add gdk-pixbuf.
  (tuba)[inputs]: Add gstreamer, plugins, and webp-pixbuf-loader.
---
 gnu/packages/mastodon.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm
index af578bd7de..4442e6cb2a 100644
--- a/gnu/packages/mastodon.scm
+++ b/gnu/packages/mastodon.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages mastodon)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
@@ -100,17 +101,29 @@ (define-public tuba
         #:configure-flags ''("-Ddistro=true")
         #:phases
         #~(modify-phases %standard-phases
-            (add-after 'glib-or-gtk-wrap 'symlink-package
+            (add-after 'glib-or-gtk-wrap 'lib-vars-wrap
+              (lambda _
+                (let ((gstvar "GST_PLUGIN_SYSTEM_PATH")
+                      (pixvar "GDK_PIXBUF_MODULE_FILE"))
+                  (wrap-program (string-append #$output "/bin/dev.geopjr.Tuba")
+                    `(,gstvar ":" suffix (,(getenv gstvar)))
+                    `(,pixvar ":" = (,(getenv pixvar)))))))
+            (add-after 'lib-vars-wrap 'symlink-package
               (lambda _
                 (with-directory-excursion
                   (string-append #$output "/bin")
                   (symlink "dev.geopjr.Tuba" "tuba")))))))
     (native-inputs
-     (list gettext-minimal
+     (list gdk-pixbuf ; so pixbuf loader cache (for webp) is generated
+           gettext-minimal
            `(,glib "bin") ; for glib-compile-resources
            pkg-config))
     (inputs
-     (list gtk
+     (list gst-plugins-bad
+           gst-plugins-base
+           gst-plugins-good
+           gstreamer
+           gtk
            gtksourceview
            json-glib
            libadwaita
@@ -119,7 +132,8 @@ (define-public tuba
            libsecret
            libwebp
            libxml2
-           vala))
+           vala
+           webp-pixbuf-loader))
     (home-page "https://tuba.geopjr.dev/")
     (synopsis "GTK client for Mastodon")
     (description "Tuba is a GTK client for Mastodon.  It provides a clean,
-- 
2.40.1





  reply	other threads:[~2023-07-08  5:12 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-07 19:28 [bug#64521] [PATCH] gnu: tuba: Fix video-player crash and webp support Lilah Tascheter via Guix-patches via
2023-07-07 21:08 ` Juliana Sims
2023-07-08  5:08   ` Lilah Tascheter via Guix-patches via
2023-07-08  5:11 ` [bug#64521] [PATCH 1/2] gnu: tuba: Update to new style Lilah Tascheter via Guix-patches via
2023-07-08  5:11   ` Lilah Tascheter via Guix-patches via [this message]
2023-07-08 16:57     ` [bug#64521] [PATCH 2/2] gnu: tuba: Fix videoplayer crash and webp support Juliana Sims
2023-07-10  4:40     ` bug#64521: " Maxim Cournoyer

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e45dca52be7ff8d71589c151be9b53897a3cddc0.1688793035.git.lilah@lunabee.space \
    --to=guix-patches@gnu.org \
    --cc=64521@debbugs.gnu.org \
    --cc=juli@incana.org \
    --cc=lilah@lunabee.space \
    --cc=liliana.prikler@gmail.com \
    --cc=maxim.cournoyer@gmail.com \
    --cc=rg@raghavgururajan.name \
    /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.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).