diff options
Diffstat (limited to 'gnu/packages/jami.scm')
| -rw-r--r-- | gnu/packages/jami.scm | 57 |
1 files changed, 14 insertions, 43 deletions
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 65607249ba..7829f3db34 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -68,7 +68,7 @@ #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20230206.0") +(define %jami-version "20230323.0") (define %jami-sources ;; Return an origin object of the tarball release sources archive of the @@ -85,7 +85,7 @@ '(delete-file-recursively "daemon/contrib/tarballs")) (sha256 (base32 - "1fx7c6q8j0x3q8cgzzd4kpsw3npqggsi1n493cv1jg7v5d01d3jz")) + "0vjsjr37cb87j9hqbmipyxn4877k1wn3l0vzca3l3ldgknglz7v2")) (patches (search-patches "jami-disable-integration-tests.patch" "jami-libjami-headers-search.patch")))) @@ -107,8 +107,8 @@ patches)))) (define-public pjproject-jami - (let ((commit "20e00fcdd16459444bae2bae9c0611b63cf87297") - (revision "2")) + (let ((commit "e4b83585a0bdf1523e808a4fc1946ec82ac733d0") + (revision "3")) (package (inherit pjproject) (name "pjproject-jami") @@ -127,7 +127,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1g8nkb5ln5y208k2hhmlcddv2dzf6plfrsvi4x8sa7iwgb4prgb8")))) + "0gky5idyyqxhqk959lzys5l7x1i925db773lfdpvxxmkmfizdq21")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:phases phases '%standard-phases) @@ -179,6 +179,7 @@ "--enable-muxer=h264" "--enable-muxer=hevc" "--enable-muxer=matroska" + "--enable-muxer=wav" "--enable-muxer=webm" "--enable-muxer=ogg" "--enable-muxer=pcm_s16be" @@ -257,40 +258,30 @@ "--enable-encoder=libopus" "--enable-decoder=libopus" - ;; Decoders for ringtones and audio streaming. + ;; Encoders/decoders for ringtones and audio streaming. "--enable-decoder=flac" "--enable-decoder=vorbis" "--enable-decoder=aac" "--enable-decoder=ac3" "--enable-decoder=eac3" "--enable-decoder=mp3" - "--enable-decoder=pcm_u24be" "--enable-decoder=pcm_u24le" - "--enable-decoder=pcm_u32be" "--enable-decoder=pcm_u32le" "--enable-decoder=pcm_u8" "--enable-decoder=pcm_f16le" - "--enable-decoder=pcm_f24le" - "--enable-decoder=pcm_f32be" "--enable-decoder=pcm_f32le" - "--enable-decoder=pcm_f64be" "--enable-decoder=pcm_f64le" - "--enable-decoder=pcm_s16be" - "--enable-decoder=pcm_s16be_planar" "--enable-decoder=pcm_s16le" - "--enable-decoder=pcm_s16le_planar" - "--enable-decoder=pcm_s24be" "--enable-decoder=pcm_s24le" - "--enable-decoder=pcm_s24le_planar" - "--enable-decoder=pcm_s32be" "--enable-decoder=pcm_s32le" - "--enable-decoder=pcm_s32le_planar" - "--enable-decoder=pcm_s64be" "--enable-decoder=pcm_s64le" - "--enable-decoder=pcm_s8" - "--enable-decoder=pcm_s8_planar" - "--enable-decoder=pcm_u16be" "--enable-decoder=pcm_u16le" + "--enable-encoder=pcm_u8" + "--enable-encoder=pcm_f32le" + "--enable-encoder=pcm_f64le" + "--enable-encoder=pcm_s16le" + "--enable-encoder=pcm_s32le" + "--enable-encoder=pcm_s64le" ;; Encoders/decoders for images. "--enable-encoder=gif" @@ -351,17 +342,6 @@ (package (inherit ffmpeg) (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")))) - (outputs '("out" "debug")) (arguments (substitute-keyword-arguments (package-arguments ffmpeg) ((#:configure-flags _ '()) @@ -382,16 +362,7 @@ "rtp_ext_abs_send_time" "libopusdec-enable-FEC" "libopusenc-reload-packet-loss-at-encode" - "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:.*") "")))))))))) + "screen-sharing-x11-fix")))))))))) (define-public libjami (package |