[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/285: gnu: icecat: Fix linking with ffmpeg.
From: |
guix-commits |
Subject: |
17/285: gnu: icecat: Fix linking with ffmpeg. |
Date: |
Sun, 29 Dec 2019 20:43:52 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome3.34
in repository guix.
commit 56b970f7eaccb1f7280f557de7fbae0aafa2cf93
Author: Julien Lepiller <address@hidden>
Date: Thu Dec 19 13:02:07 2019 +0100
gnu: icecat: Fix linking with ffmpeg.
* gnu/packages/gnuzilla.scm (icecat)[arguments]: Add
'fix-ffmpeg-runtime-linker' phase.
Co-authored-by: Mark H Weaver <address@hidden>.
---
gnu/packages/gnuzilla.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 2f15bee..d5d9839 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -964,6 +964,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")
- 10/285: gnu: parallel: Update to 20191222., (continued)
- 10/285: gnu: parallel: Update to 20191222., guix-commits, 2019/12/29
- 13/285: gnu: gnome-shell-extension-hide-app-icon: Fix installation., guix-commits, 2019/12/29
- 14/285: gnu: gnome-shell-extension-dash-to-dock: Depropagate glib:bin., guix-commits, 2019/12/29
- 15/285: gnu: gnome-shell-extensions: Depropagate glib:bin., guix-commits, 2019/12/29
- 12/285: gnu: guix-data-service: Update to 0.0.1-9.31110ac., guix-commits, 2019/12/29
- 25/285: gnu: ktouch: Use fixed qt-build-system., guix-commits, 2019/12/29
- 09/285: gnu: Add polari., guix-commits, 2019/12/29
- 23/285: gnu: kdevelop: Use fixed qt-build-system., guix-commits, 2019/12/29
- 16/285: bootloader: grub: Add firmware setup entry., guix-commits, 2019/12/29
- 18/285: gnu: nano: Update to 4.7., guix-commits, 2019/12/29
- 17/285: gnu: icecat: Fix linking with ffmpeg.,
guix-commits <=
- 19/285: build-system: qt: Actually use qt-build-system, not cmake-build-system., guix-commits, 2019/12/29
- 22/285: gnu: sddm: Use fixed qt-build-system., guix-commits, 2019/12/29
- 21/285: Revert "gnu: mumble: Actually modify qt-build-system.", guix-commits, 2019/12/29
- 20/285: build-system: qt: Adjust indentation., guix-commits, 2019/12/29
- 27/285: gnu: Add zeroconf-ioslave., guix-commits, 2019/12/29
- 30/285: gnu: Add kmousetool., guix-commits, 2019/12/29
- 26/285: gnu: Add grantleetheme., guix-commits, 2019/12/29
- 40/285: gnu: acpica: Update to 20191213., guix-commits, 2019/12/29
- 42/285: gnu: thermald: Update to 1.9.1., guix-commits, 2019/12/29
- 41/285: gnu: fio: Update to 3.17., guix-commits, 2019/12/29