mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
net/liblinphone: Update version 5.2.94=>5.4.4
Changelog: https://gitlab.linphone.org/BC/public/liblinphone/-/tags/5.4.4 Sponsored by: Cybermancer Infosec
This commit is contained in:
parent
43a9d3225a
commit
84e2af53f3
13 changed files with 163 additions and 196 deletions
|
@ -1,6 +1,5 @@
|
||||||
PORTNAME= liblinphone
|
PORTNAME= liblinphone
|
||||||
DISTVERSION= 5.2.94
|
DISTVERSION= 5.4.4
|
||||||
PORTREVISION= 2
|
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
|
|
||||||
MAINTAINER= bofh@FreeBSD.org
|
MAINTAINER= bofh@FreeBSD.org
|
||||||
|
@ -10,38 +9,47 @@ WWW= https://www.linphone.org/technical-corner/liblinphone.html
|
||||||
LICENSE= GPLv3
|
LICENSE= GPLv3
|
||||||
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
|
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
|
||||||
|
|
||||||
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystache>=0:textproc/py-pystache@${PY_FLAVOR} \
|
BUILD_DEPENDS= ${LOCALBASE}/lib/libbcmatroska2.a:multimedia/bcmatroska2 \
|
||||||
|
${LOCALBASE}/lib/libbctoolbox.a:net/bctoolbox \
|
||||||
|
${LOCALBASE}/lib/libbcunit.a:devel/bcunit \
|
||||||
|
${LOCALBASE}/lib/libbelcard.a:deskutils/belcard \
|
||||||
|
${LOCALBASE}/lib/libbelle-sip.a:net/belle-sip \
|
||||||
|
${LOCALBASE}/lib/libbelr.a:textproc/belr \
|
||||||
|
${LOCALBASE}/lib/libbzrtp.a:security/bzrtp \
|
||||||
|
${LOCALBASE}/lib/liblime.a:security/lime \
|
||||||
|
${LOCALBASE}/lib/libmediastreamer2.a:net/mediastreamer \
|
||||||
|
${LOCALBASE}/lib/libortp.a:net/ortp \
|
||||||
|
${PYTHON_PKGNAMEPREFIX}pystache>=0:textproc/py-pystache@${PY_FLAVOR} \
|
||||||
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
|
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
|
||||||
doxygen:devel/doxygen \
|
doxygen:devel/doxygen \
|
||||||
|
v4l_compat>=1.0.20120501:multimedia/v4l_compat \
|
||||||
xsd>0:devel/xsd
|
xsd>0:devel/xsd
|
||||||
LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \
|
LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp \
|
||||||
libbelcard.so:deskutils/belcard \
|
|
||||||
libbellesip.so:net/belle-sip \
|
|
||||||
libbelr.so:textproc/belr \
|
|
||||||
libbzrtp.so:security/bzrtp \
|
|
||||||
libjsoncpp.so:devel/jsoncpp \
|
|
||||||
liblime.so:security/lime \
|
|
||||||
libmediastreamer.so:net/mediastreamer \
|
|
||||||
libortp.so:net/ortp \
|
|
||||||
libsoci_core.so:databases/soci \
|
libsoci_core.so:databases/soci \
|
||||||
libxerces-c.so:textproc/xerces-c3
|
libxerces-c.so:textproc/xerces-c3
|
||||||
|
|
||||||
USES= cmake compiler:c++17-lang gnome iconv pkgconfig python:build sqlite
|
USES= cmake compiler:c++17-lang gnome iconv pkgconfig python:build \
|
||||||
|
sqlite xorg
|
||||||
USE_GITLAB= yes
|
USE_GITLAB= yes
|
||||||
GL_SITE= https://gitlab.linphone.org/BC
|
GL_SITE= https://gitlab.linphone.org/BC
|
||||||
GL_ACCOUNT= public
|
GL_ACCOUNT= public
|
||||||
USE_GNOME= libxml2
|
USE_GNOME= libxml2
|
||||||
USE_LDCONFIG= yes
|
USE_LDCONFIG= yes
|
||||||
|
USE_XORG= xfixes
|
||||||
|
|
||||||
CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \
|
CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \
|
||||||
-DCMAKE_SKIP_INSTALL_RPATH=ON \
|
-DCMAKE_SKIP_INSTALL_RPATH=ON \
|
||||||
|
-DENABLE_DAEMON=NO \
|
||||||
-DENABLE_FLEXIAPI=NO \
|
-DENABLE_FLEXIAPI=NO \
|
||||||
-DENABLE_NLS=NO \
|
-DENABLE_NLS=NO \
|
||||||
-DENABLE_QRCODE=NO \
|
-DENABLE_QRCODE=NO \
|
||||||
-DENABLE_STATIC=NO \
|
-DENABLE_STATIC=NO \
|
||||||
-DENABLE_STRICT=NO \
|
-DENABLE_STRICT=NO \
|
||||||
|
-DENABLE_TOOLS=NO \
|
||||||
-DENABLE_UNIT_TESTS=NO
|
-DENABLE_UNIT_TESTS=NO
|
||||||
|
|
||||||
|
LDFLAGS+= -lpthread
|
||||||
|
|
||||||
OPTIONS_DEFINE= LDAP VIDEO
|
OPTIONS_DEFINE= LDAP VIDEO
|
||||||
OPTIONS_DEFAULT= LDAP VIDEO
|
OPTIONS_DEFAULT= LDAP VIDEO
|
||||||
OPTIONS_SUB= yes
|
OPTIONS_SUB= yes
|
||||||
|
@ -52,9 +60,7 @@ LDAP_CMAKE_BOOL= ENABLE_LDAP
|
||||||
VIDEO_CMAKE_BOOL= ENABLE_VIDEO
|
VIDEO_CMAKE_BOOL= ENABLE_VIDEO
|
||||||
|
|
||||||
post-patch:
|
post-patch:
|
||||||
.for h in xml conference-info conference-info-linphone-extension
|
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt
|
||||||
@${REINPLACE_CMD} '/^#error/d' ${WRKSRC}/src/xml/${h}.h
|
|
||||||
.endfor
|
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
${RM} -r ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}
|
${RM} -r ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
TIMESTAMP = 1690570546
|
TIMESTAMP = 1743028704
|
||||||
SHA256 (liblinphone-5.2.94.tar.bz2) = 16ce8966a0dda7eb67a3e1ee027beff9e1c24fd459acd703e311e93791cd9526
|
SHA256 (liblinphone-5.4.4.tar.bz2) = 3e3b62c556b43b59634074945aad9cb4f744545aa583ec128a45b54e35caa377
|
||||||
SIZE (liblinphone-5.2.94.tar.bz2) = 20421039
|
SIZE (liblinphone-5.4.4.tar.bz2) = 20957209
|
||||||
|
|
|
@ -2,18 +2,20 @@ Fix compilation error:
|
||||||
|
|
||||||
src/core/core.cpp:428:2: error: void function 'doLater' should not return a
|
src/core/core.cpp:428:2: error: void function 'doLater' should not return a
|
||||||
value [-Wreturn-type]
|
value [-Wreturn-type]
|
||||||
--- CMakeLists.txt.orig 2023-03-17 13:29:37 UTC
|
--- CMakeLists.txt.orig 2025-03-20 22:21:32 UTC
|
||||||
+++ CMakeLists.txt
|
+++ CMakeLists.txt
|
||||||
@@ -4,7 +4,7 @@
|
@@ -115,8 +115,10 @@ find_package(BelleSIP 5.3.0 REQUIRED OPTIONAL_COMPONEN
|
||||||
#
|
endif()
|
||||||
############################################################################
|
|
||||||
#
|
find_package(BelleSIP 5.3.0 REQUIRED OPTIONAL_COMPONENTS tester)
|
||||||
-# This file is part of Liblinphone
|
+set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec")
|
||||||
+# This file is part of Liblinphone
|
find_package(Mediastreamer2 5.3.0 REQUIRED)
|
||||||
# (see https://gitlab.linphone.org/BC/public/liblinphone).
|
find_package(Ortp 5.3.0 REQUIRED)
|
||||||
#
|
+find_package(OpenSSL REQUIRED)
|
||||||
# This program is free software: you can redistribute it and/or modify
|
find_package(BCToolbox 5.3.0 REQUIRED OPTIONAL_COMPONENTS tester)
|
||||||
@@ -354,7 +354,7 @@ else()
|
#Mandatory to init default compilation flags
|
||||||
|
bc_init_compilation_flags(STRICT_OPTIONS_CPP STRICT_OPTIONS_C STRICT_OPTIONS_CXX ENABLE_STRICT)
|
||||||
|
@@ -306,7 +308,7 @@ else()
|
||||||
list(APPEND STRICT_OPTIONS_CPP
|
list(APPEND STRICT_OPTIONS_CPP
|
||||||
"-Wall"
|
"-Wall"
|
||||||
"-Wconversion"
|
"-Wconversion"
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
--- console/linphonec.c.orig 2023-07-28 13:53:32 UTC
|
|
||||||
+++ console/linphonec.c
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
* Copyright (C) 2002 Florian Winterstein <flox@gmx.net>
|
|
||||||
* Copyright (C) 2000 Simon MORLAT <simon.morlat@free.fr>
|
|
||||||
*
|
|
||||||
- * This file is part of Liblinphone
|
|
||||||
+ * This file is part of Liblinphone
|
|
||||||
* (see https://gitlab.linphone.org/BC/public/liblinphone).
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
@@ -962,7 +962,7 @@ static int
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
-linphonec_idle_call ()
|
|
||||||
+linphonec_idle_call (void)
|
|
||||||
{
|
|
||||||
LinphoneCore *opm=linphonec;
|
|
||||||
|
|
||||||
@@ -1272,7 +1272,7 @@ static int
|
|
||||||
* -1 on error
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
-handle_configfile_migration()
|
|
||||||
+handle_configfile_migration(void)
|
|
||||||
{
|
|
||||||
#if !defined(_WIN32_WCE)
|
|
||||||
char *old_cfg_gui;
|
|
|
@ -1,35 +0,0 @@
|
||||||
--- coreapi/presence.c.orig 2023-03-17 13:29:37 UTC
|
|
||||||
+++ coreapi/presence.c
|
|
||||||
@@ -200,11 +200,6 @@ static time_t parse_timestamp(const char *timestamp) {
|
|
||||||
static time_t parse_timestamp(const char *timestamp) {
|
|
||||||
struct tm ret;
|
|
||||||
time_t seconds;
|
|
||||||
-#if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
|
|
||||||
- long adjust_timezone;
|
|
||||||
-#else
|
|
||||||
- time_t adjust_timezone;
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
memset(&ret, 0, sizeof(ret));
|
|
||||||
sscanf(timestamp, "%d-%d-%dT%d:%d:%d",
|
|
||||||
@@ -212,17 +207,12 @@ static time_t parse_timestamp(const char *timestamp) {
|
|
||||||
ret.tm_mon--;
|
|
||||||
ret.tm_year -= 1900;
|
|
||||||
ret.tm_isdst = 0;
|
|
||||||
- seconds = mktime(&ret);
|
|
||||||
+ seconds = timegm(&ret);
|
|
||||||
if (seconds == (time_t)-1) {
|
|
||||||
- ms_error("mktime() failed: %s", strerror(errno));
|
|
||||||
+ ms_error("timegm() failed: %s", strerror(errno));
|
|
||||||
return (time_t)-1;
|
|
||||||
}
|
|
||||||
-#if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
|
|
||||||
- _get_timezone(&adjust_timezone);
|
|
||||||
-#else
|
|
||||||
- adjust_timezone = timezone;
|
|
||||||
-#endif
|
|
||||||
- return seconds - (time_t)adjust_timezone;
|
|
||||||
+ return seconds;
|
|
||||||
}
|
|
||||||
|
|
||||||
char * linphone_timestamp_to_rfc3339_string(time_t timestamp) {
|
|
|
@ -1,11 +1,11 @@
|
||||||
--- coreapi/linphonecore.c.orig 2023-07-28 13:53:32 UTC
|
--- coreapi/linphonecore.c.orig 2025-03-20 22:21:32 UTC
|
||||||
+++ coreapi/linphonecore.c
|
+++ coreapi/linphonecore.c
|
||||||
@@ -799,7 +799,7 @@ static void _close_log_collection_file(void) {
|
@@ -938,7 +938,7 @@ static void _close_log_collection_file(void) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
-#if (!__ANDROID__ && !__APPLE__) || (__ANDROID__ && __ANDROID_API__ < 21)
|
-#if (!__ANDROID__ && !__APPLE__) || (__ANDROID__ && __ANDROID_API__ < 21)
|
||||||
+#if (!__ANDROID__ && !__APPLE__ && !__FreeBSD__) || (__ANDROID__ && __ANDROID_API__ < 21)
|
+#if (!__ANDROID__ && !__APPLE__ && !__FreeBSD__) || (__ANDROID__ && __ANDROID_API__ < 21)
|
||||||
static const char* getprogname() {
|
static const char *getprogname() {
|
||||||
#if defined(__GLIBC__)
|
#if defined(__GLIBC__)
|
||||||
return program_invocation_short_name;
|
return program_invocation_short_name;
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
--- src/core/paths/paths-linux.cpp.orig 2023-03-17 13:29:37 UTC
|
--- src/core/paths/paths-linux.cpp.orig 2025-03-20 22:21:32 UTC
|
||||||
+++ src/core/paths/paths-linux.cpp
|
+++ src/core/paths/paths-linux.cpp
|
||||||
@@ -24,6 +24,16 @@
|
@@ -24,6 +24,16 @@
|
||||||
#include "paths-linux.h"
|
|
||||||
#include "linphone/api/c-factory.h"
|
#include "linphone/api/c-factory.h"
|
||||||
|
#include "paths-linux.h"
|
||||||
|
|
||||||
+#ifdef __FreeBSD__
|
+#ifdef __FreeBSD__
|
||||||
+/* get_current_dir_name() is a GNU extension.
|
+/* get_current_dir_name() is a GNU extension.
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
--- src/core/paths/paths.cpp.orig 2023-03-17 13:29:37 UTC
|
--- src/core/paths/paths.cpp.orig 2025-03-20 22:21:32 UTC
|
||||||
+++ src/core/paths/paths.cpp
|
+++ src/core/paths/paths.cpp
|
||||||
@@ -27,7 +27,7 @@
|
@@ -27,7 +27,7 @@
|
||||||
#include "paths-android.h"
|
#include "paths-android.h"
|
||||||
#elif defined(_WIN32)
|
#elif defined(_WIN32)
|
||||||
#include "paths-windows.h"
|
#include "paths-windows.h"
|
||||||
-#elif defined(__linux__)
|
-#elif defined(__linux__)
|
||||||
+#elif defined(__linux__) || defined(__FreeBSD__)
|
+#elif defined(__linux__) || defined(__FreeBSD__)
|
||||||
#include "paths-linux.h"
|
#include "paths-linux.h"
|
||||||
#else
|
#else
|
||||||
#error "Unsupported system."
|
#error "Unsupported system."
|
||||||
|
|
|
@ -1,13 +1,28 @@
|
||||||
--- src/ldap/ldap-contact-provider.cpp.orig 2023-07-28 13:53:32 UTC
|
--- src/ldap/ldap-contact-provider.cpp.orig 2025-03-20 22:21:32 UTC
|
||||||
+++ src/ldap/ldap-contact-provider.cpp
|
+++ src/ldap/ldap-contact-provider.cpp
|
||||||
@@ -227,11 +227,6 @@ void LdapContactProvider::initializeLdap(){
|
@@ -269,7 +269,9 @@ void LdapContactProvider::initializeLdap() {
|
||||||
ms_error("[LDAP] Cannot initialize address to %s : %x (%s), err %x (%s)",mConfig["server"].c_str(), ret, ldap_err2string(ret), err, ldap_err2string(err));
|
lError() << "[LDAP] Problem initializing TLS on setting require SAN '" << mServerUrl[mServerUrlIndex]
|
||||||
mCurrentAction = ACTION_ERROR;
|
<< "': " << ret << " (" << ldap_err2string(ret) << ")";
|
||||||
}else if(mConfig.count("use_tls")>0 && mConfig["use_tls"] == "1"){
|
|
||||||
- if(mConfig.count("use_sal")>0 && mConfig["use_sal"] == "1"){// Using Sal give an IP for a domain. So check the domain rather than the IP.
|
+#ifdef LDAP_OPT_X_TLS_RANDOM_FUNC
|
||||||
- belle_generic_uri_t *serverUri = belle_generic_uri_parse(mConfig["server"].c_str());
|
ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_RANDOM_FUNC, (void *)randomProvider);
|
||||||
- std::string hostname = belle_generic_uri_get_host(serverUri);
|
+#endif
|
||||||
|
if (ret != LDAP_SUCCESS) {
|
||||||
|
lError() << "[LDAP] Problem initializing TLS random generator function.";
|
||||||
|
}
|
||||||
|
@@ -291,16 +293,6 @@ void LdapContactProvider::initializeLdap() {
|
||||||
|
<< ldap_err2string(ret) << "), err " << err << " (" << ldap_err2string(err) << ")";
|
||||||
|
fallbackToNextServerUrl();
|
||||||
|
} else if (mConfig.count("use_tls") > 0 && mConfig["use_tls"][0] == "1") {
|
||||||
|
- if (mConfig.count("use_sal") > 0 &&
|
||||||
|
- mConfig["use_sal"][0] ==
|
||||||
|
- "1") { // Using Sal give an IP for a domain. So check the domain rather than the IP.
|
||||||
|
- belle_generic_uri_t *serverUri = belle_generic_uri_parse(
|
||||||
|
- mConfig["server"][mConfigServerIndex].c_str()); // mServer are results of sal. Use the root urls.
|
||||||
|
- const char *cHost = belle_generic_uri_get_host(serverUri);
|
||||||
|
- std::string hostname = cHost ? cHost : "";
|
||||||
- ldap_set_option(mLd, LDAP_OPT_X_TLS_PEER_CN, &hostname[0]);
|
- ldap_set_option(mLd, LDAP_OPT_X_TLS_PEER_CN, &hostname[0]);
|
||||||
|
- if (serverUri) belle_sip_object_unref(serverUri);
|
||||||
- }
|
- }
|
||||||
mTlsConnectionId = -1;
|
mTlsConnectionId = -1;
|
||||||
mCurrentAction = ACTION_WAIT_TLS_CONNECT;
|
mCurrentAction = ACTION_WAIT_TLS_CONNECT;
|
||||||
|
|
28
net/liblinphone/files/patch-src_presence_presence-model.cpp
Normal file
28
net/liblinphone/files/patch-src_presence_presence-model.cpp
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
--- src/presence/presence-model.cpp.orig 2025-03-26 23:44:07 UTC
|
||||||
|
+++ src/presence/presence-model.cpp
|
||||||
|
@@ -656,11 +656,6 @@ time_t PresenceModel::parseTimestamp(const std::string
|
||||||
|
time_t PresenceModel::parseTimestamp(const std::string ×tamp) {
|
||||||
|
struct tm ret;
|
||||||
|
time_t seconds;
|
||||||
|
-#if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
|
||||||
|
- long adjustTimezone;
|
||||||
|
-#else
|
||||||
|
- time_t adjustTimezone;
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
memset(&ret, 0, sizeof(ret));
|
||||||
|
sscanf(L_STRING_TO_C(timestamp), "%d-%d-%dT%d:%d:%d", &ret.tm_year, &ret.tm_mon, &ret.tm_mday, &ret.tm_hour,
|
||||||
|
@@ -673,12 +668,7 @@ time_t PresenceModel::parseTimestamp(const std::string
|
||||||
|
ms_error("mktime() failed: %s", strerror(errno));
|
||||||
|
return (time_t)-1;
|
||||||
|
}
|
||||||
|
-#if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
|
||||||
|
- _get_timezone(&adjustTimezone);
|
||||||
|
-#else
|
||||||
|
- adjustTimezone = timezone;
|
||||||
|
-#endif
|
||||||
|
- return seconds - (time_t)adjustTimezone;
|
||||||
|
+ return seconds;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
|
@ -1,54 +0,0 @@
|
||||||
--- src/utils/utils.cpp.orig 2023-07-28 13:53:32 UTC
|
|
||||||
+++ src/utils/utils.cpp
|
|
||||||
@@ -149,7 +149,7 @@ string Utils::unicodeToUtf8 (uint32_t ic) {
|
|
||||||
|
|
||||||
string Utils::unicodeToUtf8 (uint32_t ic) {
|
|
||||||
string result;
|
|
||||||
-
|
|
||||||
+
|
|
||||||
result.resize(5);
|
|
||||||
size_t size = 0;
|
|
||||||
if (ic < 0x80) {
|
|
||||||
@@ -223,12 +223,6 @@ time_t Utils::getTmAsTimeT (const tm &t) {
|
|
||||||
tm tCopy = t;
|
|
||||||
time_t result;
|
|
||||||
|
|
||||||
- #if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
|
|
||||||
- long adjustTimezone;
|
|
||||||
- #else
|
|
||||||
- time_t adjustTimezone;
|
|
||||||
- #endif
|
|
||||||
-
|
|
||||||
#if TARGET_IPHONE_SIMULATOR
|
|
||||||
result = timegm(&tCopy);
|
|
||||||
adjustTimezone = 0;
|
|
||||||
@@ -236,11 +230,6 @@ time_t Utils::getTmAsTimeT (const tm &t) {
|
|
||||||
// mktime uses local time => It's necessary to adjust the timezone to get an UTC time.
|
|
||||||
result = mktime(&tCopy);
|
|
||||||
|
|
||||||
- #if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
|
|
||||||
- _get_timezone(&adjustTimezone);
|
|
||||||
- #else
|
|
||||||
- adjustTimezone = timezone;
|
|
||||||
- #endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (result == time_t(-1)) {
|
|
||||||
@@ -250,7 +239,7 @@ time_t Utils::getTmAsTimeT (const tm &t) {
|
|
||||||
return time_t(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
- return result - time_t(adjustTimezone);
|
|
||||||
+ return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string Utils::getTimeAsString (const std::string &format, time_t t) {
|
|
||||||
@@ -328,7 +317,7 @@ map<string, Utils::Version> Utils::parseCapabilityDesc
|
|
||||||
if (std::getline(capversion, cap, '/') && std::getline(capversion, version, '/')){
|
|
||||||
result[cap] = Utils::Version(version);
|
|
||||||
}else result[cap] = Utils::Version(1, 0);
|
|
||||||
-
|
|
||||||
+
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- wrappers/cpp/genwrapper.py.orig 2023-03-17 13:29:37 UTC
|
--- wrappers/cpp/genwrapper.py.orig 2025-03-20 22:21:32 UTC
|
||||||
+++ wrappers/cpp/genwrapper.py
|
+++ wrappers/cpp/genwrapper.py
|
||||||
@@ -414,6 +414,8 @@ class ClassHeader:
|
@@ -425,6 +425,8 @@ class ClassHeader:
|
||||||
elif isinstance(type_, AbsApi.BaseType):
|
elif isinstance(type_, AbsApi.BaseType):
|
||||||
if type_.name == 'integer' and isinstance(type_.size, int):
|
if type_.name == 'integer' and isinstance(type_.size, int):
|
||||||
self._add_include('external', 'cstdint')
|
self._add_include('external', 'cstdint')
|
||||||
|
|
|
@ -1,28 +1,29 @@
|
||||||
bin/linphone-daemon
|
|
||||||
bin/linphone-daemon-pipetest
|
|
||||||
bin/linphonec
|
|
||||||
bin/linphonecsh
|
|
||||||
bin/lp-auto-answer
|
|
||||||
bin/lp-sendmsg
|
|
||||||
bin/lp-test-ecc
|
|
||||||
bin/lpc2xml_test
|
|
||||||
bin/xml2lpc_test
|
|
||||||
include/linphone++/account.hh
|
include/linphone++/account.hh
|
||||||
include/linphone++/account_creator.hh
|
include/linphone++/account_creator.hh
|
||||||
include/linphone++/account_creator_listener.hh
|
include/linphone++/account_creator_listener.hh
|
||||||
|
include/linphone++/account_device.hh
|
||||||
include/linphone++/account_listener.hh
|
include/linphone++/account_listener.hh
|
||||||
|
include/linphone++/account_manager_services.hh
|
||||||
|
include/linphone++/account_manager_services_request.hh
|
||||||
|
include/linphone++/account_manager_services_request_listener.hh
|
||||||
include/linphone++/account_params.hh
|
include/linphone++/account_params.hh
|
||||||
include/linphone++/address.hh
|
include/linphone++/address.hh
|
||||||
|
include/linphone++/alert.hh
|
||||||
|
include/linphone++/alert_listener.hh
|
||||||
include/linphone++/audio_device.hh
|
include/linphone++/audio_device.hh
|
||||||
include/linphone++/auth_info.hh
|
include/linphone++/auth_info.hh
|
||||||
|
include/linphone++/bearer_token.hh
|
||||||
include/linphone++/buffer.hh
|
include/linphone++/buffer.hh
|
||||||
include/linphone++/call.hh
|
include/linphone++/call.hh
|
||||||
include/linphone++/call_listener.hh
|
include/linphone++/call_listener.hh
|
||||||
include/linphone++/call_log.hh
|
include/linphone++/call_log.hh
|
||||||
include/linphone++/call_params.hh
|
include/linphone++/call_params.hh
|
||||||
include/linphone++/call_stats.hh
|
include/linphone++/call_stats.hh
|
||||||
|
include/linphone++/card_dav_params.hh
|
||||||
include/linphone++/chat_message.hh
|
include/linphone++/chat_message.hh
|
||||||
include/linphone++/chat_message_listener.hh
|
include/linphone++/chat_message_listener.hh
|
||||||
|
include/linphone++/chat_message_reaction.hh
|
||||||
|
include/linphone++/chat_params.hh
|
||||||
include/linphone++/chat_room.hh
|
include/linphone++/chat_room.hh
|
||||||
include/linphone++/chat_room_listener.hh
|
include/linphone++/chat_room_listener.hh
|
||||||
include/linphone++/chat_room_params.hh
|
include/linphone++/chat_room_params.hh
|
||||||
|
@ -37,7 +38,9 @@ include/linphone++/content.hh
|
||||||
include/linphone++/core.hh
|
include/linphone++/core.hh
|
||||||
include/linphone++/core_listener.hh
|
include/linphone++/core_listener.hh
|
||||||
include/linphone++/dial_plan.hh
|
include/linphone++/dial_plan.hh
|
||||||
|
include/linphone++/dictionary.hh
|
||||||
include/linphone++/digest_authentication_policy.hh
|
include/linphone++/digest_authentication_policy.hh
|
||||||
|
include/linphone++/ekt_info.hh
|
||||||
include/linphone++/enums.hh
|
include/linphone++/enums.hh
|
||||||
include/linphone++/error_info.hh
|
include/linphone++/error_info.hh
|
||||||
include/linphone++/event.hh
|
include/linphone++/event.hh
|
||||||
|
@ -45,6 +48,7 @@ include/linphone++/event_listener.hh
|
||||||
include/linphone++/event_log.hh
|
include/linphone++/event_log.hh
|
||||||
include/linphone++/factory.hh
|
include/linphone++/factory.hh
|
||||||
include/linphone++/friend.hh
|
include/linphone++/friend.hh
|
||||||
|
include/linphone++/friend_device.hh
|
||||||
include/linphone++/friend_list.hh
|
include/linphone++/friend_list.hh
|
||||||
include/linphone++/friend_list_listener.hh
|
include/linphone++/friend_list_listener.hh
|
||||||
include/linphone++/friend_listener.hh
|
include/linphone++/friend_listener.hh
|
||||||
|
@ -59,6 +63,8 @@ include/linphone++/logging_service.hh
|
||||||
include/linphone++/logging_service_listener.hh
|
include/linphone++/logging_service_listener.hh
|
||||||
include/linphone++/magic_search.hh
|
include/linphone++/magic_search.hh
|
||||||
include/linphone++/magic_search_listener.hh
|
include/linphone++/magic_search_listener.hh
|
||||||
|
include/linphone++/message_waiting_indication.hh
|
||||||
|
include/linphone++/message_waiting_indication_summary.hh
|
||||||
include/linphone++/nat_policy.hh
|
include/linphone++/nat_policy.hh
|
||||||
include/linphone++/object.hh
|
include/linphone++/object.hh
|
||||||
include/linphone++/participant.hh
|
include/linphone++/participant.hh
|
||||||
|
@ -66,6 +72,7 @@ include/linphone++/participant_device.hh
|
||||||
include/linphone++/participant_device_identity.hh
|
include/linphone++/participant_device_identity.hh
|
||||||
include/linphone++/participant_device_listener.hh
|
include/linphone++/participant_device_listener.hh
|
||||||
include/linphone++/participant_imdn_state.hh
|
include/linphone++/participant_imdn_state.hh
|
||||||
|
include/linphone++/participant_info.hh
|
||||||
include/linphone++/payload_type.hh
|
include/linphone++/payload_type.hh
|
||||||
include/linphone++/player.hh
|
include/linphone++/player.hh
|
||||||
include/linphone++/player_listener.hh
|
include/linphone++/player_listener.hh
|
||||||
|
@ -80,7 +87,9 @@ include/linphone++/push_notification_message.hh
|
||||||
include/linphone++/range.hh
|
include/linphone++/range.hh
|
||||||
include/linphone++/recorder.hh
|
include/linphone++/recorder.hh
|
||||||
include/linphone++/recorder_params.hh
|
include/linphone++/recorder_params.hh
|
||||||
|
include/linphone++/remote_contact_directory.hh
|
||||||
include/linphone++/search_result.hh
|
include/linphone++/search_result.hh
|
||||||
|
include/linphone++/signal_information.hh
|
||||||
include/linphone++/transports.hh
|
include/linphone++/transports.hh
|
||||||
include/linphone++/tunnel.hh
|
include/linphone++/tunnel.hh
|
||||||
include/linphone++/tunnel_config.hh
|
include/linphone++/tunnel_config.hh
|
||||||
|
@ -91,65 +100,89 @@ include/linphone++/video_source_descriptor.hh
|
||||||
include/linphone++/xml_rpc_request.hh
|
include/linphone++/xml_rpc_request.hh
|
||||||
include/linphone++/xml_rpc_request_listener.hh
|
include/linphone++/xml_rpc_request_listener.hh
|
||||||
include/linphone++/xml_rpc_session.hh
|
include/linphone++/xml_rpc_session.hh
|
||||||
include/linphone/FlexiAPIClient.hh
|
|
||||||
include/linphone/account_creator.h
|
include/linphone/account_creator.h
|
||||||
include/linphone/account_creator_service.h
|
include/linphone/account_creator_service.h
|
||||||
include/linphone/api/c-account-cbs.h
|
include/linphone/api/c-account-cbs.h
|
||||||
|
include/linphone/api/c-account-device.h
|
||||||
|
include/linphone/api/c-account-manager-services-request-cbs.h
|
||||||
|
include/linphone/api/c-account-manager-services-request.h
|
||||||
|
include/linphone/api/c-account-manager-services.h
|
||||||
include/linphone/api/c-account-params.h
|
include/linphone/api/c-account-params.h
|
||||||
include/linphone/api/c-account.h
|
include/linphone/api/c-account.h
|
||||||
include/linphone/api/c-address.h
|
include/linphone/api/c-address.h
|
||||||
|
include/linphone/api/c-alert-cbs.h
|
||||||
|
include/linphone/api/c-alert.h
|
||||||
include/linphone/api/c-api.h
|
include/linphone/api/c-api.h
|
||||||
include/linphone/api/c-audio-device.h
|
include/linphone/api/c-audio-device.h
|
||||||
include/linphone/api/c-auth-info.h
|
include/linphone/api/c-auth-info.h
|
||||||
|
include/linphone/api/c-bearer-token.h
|
||||||
|
include/linphone/api/c-buffer.h
|
||||||
include/linphone/api/c-call-cbs.h
|
include/linphone/api/c-call-cbs.h
|
||||||
include/linphone/api/c-call-log.h
|
include/linphone/api/c-call-log.h
|
||||||
include/linphone/api/c-call-stats.h
|
include/linphone/api/c-call-stats.h
|
||||||
include/linphone/api/c-call.h
|
include/linphone/api/c-call.h
|
||||||
include/linphone/api/c-callbacks.h
|
include/linphone/api/c-callbacks.h
|
||||||
|
include/linphone/api/c-carddav-params.h
|
||||||
include/linphone/api/c-chat-message-cbs.h
|
include/linphone/api/c-chat-message-cbs.h
|
||||||
|
include/linphone/api/c-chat-message-reaction.h
|
||||||
include/linphone/api/c-chat-message.h
|
include/linphone/api/c-chat-message.h
|
||||||
|
include/linphone/api/c-chat-params.h
|
||||||
include/linphone/api/c-chat-room-cbs.h
|
include/linphone/api/c-chat-room-cbs.h
|
||||||
include/linphone/api/c-chat-room-params.h
|
include/linphone/api/c-chat-room-params.h
|
||||||
include/linphone/api/c-chat-room.h
|
include/linphone/api/c-chat-room.h
|
||||||
include/linphone/api/c-conference-cbs.h
|
include/linphone/api/c-conference-cbs.h
|
||||||
include/linphone/api/c-conference-info.h
|
include/linphone/api/c-conference-info.h
|
||||||
|
include/linphone/api/c-conference-params.h
|
||||||
include/linphone/api/c-conference-scheduler.h
|
include/linphone/api/c-conference-scheduler.h
|
||||||
include/linphone/api/c-conference.h
|
include/linphone/api/c-conference.h
|
||||||
include/linphone/api/c-content.h
|
include/linphone/api/c-content.h
|
||||||
include/linphone/api/c-dial-plan.h
|
include/linphone/api/c-dial-plan.h
|
||||||
|
include/linphone/api/c-dictionary.h
|
||||||
include/linphone/api/c-digest-authentication-policy.h
|
include/linphone/api/c-digest-authentication-policy.h
|
||||||
|
include/linphone/api/c-ekt-info.h
|
||||||
|
include/linphone/api/c-event-cbs.h
|
||||||
include/linphone/api/c-event-log.h
|
include/linphone/api/c-event-log.h
|
||||||
|
include/linphone/api/c-event.h
|
||||||
include/linphone/api/c-factory.h
|
include/linphone/api/c-factory.h
|
||||||
|
include/linphone/api/c-friend-device.h
|
||||||
|
include/linphone/api/c-friend-list.h
|
||||||
include/linphone/api/c-friend-phone-number.h
|
include/linphone/api/c-friend-phone-number.h
|
||||||
|
include/linphone/api/c-friend.h
|
||||||
include/linphone/api/c-ldap-params.h
|
include/linphone/api/c-ldap-params.h
|
||||||
include/linphone/api/c-ldap.h
|
include/linphone/api/c-ldap.h
|
||||||
include/linphone/api/c-magic-search-cbs.h
|
include/linphone/api/c-magic-search-cbs.h
|
||||||
include/linphone/api/c-magic-search.h
|
include/linphone/api/c-magic-search.h
|
||||||
|
include/linphone/api/c-message-waiting-indication.h
|
||||||
include/linphone/api/c-nat-policy.h
|
include/linphone/api/c-nat-policy.h
|
||||||
include/linphone/api/c-participant-device-cbs.h
|
include/linphone/api/c-participant-device-cbs.h
|
||||||
include/linphone/api/c-participant-device-identity.h
|
include/linphone/api/c-participant-device-identity.h
|
||||||
include/linphone/api/c-participant-device.h
|
include/linphone/api/c-participant-device.h
|
||||||
include/linphone/api/c-participant-imdn-state.h
|
include/linphone/api/c-participant-imdn-state.h
|
||||||
|
include/linphone/api/c-participant-info.h
|
||||||
include/linphone/api/c-participant.h
|
include/linphone/api/c-participant.h
|
||||||
|
include/linphone/api/c-payload-type.h
|
||||||
|
include/linphone/api/c-player.h
|
||||||
|
include/linphone/api/c-presence.h
|
||||||
include/linphone/api/c-push-notification-config.h
|
include/linphone/api/c-push-notification-config.h
|
||||||
include/linphone/api/c-push-notification-message.h
|
include/linphone/api/c-push-notification-message.h
|
||||||
include/linphone/api/c-recorder-params.h
|
include/linphone/api/c-recorder-params.h
|
||||||
include/linphone/api/c-recorder.h
|
include/linphone/api/c-recorder.h
|
||||||
|
include/linphone/api/c-remote-contact-directory.h
|
||||||
include/linphone/api/c-search-result.h
|
include/linphone/api/c-search-result.h
|
||||||
|
include/linphone/api/c-signal-information.h
|
||||||
include/linphone/api/c-types.h
|
include/linphone/api/c-types.h
|
||||||
|
include/linphone/api/c-vcard.h
|
||||||
include/linphone/api/c-video-source-descriptor.h
|
include/linphone/api/c-video-source-descriptor.h
|
||||||
include/linphone/buffer.h
|
|
||||||
include/linphone/call.h
|
include/linphone/call.h
|
||||||
include/linphone/call_params.h
|
include/linphone/call_params.h
|
||||||
include/linphone/call_stats.h
|
include/linphone/call_stats.h
|
||||||
include/linphone/callbacks.h
|
include/linphone/callbacks.h
|
||||||
include/linphone/chat.h
|
include/linphone/chat.h
|
||||||
include/linphone/conference.h
|
|
||||||
include/linphone/contactprovider.h
|
include/linphone/contactprovider.h
|
||||||
include/linphone/core.h
|
include/linphone/core.h
|
||||||
include/linphone/core_utils.h
|
include/linphone/core_utils.h
|
||||||
include/linphone/defs.h
|
include/linphone/defs.h
|
||||||
include/linphone/dictionary.h
|
include/linphone/enums/c-enums.h
|
||||||
include/linphone/enums/call-enums.h
|
include/linphone/enums/call-enums.h
|
||||||
include/linphone/enums/chat-message-enums.h
|
include/linphone/enums/chat-message-enums.h
|
||||||
include/linphone/enums/chat-room-enums.h
|
include/linphone/enums/chat-room-enums.h
|
||||||
|
@ -157,10 +190,11 @@ include/linphone/enums/conference-enums.h
|
||||||
include/linphone/enums/encryption-engine-enums.h
|
include/linphone/enums/encryption-engine-enums.h
|
||||||
include/linphone/enums/event-log-enums.h
|
include/linphone/enums/event-log-enums.h
|
||||||
include/linphone/enums/participant-device-enums.h
|
include/linphone/enums/participant-device-enums.h
|
||||||
|
include/linphone/enums/participant-enums.h
|
||||||
include/linphone/enums/security-event-enums.h
|
include/linphone/enums/security-event-enums.h
|
||||||
include/linphone/error_info.h
|
include/linphone/error_info.h
|
||||||
include/linphone/event.h
|
|
||||||
include/linphone/factory.h
|
include/linphone/factory.h
|
||||||
|
include/linphone/flexi-api-client.h
|
||||||
include/linphone/friend.h
|
include/linphone/friend.h
|
||||||
include/linphone/friendlist.h
|
include/linphone/friendlist.h
|
||||||
include/linphone/headers.h
|
include/linphone/headers.h
|
||||||
|
@ -171,12 +205,10 @@ include/linphone/linphone_proxy_config.h
|
||||||
include/linphone/linphone_tunnel.h
|
include/linphone/linphone_tunnel.h
|
||||||
include/linphone/linphonecore.h
|
include/linphone/linphonecore.h
|
||||||
include/linphone/linphonecore_utils.h
|
include/linphone/linphonecore_utils.h
|
||||||
include/linphone/linphonefriend.h
|
|
||||||
include/linphone/linphonepresence.h
|
include/linphone/linphonepresence.h
|
||||||
include/linphone/logging.h
|
include/linphone/logging.h
|
||||||
include/linphone/lpconfig.h
|
include/linphone/lpconfig.h
|
||||||
include/linphone/misc.h
|
include/linphone/misc.h
|
||||||
include/linphone/payload_type.h
|
|
||||||
include/linphone/player.h
|
include/linphone/player.h
|
||||||
include/linphone/presence.h
|
include/linphone/presence.h
|
||||||
include/linphone/proxy_config.h
|
include/linphone/proxy_config.h
|
||||||
|
@ -196,21 +228,22 @@ include/linphone/vcard.h
|
||||||
include/linphone/video_definition.h
|
include/linphone/video_definition.h
|
||||||
include/linphone/wrapper_utils.h
|
include/linphone/wrapper_utils.h
|
||||||
include/linphone/xmlrpc.h
|
include/linphone/xmlrpc.h
|
||||||
lib/liblinphone++.so
|
lib/liblinphone++.a
|
||||||
lib/liblinphone++.so.10
|
lib/liblinphone.a
|
||||||
lib/liblinphone.so
|
share/LibLinphone/cmake/FindOpenLDAP.cmake
|
||||||
lib/liblinphone.so.10
|
share/LibLinphone/cmake/FindSoci.cmake
|
||||||
share/Linphone/cmake/LinphoneConfig.cmake
|
share/LibLinphone/cmake/LibLinphoneConfig.cmake
|
||||||
share/Linphone/cmake/LinphoneConfigVersion.cmake
|
share/LibLinphone/cmake/LibLinphoneConfigVersion.cmake
|
||||||
share/Linphone/cmake/LinphoneTargets-%%CMAKE_BUILD_TYPE%%.cmake
|
share/LibLinphone/cmake/LibLinphoneTargets-%%CMAKE_BUILD_TYPE%%.cmake
|
||||||
share/Linphone/cmake/LinphoneTargets.cmake
|
share/LibLinphone/cmake/LibLinphoneTargets.cmake
|
||||||
share/LinphoneCxx/cmake/LinphoneCxxConfig.cmake
|
share/LinphoneCxx/cmake/LinphoneCxxConfig.cmake
|
||||||
share/LinphoneCxx/cmake/LinphoneCxxTargets-%%CMAKE_BUILD_TYPE%%.cmake
|
share/LinphoneCxx/cmake/LinphoneCxxTargets-%%CMAKE_BUILD_TYPE%%.cmake
|
||||||
share/LinphoneCxx/cmake/LinphoneCxxTargets.cmake
|
share/LinphoneCxx/cmake/LinphoneCxxTargets.cmake
|
||||||
share/LinphoneCxx/cmake/LinphoneCxxVersion.cmake
|
share/LinphoneCxx/cmake/LinphoneCxxVersion.cmake
|
||||||
share/belr/grammars/cpim_grammar
|
share/belr/grammars/cpim_grammar.belr
|
||||||
share/belr/grammars/ics_grammar
|
share/belr/grammars/ics_grammar.belr
|
||||||
share/belr/grammars/identity_grammar
|
share/belr/grammars/identity_grammar.belr
|
||||||
|
share/belr/grammars/mwi_grammar.belr
|
||||||
share/linphone/rootca.pem
|
share/linphone/rootca.pem
|
||||||
share/sounds/linphone/dont_wait_too_long.mkv
|
share/sounds/linphone/dont_wait_too_long.mkv
|
||||||
share/sounds/linphone/hello16000.wav
|
share/sounds/linphone/hello16000.wav
|
||||||
|
@ -226,3 +259,4 @@ share/sounds/linphone/rings/oldphone-mono.wav
|
||||||
share/sounds/linphone/rings/soft_as_snow.mkv
|
share/sounds/linphone/rings/soft_as_snow.mkv
|
||||||
share/sounds/linphone/silence.mkv
|
share/sounds/linphone/silence.mkv
|
||||||
share/sounds/linphone/toy-mono.wav
|
share/sounds/linphone/toy-mono.wav
|
||||||
|
@dir lib/liblinphone/plugins
|
||||||
|
|
Loading…
Add table
Reference in a new issue