diff options
author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-03-23 08:26:16 -0500 |
---|---|---|
committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-03-23 11:01:35 -0500 |
commit | 31f0f2322f4f8dbc77d4f34a5520ba52b3101bb0 (patch) | |
tree | 43479675f5484ee219bc756794bc1cdd7d68017f /net | |
parent | net/mediastreamer: Update version 5.1.55=>5.2.37 (diff) |
net/liblinphone: Update version 5.1.36=>5.2.37
Changelog:
https://gitlab.linphone.org/BC/public/liblinphone/-/tags/5.2.37
Diffstat (limited to 'net')
-rw-r--r-- | net/liblinphone/Makefile | 8 | ||||
-rw-r--r-- | net/liblinphone/distinfo | 6 | ||||
-rw-r--r-- | net/liblinphone/files/patch-CMakeLists.txt | 13 | ||||
-rw-r--r-- | net/liblinphone/files/patch-console_linphonec.c | 20 | ||||
-rw-r--r-- | net/liblinphone/files/patch-coreapi__presence.c | 6 | ||||
-rw-r--r-- | net/liblinphone/files/patch-coreapi_linphonecore.c | 4 | ||||
-rw-r--r-- | net/liblinphone/files/patch-src_core_paths_paths-linux.cpp | 4 | ||||
-rw-r--r-- | net/liblinphone/files/patch-src_core_paths_paths.cpp | 4 | ||||
-rw-r--r-- | net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp | 4 | ||||
-rw-r--r-- | net/liblinphone/files/patch-src_utils_utils.cpp | 20 | ||||
-rw-r--r-- | net/liblinphone/files/patch-wrappers_cpp_genwrapper.py | 4 | ||||
-rw-r--r-- | net/liblinphone/pkg-plist | 12 |
12 files changed, 63 insertions, 42 deletions
diff --git a/net/liblinphone/Makefile b/net/liblinphone/Makefile index 6b9e7fc4e51a..a0a9d3493887 100644 --- a/net/liblinphone/Makefile +++ b/net/liblinphone/Makefile @@ -1,6 +1,5 @@ PORTNAME= liblinphone -DISTVERSION= 5.1.56 -PORTREVISION= 1 +DISTVERSION= 5.2.37 CATEGORIES= net MAINTAINER= bofh@FreeBSD.org @@ -26,11 +25,11 @@ LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \ libsoci_core.so:databases/soci \ libxerces-c.so:textproc/xerces-c3 -USES= cmake gnome iconv pkgconfig python:build sqlite +USES= cmake compiler:c++17-lang gnome iconv pkgconfig python:build sqlite USE_GITLAB= yes GL_SITE= https://gitlab.linphone.org/BC GL_ACCOUNT= public -GL_COMMIT= c5d52f725840bceca36874f480d86bdbb91f5b7e +GL_COMMIT= f8c1a652c2e014d1bdec9fc8d2a1996571970a9d USE_GNOME= libxml2 USE_LDCONFIG= yes @@ -38,6 +37,7 @@ CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DENABLE_FLEXIAPI=NO \ -DENABLE_NLS=NO \ + -DENABLE_QRCODE=NO \ -DENABLE_STATIC=NO \ -DENABLE_STRICT=NO \ -DENABLE_UNIT_TESTS=NO diff --git a/net/liblinphone/distinfo b/net/liblinphone/distinfo index 4a28ecd4b2c7..e49d990319ce 100644 --- a/net/liblinphone/distinfo +++ b/net/liblinphone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661328845 -SHA256 (public-liblinphone-c5d52f725840bceca36874f480d86bdbb91f5b7e_GL0.tar.gz) = e7f680c2eb46bd751245250f0a22074dbf219dd2955362620c9ba63a6e76351e -SIZE (public-liblinphone-c5d52f725840bceca36874f480d86bdbb91f5b7e_GL0.tar.gz) = 22756256 +TIMESTAMP = 1679182414 +SHA256 (public-liblinphone-f8c1a652c2e014d1bdec9fc8d2a1996571970a9d_GL0.tar.gz) = db32c4adcf5711efd4e3568e5561dc21aadb79539cec40b66ed61beb7fe637c8 +SIZE (public-liblinphone-f8c1a652c2e014d1bdec9fc8d2a1996571970a9d_GL0.tar.gz) = 23062549 diff --git a/net/liblinphone/files/patch-CMakeLists.txt b/net/liblinphone/files/patch-CMakeLists.txt index a5b264a5dbb0..6c148f58187f 100644 --- a/net/liblinphone/files/patch-CMakeLists.txt +++ b/net/liblinphone/files/patch-CMakeLists.txt @@ -2,9 +2,18 @@ Fix compilation error: src/core/core.cpp:428:2: error: void function 'doLater' should not return a value [-Wreturn-type] ---- CMakeLists.txt.orig 2022-08-24 08:22:37 UTC +--- CMakeLists.txt.orig 2023-03-17 13:29:37 UTC +++ CMakeLists.txt -@@ -320,7 +320,7 @@ else() +@@ -4,7 +4,7 @@ + # + ############################################################################ + # +-# 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 +@@ -354,7 +354,7 @@ else() list(APPEND STRICT_OPTIONS_CPP "-Wall" "-Wconversion" diff --git a/net/liblinphone/files/patch-console_linphonec.c b/net/liblinphone/files/patch-console_linphonec.c index db1497977963..016c55b10a49 100644 --- a/net/liblinphone/files/patch-console_linphonec.c +++ b/net/liblinphone/files/patch-console_linphonec.c @@ -1,6 +1,15 @@ ---- console/linphonec.c.orig 2023-02-11 23:13:07 UTC +--- console/linphonec.c.orig 2023-03-18 23:42:17 UTC +++ console/linphonec.c -@@ -965,7 +965,7 @@ static int +@@ -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 @@ -9,7 +18,7 @@ { LinphoneCore *opm=linphonec; -@@ -1274,7 +1274,7 @@ static int +@@ -1271,7 +1271,7 @@ static int * -1 on error */ static int @@ -18,8 +27,3 @@ { #if !defined(_WIN32_WCE) char *old_cfg_gui; -@@ -1555,4 +1555,3 @@ lpc_strip_blanks(char *input) - * - * - ****************************************************************************/ -- diff --git a/net/liblinphone/files/patch-coreapi__presence.c b/net/liblinphone/files/patch-coreapi__presence.c index e5f6802428c2..ad80c7a84cce 100644 --- a/net/liblinphone/files/patch-coreapi__presence.c +++ b/net/liblinphone/files/patch-coreapi__presence.c @@ -1,6 +1,6 @@ ---- coreapi/presence.c.orig 2022-06-15 08:21:53 UTC +--- coreapi/presence.c.orig 2023-03-17 13:29:37 UTC +++ coreapi/presence.c -@@ -198,11 +198,6 @@ static time_t parse_timestamp(const char *timestamp) { +@@ -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; @@ -12,7 +12,7 @@ memset(&ret, 0, sizeof(ret)); sscanf(timestamp, "%d-%d-%dT%d:%d:%d", -@@ -210,17 +205,12 @@ static time_t parse_timestamp(const char *timestamp) { +@@ -212,17 +207,12 @@ static time_t parse_timestamp(const char *timestamp) { ret.tm_mon--; ret.tm_year -= 1900; ret.tm_isdst = 0; diff --git a/net/liblinphone/files/patch-coreapi_linphonecore.c b/net/liblinphone/files/patch-coreapi_linphonecore.c index 95f8854dc22f..a5ebc80a27af 100644 --- a/net/liblinphone/files/patch-coreapi_linphonecore.c +++ b/net/liblinphone/files/patch-coreapi_linphonecore.c @@ -1,6 +1,6 @@ ---- coreapi/linphonecore.c.orig 2022-05-18 10:10:25 UTC +--- coreapi/linphonecore.c.orig 2023-03-17 13:29:37 UTC +++ coreapi/linphonecore.c -@@ -746,7 +746,7 @@ static void _close_log_collection_file(void) { +@@ -781,7 +781,7 @@ static void _close_log_collection_file(void) { } } diff --git a/net/liblinphone/files/patch-src_core_paths_paths-linux.cpp b/net/liblinphone/files/patch-src_core_paths_paths-linux.cpp index f7270b86f750..c5e9047b0bf0 100644 --- a/net/liblinphone/files/patch-src_core_paths_paths-linux.cpp +++ b/net/liblinphone/files/patch-src_core_paths_paths-linux.cpp @@ -1,6 +1,6 @@ ---- src/core/paths/paths-linux.cpp.orig 2022-08-08 14:58:59 UTC +--- src/core/paths/paths-linux.cpp.orig 2023-03-17 13:29:37 UTC +++ src/core/paths/paths-linux.cpp -@@ -23,6 +23,16 @@ +@@ -24,6 +24,16 @@ #include "paths-linux.h" #include "linphone/api/c-factory.h" diff --git a/net/liblinphone/files/patch-src_core_paths_paths.cpp b/net/liblinphone/files/patch-src_core_paths_paths.cpp index 37ab4288d108..f42dc989fbd7 100644 --- a/net/liblinphone/files/patch-src_core_paths_paths.cpp +++ b/net/liblinphone/files/patch-src_core_paths_paths.cpp @@ -1,6 +1,6 @@ ---- src/core/paths/paths.cpp.orig 2022-06-16 10:38:29 UTC +--- src/core/paths/paths.cpp.orig 2023-03-17 13:29:37 UTC +++ src/core/paths/paths.cpp -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ #include "paths-android.h" #elif defined(_WIN32) #include "paths-windows.h" diff --git a/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp b/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp index 25d5371d2d46..a6fa44138a6f 100644 --- a/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp +++ b/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp @@ -1,6 +1,6 @@ ---- src/ldap/ldap-contact-provider.cpp.orig 2022-05-18 10:10:25 UTC +--- src/ldap/ldap-contact-provider.cpp.orig 2023-03-17 13:29:37 UTC +++ src/ldap/ldap-contact-provider.cpp -@@ -220,11 +220,6 @@ void LdapContactProvider::initializeLdap(){ +@@ -221,11 +221,6 @@ 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)); mCurrentAction = ACTION_ERROR; }else if(mConfig.count("use_tls")>0 && mConfig["use_tls"] == "1"){ diff --git a/net/liblinphone/files/patch-src_utils_utils.cpp b/net/liblinphone/files/patch-src_utils_utils.cpp index 2253a7a63238..2f2740c34d25 100644 --- a/net/liblinphone/files/patch-src_utils_utils.cpp +++ b/net/liblinphone/files/patch-src_utils_utils.cpp @@ -1,6 +1,6 @@ ---- src/utils/utils.cpp.orig 2022-06-16 10:56:15 UTC +--- src/utils/utils.cpp.orig 2023-03-17 13:29:37 UTC +++ src/utils/utils.cpp -@@ -142,7 +142,7 @@ string Utils::unicodeToUtf8 (uint32_t ic) { +@@ -148,7 +148,7 @@ string Utils::unicodeToUtf8 (uint32_t ic) { string Utils::unicodeToUtf8 (uint32_t ic) { string result; @@ -9,8 +9,8 @@ result.resize(5); size_t size = 0; if (ic < 0x80) { -@@ -215,12 +215,6 @@ time_t Utils::getTmAsTimeT (const tm &t) { - time_t Utils::getTmAsTimeT (const tm &t) { +@@ -222,12 +222,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) @@ -20,11 +20,11 @@ - #endif - #if TARGET_IPHONE_SIMULATOR - result = timegm(&const_cast<tm &>(t)); + result = timegm(&tCopy); adjustTimezone = 0; -@@ -228,11 +222,6 @@ time_t Utils::getTmAsTimeT (const tm &t) { +@@ -235,11 +229,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(&const_cast<tm &>(t)); + result = mktime(&tCopy); - #if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19) - _get_timezone(&adjustTimezone); @@ -34,7 +34,7 @@ #endif if (result == time_t(-1)) { -@@ -240,7 +229,7 @@ time_t Utils::getTmAsTimeT (const tm &t) { +@@ -249,7 +238,7 @@ time_t Utils::getTmAsTimeT (const tm &t) { return time_t(-1); } @@ -42,8 +42,8 @@ + return result; } - // ----------------------------------------------------------------------------- -@@ -283,7 +272,7 @@ map<string, Utils::Version> Utils::parseCapabilityDesc + std::string Utils::getTimeAsString (const std::string &format, time_t t) { +@@ -327,7 +316,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); diff --git a/net/liblinphone/files/patch-wrappers_cpp_genwrapper.py b/net/liblinphone/files/patch-wrappers_cpp_genwrapper.py index 9c695520a276..fd13770a0d41 100644 --- a/net/liblinphone/files/patch-wrappers_cpp_genwrapper.py +++ b/net/liblinphone/files/patch-wrappers_cpp_genwrapper.py @@ -1,6 +1,6 @@ ---- wrappers/cpp/genwrapper.py.orig 2022-05-18 10:10:25 UTC +--- wrappers/cpp/genwrapper.py.orig 2023-03-17 13:29:37 UTC +++ wrappers/cpp/genwrapper.py -@@ -408,6 +408,8 @@ class ClassHeader: +@@ -414,6 +414,8 @@ class ClassHeader: elif isinstance(type_, AbsApi.BaseType): if type_.name == 'integer' and isinstance(type_.size, int): self._add_include('external', 'cstdint') diff --git a/net/liblinphone/pkg-plist b/net/liblinphone/pkg-plist index 8bfb21eaac79..5ce77e45da6b 100644 --- a/net/liblinphone/pkg-plist +++ b/net/liblinphone/pkg-plist @@ -30,6 +30,8 @@ include/linphone++/conference.hh include/linphone++/conference_info.hh include/linphone++/conference_listener.hh include/linphone++/conference_params.hh +include/linphone++/conference_scheduler.hh +include/linphone++/conference_scheduler_listener.hh include/linphone++/config.hh include/linphone++/content.hh include/linphone++/core.hh @@ -45,6 +47,7 @@ include/linphone++/factory.hh include/linphone++/friend.hh include/linphone++/friend_list.hh include/linphone++/friend_list_listener.hh +include/linphone++/friend_listener.hh include/linphone++/friend_phone_number.hh include/linphone++/headers.hh include/linphone++/im_notif_policy.hh @@ -84,9 +87,11 @@ include/linphone++/tunnel_config.hh include/linphone++/vcard.hh include/linphone++/video_activation_policy.hh include/linphone++/video_definition.hh +include/linphone++/video_source_descriptor.hh include/linphone++/xml_rpc_request.hh include/linphone++/xml_rpc_request_listener.hh include/linphone++/xml_rpc_session.hh +include/linphone/FlexiAPIClient.hh include/linphone/account_creator.h include/linphone/account_creator_service.h include/linphone/api/c-account-cbs.h @@ -97,6 +102,7 @@ include/linphone/api/c-api.h include/linphone/api/c-audio-device.h include/linphone/api/c-auth-info.h include/linphone/api/c-call-cbs.h +include/linphone/api/c-call-log.h include/linphone/api/c-call-stats.h include/linphone/api/c-call.h include/linphone/api/c-callbacks.h @@ -107,6 +113,7 @@ include/linphone/api/c-chat-room-params.h include/linphone/api/c-chat-room.h include/linphone/api/c-conference-cbs.h include/linphone/api/c-conference-info.h +include/linphone/api/c-conference-scheduler.h include/linphone/api/c-conference.h include/linphone/api/c-content.h include/linphone/api/c-dial-plan.h @@ -118,6 +125,7 @@ include/linphone/api/c-ldap-params.h include/linphone/api/c-ldap.h include/linphone/api/c-magic-search-cbs.h include/linphone/api/c-magic-search.h +include/linphone/api/c-nat-policy.h include/linphone/api/c-participant-device-cbs.h include/linphone/api/c-participant-device-identity.h include/linphone/api/c-participant-device.h @@ -129,9 +137,9 @@ include/linphone/api/c-recorder-params.h include/linphone/api/c-recorder.h include/linphone/api/c-search-result.h include/linphone/api/c-types.h +include/linphone/api/c-video-source-descriptor.h include/linphone/buffer.h include/linphone/call.h -include/linphone/call_log.h include/linphone/call_params.h include/linphone/call_stats.h include/linphone/callbacks.h @@ -148,6 +156,7 @@ include/linphone/enums/chat-room-enums.h include/linphone/enums/conference-enums.h include/linphone/enums/encryption-engine-enums.h include/linphone/enums/event-log-enums.h +include/linphone/enums/participant-device-enums.h include/linphone/enums/security-event-enums.h include/linphone/error_info.h include/linphone/event.h @@ -167,7 +176,6 @@ include/linphone/linphonepresence.h include/linphone/logging.h include/linphone/lpconfig.h include/linphone/misc.h -include/linphone/nat_policy.h include/linphone/payload_type.h include/linphone/player.h include/linphone/presence.h |