From patchwork Sun Dec 22 04:52:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark H Weaver X-Patchwork-Id: 19423 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 81E391796A; Sun, 22 Dec 2019 04:54:11 +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,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 3EFA41796A for ; Sun, 22 Dec 2019 04:54:11 +0000 (GMT) Received: from localhost ([::1]:44400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iitFq-0000oK-Kd for patchwork@mira.cbaines.net; Sat, 21 Dec 2019 23:54:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59768) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iitFj-0000o1-GP for guix-patches@gnu.org; Sat, 21 Dec 2019 23:54:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iitFi-00073O-Dm for guix-patches@gnu.org; Sat, 21 Dec 2019 23:54:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43044) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iitFi-00072x-A4 for guix-patches@gnu.org; Sat, 21 Dec 2019 23:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iitFi-0006BU-4x for guix-patches@gnu.org; Sat, 21 Dec 2019 23:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38670] [PATCH] Fix audio/video in icecat Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Dec 2019 04:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Julien Lepiller Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , 38670@debbugs.gnu.org Received: via spool by 38670-submit@debbugs.gnu.org id=B38670.157699042723751 (code B ref 38670); Sun, 22 Dec 2019 04:54:02 +0000 Received: (at 38670) by debbugs.gnu.org; 22 Dec 2019 04:53:47 +0000 Received: from localhost ([127.0.0.1]:49017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iitFS-0006B1-Uj for submit@debbugs.gnu.org; Sat, 21 Dec 2019 23:53:47 -0500 Received: from world.peace.net ([64.112.178.59]:50084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iitFQ-0006Ao-Fz for 38670@debbugs.gnu.org; Sat, 21 Dec 2019 23:53:45 -0500 Received: from mhw by world.peace.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iitFO-0003wO-Qe; Sat, 21 Dec 2019 23:53:43 -0500 From: Mark H Weaver In-Reply-To: <87k16pmh0b.fsf@gnu.org> References: <20191219145922.715720ad@sybil.lepiller.eu> <87k16pmh0b.fsf@gnu.org> Date: Sat, 21 Dec 2019 23:52:08 -0500 Message-ID: <87lfr57yi4.fsf@netris.org> MIME-Version: 1.0 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 Julien, Thanks very much for investigating and producing a working fix for this issue! It is a great relief to remove this item from my TODO list :) I have a few minor nits, and am currently testing a slight variant of your proposed patch, attached below. I made the following changes: * I added a new phase instead of augmenting the existing 'link-libxul-with-libraries' phase, since the name of the existing phase doesn't match what's being done here. * I leave the numeric suffixes (version number) of the shared library names unchanged, instead of stripping them as you did. * I used "\\." in the regexp to strictly match that character. * I moved the rationale comment from the commit log into the code. What do you think? Thanks again! Mark From eed217b25cea8926680308c8e21522417fe13cf4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 19 Dec 2019 13:02:07 +0100 Subject: [PATCH] gnu: icecat: Fix linking with ffmpeg. * gnu/packages/gnuzilla.scm (icecat)[arguments]: Add 'fix-ffmpeg-runtime-linker' phase. Co-authored-by: Mark H Weaver . --- gnu/packages/gnuzilla.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 8bfa6c2a55..46fc7928a0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -968,6 +968,13 @@ from forcing GEXP-PROMISE." 'avcodec', 'avutil', 'pulse' ]\n\n" all))) #t)) + (add-after 'link-libxul-with-libraries 'fix-ffmpeg-runtime-linker + (lambda* (#:key inputs #:allow-other-keys) + ;; Arrange to load libavcodec.so by its absolute file name. + (substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp" + (("libavcodec\\.so") + (string-append (assoc-ref inputs "ffmpeg") "/lib/libavcodec.so"))) + #t)) (replace 'bootstrap (lambda _ (invoke "sh" "-c" "autoconf old-configure.in > old-configure") -- 2.24.1