jami test update

2026-02-27 18:08:19 +03:00
parent 5db1b4a362
commit cabd3d8bfa
37 changed files with 13031 additions and 66 deletions
--- a/net-voip/jami-client-qt/Manifest
+++ b/net-voip/jami-client-qt/Manifest
@@ -3,6 +3,7 @@ AUX fix-link.patch 341 BLAKE2B 93739792a2d17ecfd22ba7dbd985ae7c3c653d6a68d56323a
 AUX missing-cmake-include.patch 423 BLAKE2B 60f30ab98480ecb3e5655a41b51db435b57599a06cd52c383b5d05fcbbaf99650011af201ddf93b43d6c25e071b75dd31a164594d64953e55ed7e3a96b6e923c SHA512 209a06200311ef0c990e680d51f6cc55d8c8940b6a93a2c8f5a6b347aaec1a3f25b366e591c8297f561704d27cea69a6f161e10edc1fc072cc639127545a1665
 AUX qt-6.6.patch 360 BLAKE2B ec421a35872612a4a17789b5c428da5913b9bf00b4a0dbfe10fe6dad80efa9181a280ab6a5762ced3a3443f8745a44a30fa6b1e028e61d40eb090290af7e7332 SHA512 33037667a59042b843dff77b36ac704344c79b3de5272280d6dfa9766319b97669bf655c19b9424d4b99d1a6cfc1cdc40590f71097a3a6c6e75b4572f16958d3
 AUX unbundle-qwindowkit.patch 547 BLAKE2B 831bea9b28939627de9bc24759750c71e64e009c89ec10de554e4c73273615304650546d9614725e82b4fc7660fbdd3fd1c00240c913a87ffc187548b398d83d SHA512 807317f664b342645df0ecd2c3fb64c1ff62022bd8f42c4aba54108b86e5f147c668440d906eeb93f9a9b47102ed2797c40e407eeb482b118f0bae6f4c682fd6
-AUX unbundle-qwindowkit2.patch 619 BLAKE2B 566e22b6b294fbc5e615e1e4c6c4efd7b87a0f71a828e495ad3d1368676967ba8046a8ecb6cb6d9bce17e5937530daeb024b37caffd3e335e37269ec77791b82 SHA512 f098306b8337f2a74d03dfc224ef3007349462e287e31ee12d5264cb6e8f0d3356c848bba3704936e707e0573574b38144c3d1b55c65a31acc87474785f6d380
+AUX zxing-cpp-3.patch 853 BLAKE2B e7af374a7f79095b275d387ef9ea0bf4c09282706baf49cebcb564a965212ac420c6e148556e88cff676805f0c806e070bdb8602b87af6ea7f5d1f3dc70813a4 SHA512 1e2387fd056a13fdb8eb6f17a91d818f0334628dd0a6ae21f0c254aa465002646fd795f4dab7da771dd0c4057d4d38a42683e9a1e19e0afd056d5f703b97f3fe
 EBUILD jami-client-qt-20251003.0.ebuild 1764 BLAKE2B f74f46bf4c2a05b0c57fcda535df70a168bc6b1ebd31a157b76263bcf70054d5b95b1d90c4b51577a514c0593acc69eb681c353696ee673e8d8e89d768537378 SHA512 57600f1db9820d6f17957e3a0f714788df89ad19679b6d65bbaa58ed8152d47c04c1e10bfc3d19f3d275048e25eadc678331e7ccd87b0eb4bb91f3c7be49c2a9
