From patchwork Fri Jul 7 19:28:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 51625 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 037E627BBEA; Fri, 7 Jul 2023 20:30:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 91FEA27BBE2 for ; Fri, 7 Jul 2023 20:30:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHr9Z-00033e-1g; Fri, 07 Jul 2023 15:30:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qHr9X-00033T-4J for guix-patches@gnu.org; Fri, 07 Jul 2023 15:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHr9W-00047t-Ox for guix-patches@gnu.org; Fri, 07 Jul 2023 15:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qHr9W-0001so-Cs for guix-patches@gnu.org; Fri, 07 Jul 2023 15:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64521] [PATCH] gnu: tuba: Fix video-player crash and webp support. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Jul 2023 19:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64521 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64521@debbugs.gnu.org Cc: Lilah Tascheter X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16887581967198 (code B ref -1); Fri, 07 Jul 2023 19:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jul 2023 19:29:56 +0000 Received: from localhost ([127.0.0.1]:43767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHr9P-0001s2-Nj for submit@debbugs.gnu.org; Fri, 07 Jul 2023 15:29:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:40648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHr9M-0001rr-2I for submit@debbugs.gnu.org; Fri, 07 Jul 2023 15:29:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qHr9L-00031H-Oy for guix-patches@gnu.org; Fri, 07 Jul 2023 15:29:51 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qHr9J-000360-Rt for guix-patches@gnu.org; Fri, 07 Jul 2023 15:29:51 -0400 Authentication-Results: purelymail.com; auth=pass DKIM-Signature: a=rsa-sha256; b=dM1VEADzBhLzTDNrfBTYKSQFkbjZFXze8jAK6x0dfoXlvf33Sec/z2CC+H1AnryfXZfnvJid9MWjB4lHuuyakdyH31CUeXozJ3TiE+ibYBYbbwJ6CdPvnmzKlVenktP4mgtG6Y4CXffmntxyX2+CYwv3c4Y06sL5Rc9dBq9cTe1dJa+LbK8DeuhOCDJQy7L/Y2f73sveapqh6f64sifbpksyCtA0Grl1We7b45arG+3QQYUcnS6Xv6HMuov6BJ4EI4fK0ipkkG1sLOjHQoVmMEzhtM7ZxTvZvTSScx6uEsp+woIN4pC+0HQq3PFTDM5u0SiKEebl1YZXn9dNLdY/Hg==; s=purelymail3; d=lunabee.space; v=1; bh=2KGmhXNRK5jgRnaTkS7wRAi7b9lQAN6YnlqAAC2DD90=; h=Received:From:To:Subject; DKIM-Signature: a=rsa-sha256; b=aRvHO/qMhma0Gu55AkSI6sPFUW4ZzLsyrCAx0p4Wiztihb5rwwlHgCEwjCJZij1cVG/zKT3AhI1ojeZzhZdkaJykKc8jzm0euBosivIYFe2y1YlsysmLLRX3/TfMh/LXKFWyM6MFLdq2qziXoLE4HW5Hs/Ql7RrhsC6ugctFmapWIuwEbu+CcD9j9glRVwTkqxWcMH04hVDE3RUBofLQVIA9lLHCJMQ3Y8VRZQF4bGu19TPXi7dO9onl2U7KYIoteZoxPZkEs5f+C9iA6fciZV91yZJnuJjgFhoHpyIMTnc6LVqp6FiAdEFjK1V2umnLo4OuQATC4IUuVQk3gfeEFQ==; s=purelymail3; d=purelymail.com; v=1; bh=2KGmhXNRK5jgRnaTkS7wRAi7b9lQAN6YnlqAAC2DD90=; h=Feedback-ID:Received:From:To:Subject; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: guix-patches@gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 2119948625; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 07 Jul 2023 19:29:36 +0000 (UTC) Date: Fri, 7 Jul 2023 14:28:51 -0500 Message-Id: <41881946b2ae618d37e9c9939bf3d878116a70dc.1688758089.git.lilah@lunabee.space> MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Received-SPF: pass client-ip=34.202.193.197; envelope-from=lilah@lunabee.space; helo=sendmail.purelymail.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Lilah Tascheter X-ACL-Warn: , Lilah Tascheter via Guix-patches X-Patchwork-Original-From: Lilah Tascheter via Guix-patches via From: Lilah Tascheter Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Without gstreamer, tuba will crash every time the user clicks on a video. libwepb was included as an input but without a pixbuf loader, so webp support was compiled in but didn't work. * gnu/packages/mastodon.scm (tuba)[arguments]: Update to new style. (tuba)[arguments]: 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 | 41 +++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) base-commit: 3e9915724718948f0d74d83aaac1b3c8061c26d2 diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index feef8c61f9..e3334ac868 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -21,6 +21,7 @@ (define-module (gnu packages mastodon) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system meson) #:use-module (guix build-system python) @@ -32,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) @@ -94,21 +96,35 @@ (define-public tuba (base32 "1xhyz6wi17g4m76lr6qc75q4xnnw7c3dh3d04dg8m5gzk6j0y89x")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:configure-flags (list "-Ddistro=true") - #:phases - (modify-phases %standard-phases - (add-after 'glib-or-gtk-wrap 'symlink-package - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion - (string-append (assoc-ref outputs "out") "/bin") - (symlink "dev.geopjr.Tuba" "tuba"))))))) + (list + #:glib-or-gtk? #t + #:configure-flags ''("-Ddistro=true") + #:phases + #~(modify-phases %standard-phases + (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 + gst-plugins-ugly + gstreamer + gtk gtksourceview json-glib libadwaita @@ -117,7 +133,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,