mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 12:05:19 -06:00
3b8d7b10ae
* gnu/packages/jami.scm (libjami): Update to 20251212.0. [source]: Add libjami-pkgconf.patch and libjami-simdutf.patch patches. [inputs]: Add simdutf. (jami) Update to 20251212.0. [source]: Remove jami-unbundle-dependencies.patch, jami-libjami-headers-search.patch, jami-skip-tests-requiring-internet.patch and jami-find-package-avutil.patch; add jami-allow-system-zxing-cpp.patch, jami-libjami-cmake.patch and jami-avutil-link.patch patches. [inputs]: Delete qrencode. * gnu/packages/patches/jami-allow-system-zxing-cpp.patch: New file. * gnu/packages/patches/jami-avutil-link.patch: Likewise. * gnu/packages/patches/jami-libjami-cmake.patch: Likewise. * gnu/packages/patches/libjami-pkgconf.patch: Likewise. * gnu/packages/patches/libjami-simdutf.patch: Likewise. * gnu/packages/patches/jami-find-package-avutil.patch: Delete file. * gnu/packages/patches/jami-libjami-headers-search.patch: Likewise. * gnu/packages/patches/jami-skip-tests-requiring-internet.patch: Likewise. * gnu/packages/patches/jami-unbundle-dependencies.patch: Likewise. * gnu/packages/patches/libjami-ac-config-files.patch: Likewise. * gnu/packages/patches/libjami-sdbus-cpp-v2.patch: Likewise. * gnu/packages/patches/jami-qwindowkit.patch: Update upstream status. * gnu/local.mk (dist_patch_DATA): Update accordingly. Change-Id: I03ff9f4a892e1fead81d2c6e547f1c0cf405eb5f
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
Upstream-status: <https://review.jami.net/c/jami-daemon/+/32708>
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 055151670..f6e4ae978 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -590,6 +590,8 @@ PKG_CHECK_MODULES([SECP256K1], [libsecp256k1 >= 0.1],,
|
|
PKG_CHECK_MODULES([FMT], [fmt >= 7.0],,
|
|
AC_MSG_FAILURE([Missing {fmt}]))
|
|
|
|
+PKG_CHECK_MODULES([SIMDUTF], [simdutf])
|
|
+
|
|
# SHM
|
|
dnl check for shm
|
|
AS_IF([test "x$with_dbus" == xyes],
|
|
diff --git a/meson.build b/meson.build
|
|
index c0f98c7f8..3ad0bd0ba 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -32,6 +32,7 @@ deplibavutil = dependency('libavutil', version: '>= 55.75.100')
|
|
depfmt = dependency('fmt', version: '>= 5.3')
|
|
depyamlcpp = dependency('yaml-cpp', version: '>= 0.5.1')
|
|
depjsoncpp = dependency('jsoncpp', version: '>= 1.6.5')
|
|
+depsimdutf = dependency('simdutf')
|
|
depzlib = dependency('zlib')
|
|
|
|
if get_option('interfaces').contains('dbus')
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 8d874223e..cee546126 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -52,6 +52,7 @@ libjami_la_LIBADD += \
|
|
$(FMT_LIBS) \
|
|
$(LIBSSL_LIBS) \
|
|
$(LIBCRYPTO_LIBS) \
|
|
+ $(SIMDUTF_LIBS) \
|
|
$(ZLIB_LIBS)
|
|
|
|
# XXX: It seems this should be the default value when otherwise left
|
|
diff --git a/src/meson.build b/src/meson.build
|
|
index 22d026abc..bfc809cba 100644
|
|
--- a/src/meson.build
|
|
+++ b/src/meson.build
|
|
@@ -140,6 +140,7 @@ libjami_dependencies = [
|
|
depfmt,
|
|
depyamlcpp,
|
|
depjsoncpp,
|
|
+ depsimdutf,
|
|
depzlib,
|
|
depopenssl
|
|
]
|