From patchwork Thu Dec 19 13:59:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 16566 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 E82A31794E; Thu, 19 Dec 2019 14:23:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9E28D1794C for ; Thu, 19 Dec 2019 14:23:53 +0000 (GMT) Received: from localhost ([::1]:42460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihwiW-0001ly-T9 for patchwork@mira.cbaines.net; Thu, 19 Dec 2019 09:23:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57955) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihwLU-0001K6-LB for guix-patches@gnu.org; Thu, 19 Dec 2019 09:00:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihwLT-000759-2H for guix-patches@gnu.org; Thu, 19 Dec 2019 09:00:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38422) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihwLS-00072U-QM for guix-patches@gnu.org; Thu, 19 Dec 2019 09:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ihwLS-0007vm-Lt for guix-patches@gnu.org; Thu, 19 Dec 2019 09:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38670] [PATCH] Fix audio/video in icecat Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2019 14:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38670@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157676398630421 (code B ref -1); Thu, 19 Dec 2019 14:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2019 13:59:46 +0000 Received: from localhost ([127.0.0.1]:44395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ihwLC-0007ub-5F for submit@debbugs.gnu.org; Thu, 19 Dec 2019 08:59:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:53620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ihwLA-0007uU-M8 for submit@debbugs.gnu.org; Thu, 19 Dec 2019 08:59:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55755) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihwL8-0000iu-Lb for guix-patches@gnu.org; Thu, 19 Dec 2019 08:59:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihwL7-00058C-4W for guix-patches@gnu.org; Thu, 19 Dec 2019 08:59:42 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:56302) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihwL6-0004gG-D7 for guix-patches@gnu.org; Thu, 19 Dec 2019 08:59:41 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ebfbf303 for ; Thu, 19 Dec 2019 13:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=aYh 49jEQ/CSSdm4LHxxnbjgxXtE=; b=CiN9CGasDHw3MVcYzp9ml7ADdnv5liVbl1N YnNTtuVCEcA2hJNPw8VWWtQeLhY7ZbiY/xvsnHrwAXFYFPJBrLKy+piFcjBE1cYq fhs2VQvF4WoOOV2+cb8xSeJBwy207RpOdF8sMOyPnQildpeH2d0RBu5vpnlHg6Ck BD9MG1Q/KYQtyo0imTIZCmJeM+JaEiuRrveT/q2rkm61Jud5EkgcpZnpbhszQ46i b5RTZXfcWCKz0xNV/ylOZq4iS/pgGvX2FpLkc5JDGahiVCh6vFTh/EmDrCZOv9xP lmjw6MJKJrGrKfLL19RW58eqULgn14RX3O29CnfBZIXthYZNCFg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5f4466d6 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Thu, 19 Dec 2019 13:59:35 +0000 (UTC) Date: Thu, 19 Dec 2019 14:59:22 +0100 From: Julien Lepiller Message-ID: <20191219145922.715720ad@sybil.lepiller.eu> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi guix, since the update to icecat 68, mpeg decoding doesn't work in IceCat (mp3/mp4 would not play, breaking a lot of online media players). This patch addresses that issue, that was caused by IceCat not finding ffmpeg's library. It was dlopening libavcodec.so, but could not find it. I replaced it with an absolute reference to the library in the store, which now allows IceCat to load the library at runtime. It also adds ffmpeg to icecat's closure, ensuring it will always find it. From c144cf973235d2e633daeeedbac45fcf61da04a1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 19 Dec 2019 13:02:34 +0100 Subject: [PATCH] gnu: icecat: Fix linking with ffmpeg. * gnu/packages/gnuzilla.scm (icecat): Use absolute path for ffmpeg library loading. --- gnu/packages/gnuzilla.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 2f15beecc7..ce63f6762e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -950,7 +950,7 @@ from forcing GEXP-PROMISE." )) #t)) (add-after 'remove-bundled-libraries 'link-libxul-with-libraries - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) ;; libxul.so dynamically opens libraries, so here we explicitly ;; link them into libxul.so instead. ;; @@ -963,6 +963,9 @@ from forcing GEXP-PROMISE." 'GL', 'gnome-2', 'canberra', 'Xss', 'cups', 'gssapi_krb5', 'avcodec', 'avutil', 'pulse' ]\n\n" all))) + (substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp" + (("libavcodec.so.[0-9]*") + (string-append (assoc-ref inputs "ffmpeg") "/lib/libavcodec.so"))) #t)) (replace 'bootstrap (lambda _ -- 2.24.0