me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ffmpeg-jami: Update to 5.0.1 and enable tests.

Browse source 
* gnu/packages/jami.scm (ffmpeg-jami): Update to 5.0.1.
[tests?]: Delete argument.
[phases]{disable-problematic-tests}: New phase.
This commit is contained in:
Maxim Cournoyer 2022-09-17 23:31:34 -04:00
parent c8ab64b2df
commit c50231cfcb
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/jami.scm
View file

@ -374,16 +374,21 @@
'()))) '())))
(define-public ffmpeg-jami (define-public ffmpeg-jami
(package/inherit ffmpeg (package
(inherit ffmpeg-5)
(name "ffmpeg-jami") (name "ffmpeg-jami")
;; XXX: Use a slightly older version, otherwise the
;; 'libopusdec-enable-FEC' patch doesn't apply.
(version "5.0.1")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
"0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg) (substitute-keyword-arguments (package-arguments ffmpeg-5)
((#:tests? _ #f)
;; The "rtp_ext_abs_send_time" patch causes the 'lavf-mov_rtphint'
;; test to fail (see:
;; https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/685).
;; TODO: Try to disable just this test.
#f)
((#:configure-flags '()) ((#:configure-flags '())
(ffmpeg-compose-configure-flags)) (ffmpeg-compose-configure-flags))
((#:phases phases) ((#:phases phases)
@ -399,7 +404,16 @@
"rtp_ext_abs_send_time" "rtp_ext_abs_send_time"
"libopusdec-enable-FEC" "libopusdec-enable-FEC"
"libopusenc-reload-packet-loss-at-encode" "libopusenc-reload-packet-loss-at-encode"
"screen-sharing-x11-fix")))))))))) "screen-sharing-x11-fix"))))
(add-after 'apply-patches 'disable-problematic-tests
(lambda _
;; The "rtp_ext_abs_send_time" patch causes the 'lavf-mov_rtphint'
;; test to fail (see:
;; https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/685).
(substitute* "tests/fate/lavf-container.mak"
(("mov mov_rtphint ismv")
"mov ismv")
(("fate-lavf-mov_rtphint:.*") ""))))))))))
(define-public libjami (define-public libjami
(package (package