ace/ace-overlay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add jami

Browse Source
This commit is contained in:
ace
2025-12-08 00:42:50 +03:00
parent 7aaf6cb565
commit 3a29f1e8a7
43 changed files with 13471 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net-voip/jami-daemon/Manifest Normal file
View File

@@ -0,0 +1,7 @@
AUX cmake.patch 572 BLAKE2B 7b35c9a654bdbcacb7c8742d6a82601ce5807c7efa08f9b05c81d5af6a439f4e7acb3bc2154dcb824701bd36cb52769001788646eeb7d0e38aa613057d95fdb0 SHA512 2092cd36a856bdb4a7a1645c637de371fe6a366cb40c2de255fbdb9388e52950400ad47bd6b6b7fa7282316561b04530883c26d99221d80b1597db6e4d39e536
AUX ffmpeg-7.patch 2958 BLAKE2B 1eb36112b4611b606f0e6d7d5bb17920c4bfa064aed6720baebf77696675eb768e5b2e67650ab8adceaa53e89439009949920140915a85ead78c631d3161a3e6 SHA512 ddfc55f32664c505a3816c152a2de124000b34e9b7da650ee82fbdaab179976fe28a17a2add30c493494a4f7da384a456fc8a5541bdbfb41c7d590ca5190ceb8
AUX ffmpeg-8.patch 4547 BLAKE2B edc96dc3b3837168bc6e56d8978d70ed5a3cc3a0de8fbfb42dc15d46d6056be6d586b67a123486a2dfc18154adade39f85c65637dc10ca2c9145b3768fc96d9f SHA512 6c87677936a5dcc6134ebd8a60a542b90573bddb5896731cde4f681cf06bff2fdcbc779b4f691a90a55d528c28621328862664a62a693e02805a6f0a3141c084
AUX fmt-12.patch 1811 BLAKE2B 8654397ac8d140ec339df9029ae5e610a6061dda0944d3cd3890cc7ad9d47d65a6ae9d6744bf07f9b7ad223241fe58d372ecd24b6f5f2fd866689673467eaf81 SHA512 b645545120608e70f70ee664d43de03fa07ebc5b2af9a6515a40220aabfe057d4f69034b15781a21c5e8ff6f2fbb353b7dea69d840cb299f9dbf58eeaf082a40
DIST jami-daemon 40700 BLAKE2B 7da599023a4639ade1808aaf525fc25cc7fdd74a3d9661b679fef4ef30c251b63d53bfed2d59d675e5f803471b68a41182122e29d5487f421f5f9109c1cd7a40 SHA512 690f8bf980899039aa89777673cc879fb4998acf063f8a6db4d62a7a3813ed693c2fe1f36171f27df2358701ffa0396e57a936cf0f305ddc99e2339dfbca37ac
EBUILD jami-daemon-20250929.ebuild 2608 BLAKE2B eee77be68b41ba2b6341df6ca2887812d6129f7ff8d4ac9cf7f2000f80e95dd8f8e59822154a5290506c96a433afb2cdb00ef36f9a9e1e4df16302c515c73765 SHA512 cd5d0f9bae1d02d0afffdfb94fa83902507eeffb29c94f0459a32df808cf49ff95802a722ef86e81a2fcea440c608af9ae2ee0c6aced13fab2f301135de81a6c
EBUILD jami-daemon-9999.ebuild 2608 BLAKE2B eee77be68b41ba2b6341df6ca2887812d6129f7ff8d4ac9cf7f2000f80e95dd8f8e59822154a5290506c96a433afb2cdb00ef36f9a9e1e4df16302c515c73765 SHA512 cd5d0f9bae1d02d0afffdfb94fa83902507eeffb29c94f0459a32df808cf49ff95802a722ef86e81a2fcea440c608af9ae2ee0c6aced13fab2f301135de81a6c

15
net-voip/jami-daemon/files/cmake.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4c01b3ab..c0b0a7973 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -849,7 +849,9 @@ else()
${DBUS_FILES}
${DBUS_ADAPTOR_FILES}
)
- target_link_libraries(jamid ${PROJECT_NAME} PkgConfig::DBusCpp)
+ find_package(OpenSSL REQUIRED)
+ find_package(ZLIB REQUIRED)
+ target_link_libraries(jamid ${PROJECT_NAME} PkgConfig::DBusCpp OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
install (TARGETS jamid DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
endif()

63
net-voip/jami-daemon/files/ffmpeg-7.patch Normal file
View File

@@ -0,0 +1,63 @@
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)
[](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));

110
net-voip/jami-daemon/files/ffmpeg-8.patch Normal file
View File

@@ -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
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();

32
net-voip/jami-daemon/files/fmt-12.patch Normal file
View File

@@ -0,0 +1,32 @@
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)

111
net-voip/jami-daemon/jami-daemon-20250929.ebuild Normal file
View File

@@ -0,0 +1,111 @@
# Copyright 2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson
if [[ ${PV} == *9999* ]]; then
inherit git-r3
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
SRC_URI="https://git.jami.net/savoirfairelinux/jami-daemon"
EGIT_COMMIT="afe2446133eb3c9279e42b0d1dcfdd9a3c76a35f"
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="~amd64"
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
#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
-Dportaudio=disabled
)
meson_src_configure
}
src_install() {
#cmake_src_install
meson_src_install
}

111
net-voip/jami-daemon/jami-daemon-9999.ebuild Normal file
View File

@@ -0,0 +1,111 @@
# Copyright 2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson
if [[ ${PV} == *9999* ]]; then
inherit git-r3
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
SRC_URI="https://git.jami.net/savoirfairelinux/jami-daemon"
EGIT_COMMIT="afe2446133eb3c9279e42b0d1dcfdd9a3c76a35f"
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="~amd64"
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
#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
-Dportaudio=disabled
)
meson_src_configure
}
src_install() {
#cmake_src_install
meson_src_install
}