From: Mark H Weaver <mhw@netris.org>
To: Julien Lepiller <julien@lepiller.eu>
Cc: "Ludovic Courtès" <ludo@gnu.org>, 38670@debbugs.gnu.org
Subject: [bug#38670] [PATCH] Fix audio/video in icecat
Date: Sat, 21 Dec 2019 23:52:08 -0500 [thread overview]
Message-ID: <87lfr57yi4.fsf@netris.org> (raw)
In-Reply-To: <87k16pmh0b.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 778 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] gnu: icecat: Fix linking with ffmpeg --]
[-- Type: text/x-patch, Size: 1303 bytes --]
From eed217b25cea8926680308c8e21522417fe13cf4 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
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 <mhw@netris.org>.
---
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
next prev parent reply other threads:[~2019-12-22 4:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 13:59 [bug#38670] [PATCH] Fix audio/video in icecat Julien Lepiller
2019-12-21 22:49 ` Ludovic Courtès
2019-12-22 4:52 ` Mark H Weaver [this message]
2019-12-22 7:07 ` Brett Gilio
2019-12-22 10:00 ` Julien Lepiller
2019-12-22 20:33 ` Mark H Weaver
2019-12-22 23:04 ` Julien Lepiller
2019-12-23 11:50 ` bug#38670: " Julien Lepiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lfr57yi4.fsf@netris.org \
--to=mhw@netris.org \
--cc=38670@debbugs.gnu.org \
--cc=julien@lepiller.eu \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.