From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#38670] [PATCH] Fix audio/video in icecat Resent-Message-ID: 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 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Julien Lepiller Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 38670@debbugs.gnu.org --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-icecat-Fix-linking-with-ffmpeg.patch Content-Description: [PATCH] gnu: icecat: Fix linking with ffmpeg >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 --=-=-=--