[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: gnu: ffmpeg-jami: Really honor custom configuration flags.
From: |
guix-commits |
Subject: |
06/09: gnu: ffmpeg-jami: Really honor custom configuration flags. |
Date: |
Wed, 8 Feb 2023 09:40:37 -0500 (EST) |
apteryx pushed a commit to branch master
in repository guix.
commit d09b1805aa2ea6350c9bc96c5393fc5bd043ae37
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Feb 7 16:46:49 2023 -0500
gnu: ffmpeg-jami: Really honor custom configuration flags.
Because the substitute-keyword-arguments pattern was (#:configure-flags '())
rather than (#:configure-flags _ '()), the replacement was not triggered.
* gnu/packages/jami.scm (%ffmpeg-default-configure-flags): Comment that the
fnnvcodec-related options are left out.
(%ffmpeg-linux-x86-configure-flags): Delete variable.
(ffmpeg-compose-configure-flags): Streamline and use gexps.
(ffmpeg-jami) [arguments]: Fix configure-flags pattern, and adjust to use
gexps. Add the "--disable-static" and "--enable-shared" flags to produce
shared objects with the correct RUNPATH.
---
gnu/packages/jami.scm | 42 ++++++++++++------------------------------
1 file changed, 12 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index e425a6547a..a98e64bb86 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -147,7 +147,9 @@
;; from the jami/daemon/contrib/src/ffmpeg/rules.mak file. We try to keep it
;; as close to the official Jami package as possible, to provide all the
;; codecs and extra features that are expected (see:
-;;
https://review.jami.net/plugins/gitiles/jami-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak)
+;;
https://review.jami.net/plugins/gitiles/jami-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak).
+;; An exception are the ffnvcodec-related switches, which is not packaged in
+;; Guix and would not work with Mesa.
(define %ffmpeg-default-configure-flags
'("--disable-everything"
"--enable-zlib"
@@ -339,34 +341,12 @@
"--enable-encoder=mjpeg_vaapi"
"--enable-encoder=hevc_vaapi"))
-;; ffnvcodec is not supported on ARM; enable it only for the i386 and x86_64
-;; architectures.
-(define %ffmpeg-linux-x86-configure-flags
- '("--arch=x86"
- "--enable-cuvid"
- "--enable-ffnvcodec"
- "--enable-nvdec"
- "--enable-nvenc"
- "--enable-hwaccel=h264_nvdec"
- "--enable-hwaccel=hevc_nvdec"
- "--enable-hwaccel=vp8_nvdec"
- "--enable-hwaccel=mjpeg_nvdec"
- "--enable-encoder=h264_nvenc"
- "--enable-encoder=hevc_nvenc"))
-
-;; This procedure composes the configure flags list for ffmpeg-jami.
(define (ffmpeg-compose-configure-flags)
- (define (system=? s)
- (string-prefix? s (%current-system)))
-
- `(,@%ffmpeg-default-configure-flags
- ,@(if (string-contains (%current-system) "linux")
- (if (or (system=? "i686")
- (system=? "x86_64"))
- (append %ffmpeg-linux-configure-flags
- %ffmpeg-linux-x86-configure-flags)
- %ffmpeg-linux-configure-flags)
- '())))
+ "Compose the configure flag lists of ffmpeg-jami."
+ #~(append '#$%ffmpeg-default-configure-flags
+ (if (string-contains #$(%current-system) "linux")
+ '#$%ffmpeg-linux-configure-flags
+ '())))
(define-public ffmpeg-jami
(package
@@ -384,8 +364,10 @@
"0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg"))))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg-5)
- ((#:configure-flags '())
- (ffmpeg-compose-configure-flags))
+ ((#:configure-flags _ '())
+ #~(cons* "--disable-static"
+ "--enable-shared"
+ #$(ffmpeg-compose-configure-flags)))
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'apply-patches
- branch master updated (e5a381d0ca -> 20059f92a9), guix-commits, 2023/02/08
- 03/09: gnu: qtdeclarative: Skip tst_qqmlprofilerservice test., guix-commits, 2023/02/08
- 02/09: gnu: qtbase: Do not capture Python from native-inputs., guix-commits, 2023/02/08
- 05/09: gnu: opendht: Add a "python" output., guix-commits, 2023/02/08
- 09/09: gnu: jami: Remove unused native inputs., guix-commits, 2023/02/08
- 06/09: gnu: ffmpeg-jami: Really honor custom configuration flags.,
guix-commits <=
- 08/09: gnu: libjami: Move jamid daemon to a "bin" output., guix-commits, 2023/02/08
- 07/09: gnu: ffmpeg-jami: Add a debug output., guix-commits, 2023/02/08
- 01/09: gnu: qtbase: Do not capture cmake-minimal., guix-commits, 2023/02/08
- 04/09: gnu: opendht: Do not produce static libraries., guix-commits, 2023/02/08