From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#38670] [PATCH] Fix audio/video in icecat Resent-Message-ID: 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) 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> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/Qd9/oJpq8Xir1WYsCYqSUTq" 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: 38670@debbugs.gnu.org --MP_/Qd9/oJpq8Xir1WYsCYqSUTq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline 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. --MP_/Qd9/oJpq8Xir1WYsCYqSUTq Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-icecat-Fix-linking-with-ffmpeg.patch >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 --MP_/Qd9/oJpq8Xir1WYsCYqSUTq--