gnu: jami: Update to 20230323.0.
* gnu/packages/jami.scm (jami): Update to 20230323.0. (%ffmpeg-default-configure-flags): Update flags. (pjproject-jami): Update commit. (ffmpeg-jami) [version, source, outputs]: : Delete fields. [arguments]: Delete disable-problematic-tests phase. * gnu/packages/patches/jami-libjami-headers-search.patch: Rebase patch.
This commit is contained in:
Maxim Cournoyer
parent
5a7a1a9b38
commit
48d1b90b19
2 changed files with 26 additions and 76 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,30 +1,10 @@
|
|||
From 1168aba6181e30ee4c322e5f437bde22bece5698 Mon Sep 17 00:00:00 2001
|
||||
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
|
||||
Date: Sat, 5 Nov 2022 23:18:13 -0400
|
||||
Subject: [PATCH 1/3] cmake: Simplify lookup logic for libjami headers.
|
||||
|
||||
* extras/build/cmake/modules/FindLibJami.cmake: Rename
|
||||
LIBJAMI_INCLUDE_DIRS to LIBJAMI_INCLUDE_DIR. Use find_path to search
|
||||
for jami.h directory.
|
||||
* CMakeLists.txt: Adjust accordingly.
|
||||
* src/libclient/CMakeLists.txt: Likewise.
|
||||
* src/libclient/qtwrapper/CMakeLists.txt: Likewise.
|
||||
|
||||
Change-Id: I494358f9bfafb41f000daeec4196747b2c184401
|
||||
---
|
||||
Upstream status: https://review.jami.net/c/jami-client-qt/+/22973
|
||||
|
||||
CMakeLists.txt | 2 +-
|
||||
extras/build/cmake/modules/FindLibJami.cmake | 21 ++++++--------------
|
||||
src/libclient/CMakeLists.txt | 2 +-
|
||||
src/libclient/qtwrapper/CMakeLists.txt | 2 +-
|
||||
4 files changed, 9 insertions(+), 18 deletions(-)
|
||||
Upstream status: https://review.jami.net/c/jami-client-qt/+/24273.
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d0a8fd70..94ac6074 100644
|
||||
index 8d71b84b..36729698 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -118,7 +118,7 @@ set(CMAKE_MODULE_PATH
|
||||
@@ -136,7 +136,7 @@ set(CMAKE_MODULE_PATH
|
||||
${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
|
||||
find_package(LibJami REQUIRED)
|
||||
if(LIBJAMI_FOUND)
|
||||
|
|
@ -34,15 +14,15 @@ index d0a8fd70..94ac6074 100644
|
|||
|
||||
include(FindPython3)
|
||||
diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake
|
||||
index ddb05319..9ad20d2b 100644
|
||||
index 5cce45fc..11746cd8 100644
|
||||
--- a/extras/build/cmake/modules/FindLibJami.cmake
|
||||
+++ b/extras/build/cmake/modules/FindLibJami.cmake
|
||||
@@ -20,28 +20,19 @@
|
||||
@@ -20,30 +20,19 @@
|
||||
|
||||
# Once done, this find module will set:
|
||||
#
|
||||
-# LIBJAMI_INCLUDE_DIRS - libjami include directories
|
||||
+# LIBJAMI_INCLUDE_DIR - libjami include directories
|
||||
+# LIBJAMI_INCLUDE_DIR - libjami include directory
|
||||
# LIBJAMI_FOUND - whether it was able to find the include directories
|
||||
# LIBJAMI_LIB - path to libjami or libring library
|
||||
|
||||
|
|
@ -62,16 +42,18 @@ index ddb05319..9ad20d2b 100644
|
|||
- set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami)
|
||||
- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h)
|
||||
- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami)
|
||||
- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami/jami.h)
|
||||
- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami)
|
||||
- else()
|
||||
+ find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami)
|
||||
+ if(NOT LIBJAMI_INCLUDE_DIR)
|
||||
message(STATUS "Jami daemon headers not found!
|
||||
-Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX")
|
||||
+Set -DCMAKE_INSTALL_PREFIX or use -DWITH_DAEMON_SUBMODULE")
|
||||
+To build using the daemon git submodule, set -DWITH_DAEMON_SUBMODULE")
|
||||
set(LIBJAMI_FOUND false)
|
||||
endif()
|
||||
endif()
|
||||
@@ -102,5 +93,5 @@ endif()
|
||||
@@ -115,5 +104,5 @@ endif()
|
||||
# Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES.
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig})
|
||||
|
||||
|
|
@ -79,7 +61,7 @@ index ddb05319..9ad20d2b 100644
|
|||
+message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
|
||||
message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
|
||||
diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt
|
||||
index 2676c9c4..ac58ea2b 100644
|
||||
index 144efaf5..cb87fc2a 100644
|
||||
--- a/src/libclient/CMakeLists.txt
|
||||
+++ b/src/libclient/CMakeLists.txt
|
||||
@@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH
|
||||
|
|
@ -92,7 +74,7 @@ index 2676c9c4..ac58ea2b 100644
|
|||
|
||||
string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
|
||||
diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt
|
||||
index acee0d0c..ba68aac4 100644
|
||||
index 46887051..a20658ad 100644
|
||||
--- a/src/libclient/qtwrapper/CMakeLists.txt
|
||||
+++ b/src/libclient/qtwrapper/CMakeLists.txt
|
||||
@@ -46,7 +46,7 @@ else()
|
||||
|
|
@ -104,6 +86,3 @@ index acee0d0c..ba68aac4 100644
|
|||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus)
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
|
|
|||
Reference in a new issue