-EBUILD jami-client-qt-9999.ebuild 1751 BLAKE2B 654f1ff2ce712733b2ceb7758e40bab948b673de12f8c4bf6329379aee456831cc1a6c789b8413d4456a486749704aafec6c3cce2a77b6f0fe0346b69927de5d SHA512 8acdee230b76065dcebbf4b7d6c3b043fbb33c9265ca91a45b56857278df766e351282d6e425f0168dc4a49a10640ce266a173076158b2d57883cb4ab43f094c
+EBUILD jami-client-qt-20260206.0.ebuild 1725 BLAKE2B 35687f9feea69913c9556c253f065bcf35786e5883950380f4b498b0c1922a034a11f72dc43468b5789c6d17a91888fca67294a56f250af6ffb2a2fc264ca84f SHA512 4f44c62487e281521634ca5283ced88b8f4ef9655811721db0a3e504bb346f979d221131d5e0a4b702414a9c8600dbd34bbfcb61e0ee330f0828c14d31bfc3e6
+EBUILD jami-client-qt-9999.ebuild 1736 BLAKE2B 096f760bfa6cb5714b43b204fdbaf94e018eb6530067dd19e145fa3f164d37616a0cb0eea2f0ed2c5cac7bd343a1786440837c327932aa5254887be7a300fb1c SHA512 da56f9ec648f2123032f1f87b48e96c9a5ba10d3ecc1964f542623eeff6cfa255a9a0c962748e7e7a680d3c4aeafd4a34a2fe134ff7df415b158cec36af0dfef
--- a/net-voip/jami-client-qt/files/unbundle-qwindowkit2.patch
+++ b/net-voip/jami-client-qt/files/unbundle-qwindowkit2.patch
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c046b597..89c64b95 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,14 +100,7 @@ if(NOT WIN32)
- endif()
-
- # qwindowkit (frameless window)
-add_fetch_content(
-  TARGET qwindowkit
-  URL https://github.com/stdware/qwindowkit.git
-  BRANCH 758b00cb6c2d924be3a1ea137ec366dc33a5132d
-  PATCHES ${QWINDOWKIT_PATCHES}
-  OPTIONS ${QWINDOWKIT_OPTIONS}
-)
-list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
-+find_package(QWindowKit)
- list(APPEND CLIENT_LIBS QWindowKit::Quick)
-
- # If ENABLE_CRASHREPORTS is enabled, we will use crashpad_cmake for now.
--- a/net-voip/jami-client-qt/files/zxing-cpp-3.patch
+++ b/net-voip/jami-client-qt/files/zxing-cpp-3.patch
@@ -0,0 +1,31 @@
+diff --git a/src/app/qrcodescannermodel.cpp b/src/app/qrcodescannermodel.cpp
+index cea49eab..aac3ea35 100644
+--- a/src/app/qrcodescannermodel.cpp
+++ b/src/app/qrcodescannermodel.cpp
+@@ -17,9 +17,8 @@
+ 
+ #include "qrcodescannermodel.h"
+ 
+-#include <Barcode.h>
+-#include <MultiFormatReader.h>
+-#include <ReadBarcode.h>
+#include <ZXing/Barcode.h>
+#include <ZXing/ReadBarcode.h>
+ 
+ #include <QDebug>
+ 
+diff --git a/src/app/utils.cpp b/src/app/utils.cpp
+index b02a21e5..c2ddb383 100644
+--- a/src/app/utils.cpp
+++ b/src/app/utils.cpp
+@@ -47,8 +47,8 @@
+ #include <windows.h>
+ #endif
+ 
+-#include <BitMatrix.h>
+-#include <MultiFormatWriter.h>
+#include <ZXing/BitMatrix.h>
+#include <ZXing/MultiFormatWriter.h>
+ 
+ // Removes the given argument from the command line arguments, and invokes the callback
+ // function with the removed argument if it was found.
--- a/net-voip/jami-client-qt/jami-client-qt-20260206.0.ebuild
+++ b/net-voip/jami-client-qt/jami-client-qt-20260206.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic git-r3
+
+DESCRIPTION="Jami clent QT"
+HOMEPAGE="https://git.jami.net/savoirfairelinux/jami-client-qt"
+
+if [[ "${PV}" == 9999* ]]; then
+	EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
+	KEYWORDS=""
+else
+	EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
+	KEYWORDS=""
+	EGIT_COMMIT="stable/${PV}"
+fi
+
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="doc"
+
+DEPEND="
+	net-voip/jami-daemon
+	net-libs/libnma
+	x11-libs/libnotify
+	media-gfx/qrencode
+	dev-libs/libayatana-appindicator
+	dev-qt/qtbase
+	dev-qt/qtdeclarative
+	dev-qt/qtgraphicaleffects
+	dev-qt/qtmultimedia[qml(+)]
+	dev-qt/qtnetworkauth
+	dev-qt/qtsvg
+	dev-qt/qttools
+	dev-qt/qtwebengine[qml(+)]
+	dev-qt/qt5compat
+	dev-qt/qtpositioning
+	dev-qt/qtwebsockets[qml(+)]
+	dev-qt/qwindowkit
+	media-libs/zxing-cpp
+	media-libs/zint
+	app-text/htmltidy
+	app-text/hunspell
+"
+
+BDEPEND="doc? ( app-text/doxygen )"
+
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/drop-qt-version-check.patch
+	eapply "${FILESDIR}"/qt-6.6.patch
+	eapply "${FILESDIR}"/fix-link.patch
+	eapply "${FILESDIR}"/missing-cmake-include.patch
+	eapply "${FILESDIR}"/unbundle-qwindowkit.patch
+	if has_version ">=media-libs/zxing-cpp-3.0.2"; then
+		eapply "${FILESDIR}"/zxing-cpp-3.patch
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -I/usr/include/jami
+	append-ldflags -ljami
+
+	local mycmakeargs=(
+    	-DCMAKE_BUILD_TYPE=None
+    	-DENABLE_LIBWRAP=ON
+    	-DJAMICORE_AS_SUBDIR=OFF
+    	-DWITH_DAEMON_SUBMODULE=OFF
+    	-DCMAKE_POLICY_VERSION_MINIMUM=3.5
+    	-Wno-dev
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+}
--- a/net-voip/jami-client-qt/jami-client-qt-9999.ebuild
+++ b/net-voip/jami-client-qt/jami-client-qt-9999.ebuild
@@ -3,18 +3,18 @@

 EAPI=8

