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
17 lines
556 B
Diff
17 lines
556 B
Diff
Upstream-status: <https://review.jami.net/c/jami-client-qt/+/32710>
|
|
|
|
diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt
|
|
index 5c35e402..5e3929bc 100644
|
|
--- a/src/libclient/CMakeLists.txt
|
|
+++ b/src/libclient/CMakeLists.txt
|
|
@@ -325,6 +325,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
|
|
else()
|
|
set(CC_MACHINE "")
|
|
endif()
|
|
+find_library(AVUTIL_LIBRARY avutil
|
|
+ HINTS
|
|
+ ${LIBJAMI_CONTRIB_DIR}/${CC_MACHINE}/lib
|
|
+ ${LIBJAMI_CONTRIB_DIR}/apple-darwin/lib)
|
|
|
|
if(ENABLE_LIBWRAP)
|
|
list(APPEND LIBCLIENT_HEADERS directrenderer.h)
|