-inherit cmake flag-o-matic
+inherit cmake flag-o-matic git-r3

 DESCRIPTION="Jami clent QT"
 HOMEPAGE="https://git.jami.net/savoirfairelinux/jami-client-qt"

 if [[ "${PV}" == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/savoirfairelinux/${PN}"
-	EGIT_COMMIT="2e71d00c0500ffe2241e9171f7423a52a0efa96e"
+	EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
+	KEYWORDS=""
 else
-	SRC_URI="https://github.com/savoirfairelinux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
 	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT="stable/${PV}"
 fi

 LICENSE="GPL-3"
@@ -59,6 +59,9 @@ src_prepare() {
 	eapply "${FILESDIR}"/fix-link.patch
 	eapply "${FILESDIR}"/missing-cmake-include.patch
 	eapply "${FILESDIR}"/unbundle-qwindowkit.patch
+	if has_version ">=media-libs/zxing-cpp-3.0.2"; then
+		eapply "${FILESDIR}"/zxing-cpp-3.patch
+	fi
 	cmake_src_prepare
 }

@@ -67,8 +70,6 @@ src_configure() {
 	append-ldflags -ljami

 	local mycmakeargs=(
-    	#-DCMAKE_INSTALL_PREFIX=/usr
-		#-DLIBJAMI_INCLUDE_DIR=/usr/lib64
    	-DCMAKE_BUILD_TYPE=None
    	-DENABLE_LIBWRAP=ON
    	-DJAMICORE_AS_SUBDIR=OFF
--- a/net-voip/jami-daemon/Manifest
+++ b/net-voip/jami-daemon/Manifest
@@ -1,6 +1,8 @@
 AUX cmake.patch 572 BLAKE2B 7b35c9a654bdbcacb7c8742d6a82601ce5807c7efa08f9b05c81d5af6a439f4e7acb3bc2154dcb824701bd36cb52769001788646eeb7d0e38aa613057d95fdb0 SHA512 2092cd36a856bdb4a7a1645c637de371fe6a366cb40c2de255fbdb9388e52950400ad47bd6b6b7fa7282316561b04530883c26d99221d80b1597db6e4d39e536
+AUX ffmpeg-7-20260206.patch 3738 BLAKE2B 30087efee4481041df25d666753bd174ac5d86f07137b783ec92c582106d1251f51a3f8aa44a8f95d987e8f1a255ac571164652606b14214033f0b899fd1faa1 SHA512 f4c9bd89aaa67896ab3b6c9a0a965c6aec5b53144e74b157ed5c7ce5cc109008be44a06be4b14daf8d3acca56c3ae9464ddb8355edc536d059c7e7e22162d440
 AUX ffmpeg-7.patch 2958 BLAKE2B 1eb36112b4611b606f0e6d7d5bb17920c4bfa064aed6720baebf77696675eb768e5b2e67650ab8adceaa53e89439009949920140915a85ead78c631d3161a3e6 SHA512 ddfc55f32664c505a3816c152a2de124000b34e9b7da650ee82fbdaab179976fe28a17a2add30c493494a4f7da384a456fc8a5541bdbfb41c7d590ca5190ceb8
+AUX ffmpeg-8-20260206.patch 4566 BLAKE2B 1f4b13588709d69e70b227f8abd25d3e32e615cee7f3bbcd2604d2c02e0a67aef9df08be9c6ce31da64128d8487b9e8ae83e87ca76bf6eb10434bd7e2a7c488f SHA512 50feb8097cc91f7ee52d12e760324fbd47c95b4191d04f80ecdbdc88b39e7d578f448c747be22b6095ca884aed0c418bd9690ed8c986a39c913d5d923c59cc37
 AUX ffmpeg-8.patch 4547 BLAKE2B edc96dc3b3837168bc6e56d8978d70ed5a3cc3a0de8fbfb42dc15d46d6056be6d586b67a123486a2dfc18154adade39f85c65637dc10ca2c9145b3768fc96d9f SHA512 6c87677936a5dcc6134ebd8a60a542b90573bddb5896731cde4f681cf06bff2fdcbc779b4f691a90a55d528c28621328862664a62a693e02805a6f0a3141c084
-AUX fmt-12.patch 1811 BLAKE2B 8654397ac8d140ec339df9029ae5e610a6061dda0944d3cd3890cc7ad9d47d65a6ae9d6744bf07f9b7ad223241fe58d372ecd24b6f5f2fd866689673467eaf81 SHA512 b645545120608e70f70ee664d43de03fa07ebc5b2af9a6515a40220aabfe057d4f69034b15781a21c5e8ff6f2fbb353b7dea69d840cb299f9dbf58eeaf082a40
-EBUILD jami-daemon-20250929.ebuild 2620 BLAKE2B 9c942fd3d02bf302f7dd090d70b0b5ce3dfd3b87dffc95a21993ba5f54f8098b6b123d5e54c954bf3494809a9f406d440041a5abdc016e1b9c1d47b9f4c9af02 SHA512 a18794e2c603b54495d8164206c709beccd01fb95ab15efe2d29b4a36f45d47d0eae50234a6e0a3b6c0993bab99bef101fe1877570894c26ff931e98e992722f
+EBUILD jami-daemon-20250929.ebuild 2290 BLAKE2B 4e4963f7b9984eab9656502b92f42e194fe3c92456c6c24906098e1280d47dec91008c0ea28ab528564cd0a7d0228a63f69183b472f6f7241ab9cfc9f04b3695 SHA512 535bccaf5a4de6ac4bc904040396ff5453643a4360c89afc1c57b7feaceeaea16162cf53111a54c39baee7b1e163dbaa69881cabbf7fb824a84ff689936f13c6
+EBUILD jami-daemon-20260206.ebuild 2284 BLAKE2B 0a0c77dc624bbb2d20f5356284f348949a6be56fe83eefdc1e0714725f54ee2d52ff878d81b2a10ab5a5dec18e15e3d54859ca091a14ad1f62b83110461f039b SHA512 82e67863419fb029905d1a714b3bcb7e9aa829f8a4f585dee901d7013c42ef7798f5f5ec9c17a7b1cec94a4528d646b63c221ef19774d9591a25236409e1e71a
 EBUILD jami-daemon-9999.ebuild 2608 BLAKE2B eee77be68b41ba2b6341df6ca2887812d6129f7ff8d4ac9cf7f2000f80e95dd8f8e59822154a5290506c96a433afb2cdb00ef36f9a9e1e4df16302c515c73765 SHA512 cd5d0f9bae1d02d0afffdfb94fa83902507eeffb29c94f0459a32df808cf49ff95802a722ef86e81a2fcea440c608af9ae2ee0c6aced13fab2f301135de81a6c
--- a/net-voip/jami-daemon/files/ffmpeg-7-20260206.patch
+++ b/net-voip/jami-daemon/files/ffmpeg-7-20260206.patch
@@ -0,0 +1,74 @@
+diff --git a/src/media/audio/resampler.cpp b/src/media/audio/resampler.cpp
+index fe0c80a2c..8eebe42d0 100644
+--- a/src/media/audio/resampler.cpp
+++ b/src/media/audio/resampler.cpp
+@@ -225,7 +225,7 @@ Resampler::resample(const AVFrame* input, AVFrame* output)
+             newOutput->format = output->format;
+             newOutput->nb_samples = static_cast<int>(targetOutputLength);
+             newOutput->ch_layout = output->ch_layout;
+-            newOutput->channel_layout = output->channel_layout;
+            newOutput->ch_layout.u.mask = output->ch_layout.u.mask;
+             newOutput->sample_rate = output->sample_rate;
+             int bufferRet = av_frame_get_buffer(newOutput, 0);
+             if (bufferRet < 0) {
+diff --git a/src/media/audio/sound/dtmfgenerator.cpp b/src/media/audio/sound/dtmfgenerator.cpp
+index c05435f66..5b9eca18a 100644
+--- a/src/media/audio/sound/dtmfgenerator.cpp
+++ b/src/media/audio/sound/dtmfgenerator.cpp
+@@ -115,7 +115,7 @@ DTMFGenerator::fillToneBuffer(int index)
+     ptr->nb_samples = sampleRate_;
+     ptr->format = tone_.getFormat().sampleFormat;
+     ptr->sample_rate = sampleRate_;
+-    ptr->channel_layout = AV_CH_LAYOUT_MONO;
+    ptr->ch_layout.u.mask = AV_CH_LAYOUT_MONO;
+     av_channel_layout_from_mask(&ptr->ch_layout, AV_CH_LAYOUT_MONO);
+     av_frame_get_buffer(ptr.get(), 0);
+     tone_.genSin(ptr.get(), 0, ptr->nb_samples, tones_[index].higher, tones_[index].lower);
+diff --git a/src/media/media_decoder.cpp b/src/media/media_decoder.cpp
+index ceaa036c6..0cbeae5be 100644
+--- a/src/media/media_decoder.cpp
+++ b/src/media/media_decoder.cpp
+@@ -375,11 +375,11 @@ MediaDemuxer::Status
+ MediaDemuxer::decode()
+ {
+     if (inputParams_.format == "x11grab" || inputParams_.format == "dxgigrab") {
+-        auto ret = inputCtx_->iformat->read_header(inputCtx_);
+-        if (ret == AVERROR_EXTERNAL) {
+-            JAMI_ERR("Unable to read frame: %s\n", libav_utils::getError(ret).c_str());
+-            return Status::ReadError;
+-        }
+        // auto ret = inputCtx_->iformat->read_header(inputCtx_);
+        // if (ret == AVERROR_EXTERNAL) {
+        //     JAMI_ERR("Unable to read frame: %s\n", libav_utils::getError(ret).c_str());
+        //     return Status::ReadError;
+        // }
+         auto codecpar = inputCtx_->streams[0]->codecpar;
+         if (baseHeight_ != codecpar->height || baseWidth_ != codecpar->width) {
+             baseHeight_ = codecpar->height;
+diff --git a/src/media/media_io_handle.h b/src/media/media_io_handle.h
+index 7a64b85a7..a668e73c0 100644
+--- a/src/media/media_io_handle.h
+++ b/src/media/media_io_handle.h
+@@ -32,7 +32,7 @@ struct AVIOContext;
+ #endif
+ 
+ typedef int (*io_readcallback)(void* opaque, uint8_t* buf, int buf_size);
+-typedef int (*io_writecallback)(void* opaque, uint8_t* buf, int buf_size);
+typedef int (*io_writecallback)(void* opaque, const uint8_t* buf, int buf_size);
+ typedef int64_t (*io_seekcallback)(void* opaque, int64_t offset, int whence);
+ 
+ namespace jami {
+diff --git a/src/media/socket_pair.cpp b/src/media/socket_pair.cpp
+index 0589affd5..f0005f6b0 100644
+--- a/src/media/socket_pair.cpp
+++ b/src/media/socket_pair.cpp
+@@ -382,8 +382,8 @@ SocketPair::createIOContext(const uint16_t mtu)
+         mtu - (srtpContext_ ? SRTP_OVERHEAD : 0) - UDP_HEADER_SIZE - ip_header_size,
+         true,
+         [](void* sp, uint8_t* buf, int len) { return static_cast<SocketPair*>(sp)->readCallback(buf, len); },
+-        [](void* sp, uint8_t* buf, int len) { return static_cast<SocketPair*>(sp)->writeCallback(buf, len); },
+        [](void* sp, const uint8_t* buf, int len) { return static_cast<SocketPair*>(sp)->writeCallback((uint8_t*)buf, len); },
+         0,
+         reinterpret_cast<void*>(this));
+ }
+
--- a/net-voip/jami-daemon/files/ffmpeg-8-20260206.patch
+++ b/net-voip/jami-daemon/files/ffmpeg-8-20260206.patch
@@ -0,0 +1,110 @@
+diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
+index f999ffe42..eae622d48 100644
+--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
+@@ -72,11 +72,7 @@ MediaEncoder::~MediaEncoder()
+         }
+         for (auto encoderCtx : encoders_) {
+             if (encoderCtx) {
+-#ifndef _MSC_VER
+                 avcodec_free_context(&encoderCtx);
+-#else
+-                avcodec_close(encoderCtx);
+-#endif
+             }
+         }
+         avformat_free_context(outputCtx_);
+@@ -354,7 +350,7 @@ MediaEncoder::initStream(const SystemCodecInfo& systemCodecInfo, AVBufferRef* fr
+         if (scaledFrameBufferSize_ < 0)
+             throw MediaEncoderException(
+                 ("Unable to compute buffer size: " + libav_utils::getError(scaledFrameBufferSize_)).c_str());
+-        else if (scaledFrameBufferSize_ <= AV_INPUT_BUFFER_MIN_SIZE)
+        else if (scaledFrameBufferSize_ <= 16384)
+             throw MediaEncoderException("buffer too small");
+ 
+         scaledFrameBuffer_.resize(scaledFrameBufferSize_);
+@@ -448,10 +444,10 @@ MediaEncoder::encode(const std::shared_ptr<VideoFrame>& input,
+ 
+     if (is_keyframe) {
+         avframe->pict_type = AV_PICTURE_TYPE_I;
+-        avframe->key_frame = 1;
+        avframe->flags |= AV_FRAME_FLAG_KEY;
+     } else {
+         avframe->pict_type = AV_PICTURE_TYPE_NONE;
+-        avframe->key_frame = 0;
+        avframe->flags &= ~AV_FRAME_FLAG_KEY;
+     }
+ 
+     return encode(avframe, currentStreamIdx_);
+@@ -690,7 +686,7 @@ MediaEncoder::extractProfileLevelID(const std::string& parameters, AVCodecContex
+     // From RFC3984:
+     // If no profile-level-id is present, the Baseline Profile without
+     // additional constraints at Level 1 MUST be implied.
+-    ctx->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE;
+    ctx->profile = AV_PROFILE_H264_CONSTRAINED_BASELINE;
+     ctx->level = 0x0d;
+     // ctx->level = 0x0d; // => 13 aka 1.3
+     if (parameters.empty())
+@@ -716,17 +712,17 @@ MediaEncoder::extractProfileLevelID(const std::string& parameters, AVCodecContex
+     const unsigned char profile_iop = ((result >> 8) & 0xff); // xx80xx -> 80
+     ctx->level = result & 0xff;                               // xxxx0d -> 0d
+     switch (profile_idc) {
+-    case FF_PROFILE_H264_BASELINE:
+    case AV_PROFILE_H264_BASELINE:
+         // check constraint_set_1_flag
+         if ((profile_iop & 0x40) >> 6)
+-            ctx->profile |= FF_PROFILE_H264_CONSTRAINED;
+            ctx->profile |= AV_PROFILE_H264_CONSTRAINED;
+         break;
+-    case FF_PROFILE_H264_HIGH_10:
+-    case FF_PROFILE_H264_HIGH_422:
+-    case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
+    case AV_PROFILE_H264_HIGH_10:
+    case AV_PROFILE_H264_HIGH_422:
+    case AV_PROFILE_H264_HIGH_444_PREDICTIVE:
+         // check constraint_set_3_flag
+         if ((profile_iop & 0x10) >> 4)
+-            ctx->profile |= FF_PROFILE_H264_INTRA;
+            ctx->profile |= AV_PROFILE_H264_INTRA;
+         break;
+     }
+     JAMI_DBG("Using profile %s (%x) and level %d",
+@@ -837,7 +833,7 @@ MediaEncoder::initCodec(AVMediaType mediaType, AVCodecID avcodecId, uint64_t br)
+         encoderCtx->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER;
+         initH264(encoderCtx, br);
+     } else if (avcodecId == AV_CODEC_ID_HEVC) {
+-        encoderCtx->profile = FF_PROFILE_HEVC_MAIN;
+        encoderCtx->profile = AV_PROFILE_HEVC_MAIN;
+         forcePresetX2645(encoderCtx);
+         initH265(encoderCtx, br);
+         av_opt_set_int(encoderCtx, "b_ref_mode", 0, AV_OPT_SEARCH_CHILDREN);
+@@ -1108,7 +1104,6 @@ MediaEncoder::stopEncoder()
+         }
+     }
+     AVCodecContext* encoderCtx = getCurrentVideoAVCtx();
+-    avcodec_close(encoderCtx);
+     avcodec_free_context(&encoderCtx);
+     av_free(encoderCtx);
+ }
+@@ -1212,7 +1207,7 @@ MediaEncoder::testH265Accel()
+             framerate.den = 1;
+             encoderCtx->time_base = av_inv_q(framerate);
+             encoderCtx->pix_fmt = accel->getFormat();
+-            encoderCtx->profile = FF_PROFILE_HEVC_MAIN;
+            encoderCtx->profile = AV_PROFILE_HEVC_MAIN;
+             encoderCtx->opaque = accel.get();
+ 
+             auto br = SystemCodecInfo::DEFAULT_VIDEO_BITRATE;
+@@ -1349,11 +1344,7 @@ MediaEncoder::resetStreams(int width, int height)
+         if (outputCtx_) {
+             for (auto encoderCtx : encoders_) {
+                 if (encoderCtx) {
+-#ifndef _MSC_VER
+                     avcodec_free_context(&encoderCtx);
+-#else
+-                    avcodec_close(encoderCtx);
+-#endif
+                 }
+             }
+             encoders_.clear();
+
--- a/net-voip/jami-daemon/files/fmt-12.patch
+++ b/net-voip/jami-daemon/files/fmt-12.patch
@@ -1,32 +0,0 @@
-diff -ru dhtnet.orig/src/upnp/upnp_context.cpp dhtnet/src/upnp/upnp_context.cpp
--- dhtnet.orig/src/upnp/upnp_context.cpp	2025-10-04 15:51:40.889482196 +0200
-+++ dhtnet/src/upnp/upnp_context.cpp	2025-10-04 16:09:31.538008243 +0200
-@@ -734,9 +734,12 @@
-     }
-     if (toRenewLaterCount > 0) {
-         nextRenewalTime += MAPPING_RENEWAL_THROTTLING_DELAY;
-        if (logger_) logger_->debug("{} mapping(s) didn't need to be renewed (next renewal scheduled for {:%Y-%m-%d %H:%M:%S})",
-+        if (logger_) {
-+            std::time_t t = sys_clock::to_time_t(nextRenewalTime);
-+            logger_->debug("{} mapping(s) didn't need to be renewed (next renewal scheduled for {:%Y-%m-%d %H:%M:%S})",
-                                     toRenewLaterCount,
-                                    fmt::localtime(sys_clock::to_time_t(nextRenewalTime)));
-+                                    *std::localtime(&t));
-+        }
-         mappingRenewalTimer_.expires_at(nextRenewalTime);
-         mappingRenewalTimer_.async_wait([this](asio::error_code const& ec) {
-             if (ec != asio::error::operation_aborted)
-@@ -783,8 +786,11 @@
-     if (nextRenewalTime == mappingRenewalTimer_.expiry())
-         return;
- 
-    if (logger_) logger_->debug("Scheduling next port mapping renewal for {:%Y-%m-%d %H:%M:%S}",
-                                 fmt::localtime(sys_clock::to_time_t(nextRenewalTime)));
-+    if (logger_) {
-+        std::time_t t = sys_clock::to_time_t(nextRenewalTime);
-+        logger_->debug("Scheduling next port mapping renewal for {:%Y-%m-%d %H:%M:%S}",
-+                                *std::localtime(&t));
-+    }
-     mappingRenewalTimer_.expires_at(nextRenewalTime);
-     mappingRenewalTimer_.async_wait([this](asio::error_code const& ec) {
-         if (ec != asio::error::operation_aborted)
--- a/net-voip/jami-daemon/jami-daemon-20250929.ebuild
+++ b/net-voip/jami-daemon/jami-daemon-20250929.ebuild
@@ -80,26 +80,9 @@ src_prepare() {
 	eapply "${FILESDIR}"/cmake.patch
 	eapply "${FILESDIR}"/ffmpeg-7.patch
 	eapply "${FILESDIR}"/ffmpeg-8.patch
-	#cmake_src_prepare
-	#eautoreconf
 }

-#src_configure() {
-#	mkdir build
-#	cd build
-#	cmake .. -DBUILD_CONTRIB=OFF -DJAMI_DBUS=ON
-#}
-
 src_configure() {
-	#local mycmakeargs=(
-	#	-DJAMI_DBUS=ON
-	#	-DBUILD_CONTRIB=OFF
-	#	-DJAMI_VIDEO=ON
-	#	-DENABLE_COVERAGE=OFF
-	#	-DBUILD_TESTING=OFF
-	#	-DBUILD_EXTRA_TOOLS=ON
-	#)
-	#cmake_src_configure
 	local emesonargs=(
 		-Dinterfaces=library,dbus
 		-Dopensl=disabled
@@ -109,6 +92,5 @@ src_configure() {
 }

 src_install() {
-	#cmake_src_install
 	meson_src_install
 }
--- a/net-voip/jami-daemon/jami-daemon-20260206.ebuild
+++ b/net-voip/jami-daemon/jami-daemon-20260206.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson git-r3
+
+if [[ ${PV} == *9999* ]]; then
+
+	EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-daemon"
+	SRC_URI=""
+
+	IUSE="+alsa +dbus doc graph +gsm +hwaccel ipv6 jack -libav +libilbc +nat-pmp +opus pipewire portaudio pulseaudio +sdes +speex +speexdsp +upnp +vaapi vdpau +video +vpx +x264"
+	KEYWORDS=""
+
+else
+
+	EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-daemon"
+	SRC_URI=""
+	EGIT_COMMIT="55dd53736b9e6cd7204cc17e01d10d8a9276618f"
+
+	IUSE="+alsa +dbus doc graph +gsm +hwaccel ipv6 jack -libav +libilbc +nat-pmp +opus pipewire portaudio pulseaudio +sdes +speex +speexdsp +upnp +vaapi vdpau +video +vpx +x264"
+	KEYWORDS=""
+
+fi
+
+DESCRIPTION="Jami (formerly Ring) daemon"
+HOMEPAGE="https://jami.net/"
+
+LICENSE="GPL-3"
+
+SLOT="0"
+
+RDEPEND="
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.61.0
+	>=dev-libs/crypto++-5.6.5
+	>=dev-libs/jsoncpp-1.7.2
+	>=media-video/ffmpeg-3.4[gsm?,libilbc?,opus?,speex?,v4l,vaapi?,vdpau?,vpx?,x264?,zlib]
+	libilbc? ( media-libs/libilbc )
+	speex? ( >=media-libs/speex-1.2.0 )
+	speexdsp? ( >=media-libs/speexdsp-1.2_rc3 )
+	>=net-libs/gnutls-3.4.14
+	>=net-libs/opendht-1.10.1
+	>=sys-libs/zlib-1.2.8
+	media-libs/libva
+	dev-libs/libsecp256k1
+	net-libs/restinio
+	net-libs/dhtnet
+	net-libs/http-parser
+	dev-libs/libgit2
+	dev-cpp/sdbus-c++[tools(+)]
+	<=media-libs/webrtc-audio-processing-1.0.0
+	dev-libs/msgpack
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	portaudio? ( >=media-libs/portaudio-19_pre20140130 )
+	pulseaudio? ( media-libs/libpulse )
+	dbus? ( dev-libs/dbus-c++ )
+	sdes? ( >=dev-libs/libpcre-8.40 )
+	video? ( virtual/libudev )
+	nat-pmp? ( net-libs/libnatpmp )
+	pipewire? ( media-video/pipewire )
+"
+
+DEPEND="${RDEPEND}
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)"
+
+REQUIRED_USE="dbus? ( sdes )
+	graph? ( doc )
+	hwaccel? ( video )
+	vaapi? ( hwaccel )
+	?? ( dbus )"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/cmake.patch
+	eapply "${FILESDIR}"/ffmpeg-7.patch
+	eapply "${FILESDIR}"/ffmpeg-8.patch
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dinterfaces=library,dbus
+		-Dopensl=disabled
+		-Dportaudio=disabled
+    )
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+}