Page MenuHomeFreeBSD
Files F102875116

D35804.diff
No OneTemporary
Actions

D35804.diff
View Options

diff --git a/net/liblinphone/Makefile b/net/liblinphone/Makefile
--- a/net/liblinphone/Makefile
+++ b/net/liblinphone/Makefile
@@ -1,5 +1,5 @@
PORTNAME= liblinphone
-DISTVERSION= 5.0.49
+DISTVERSION= 5.1.32
CATEGORIES= net
MAINTAINER= bofh@FreeBSD.org
@@ -28,7 +28,7 @@
USE_GITLAB= yes
GL_SITE= https://gitlab.linphone.org/BC
GL_ACCOUNT= public
-GL_COMMIT= b1c3ab19e6d4200293593d29afe8d4f3c121d5db
+GL_COMMIT= 05b13b98229fc69ed3075916857dbe32b60b2b39
USE_GNOME= libxml2
USE_LDCONFIG= yes
@@ -49,9 +49,10 @@
LDAP_CMAKE_BOOL= ENABLE_LDAP
VIDEO_CMAKE_BOOL= ENABLE_VIDEO
-#post-patch:
-# @${REINPLACE_CMD} 's|jsoncpp_object|jsoncpp|g' \
-# ${WRKSRC}/src/CMakeLists.txt
+post-patch:
+.for h in xml conference-info conference-info-linphone-extension
+ @${REINPLACE_CMD} '/^#error/d' ${WRKSRC}/src/xml/${h}.h
+.endfor
post-install:
${RM} -r ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}
diff --git a/net/liblinphone/distinfo b/net/liblinphone/distinfo
--- a/net/liblinphone/distinfo
+++ b/net/liblinphone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655374642
-SHA256 (public-liblinphone-b1c3ab19e6d4200293593d29afe8d4f3c121d5db_GL0.tar.gz) = 9b1b902d4d972c900d66795b310932207b8a29bcb1f46ce517a83f8c47ce275c
-SIZE (public-liblinphone-b1c3ab19e6d4200293593d29afe8d4f3c121d5db_GL0.tar.gz) = 22624103
+TIMESTAMP = 1657714936
+SHA256 (public-liblinphone-05b13b98229fc69ed3075916857dbe32b60b2b39_GL0.tar.gz) = 9458a11c0bcc4496ff321c13f529394aec358f954e07c5d71ebf73f0d85e69d6
+SIZE (public-liblinphone-05b13b98229fc69ed3075916857dbe32b60b2b39_GL0.tar.gz) = 22753242
diff --git a/net/liblinphone/files/patch-coreapi_linphonecore.c b/net/liblinphone/files/patch-coreapi_linphonecore.c
--- 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-06-16 11:26:25 UTC
+--- coreapi/linphonecore.c.orig 2022-05-18 10:10:25 UTC
+++ coreapi/linphonecore.c
-@@ -720,7 +720,7 @@ static void _close_log_collection_file(void) {
+@@ -746,7 +746,7 @@ static void _close_log_collection_file(void) {
}
}
@@ -9,44 +9,3 @@
static const char* getprogname() {
#if defined(__GLIBC__)
return program_invocation_short_name;
-@@ -2085,8 +2085,8 @@ static void video_config_read(LinphoneCore *lc){
-
- str = linphone_config_get_string(lc->config, "video", "device", NULL);
- linphone_core_set_video_device(lc, str);
--
-
-+
- str = linphone_config_get_string(lc->config, "video", "size", "vga");
- if (str && str[0] != 0) linphone_core_set_preferred_video_definition_by_name(lc, str);
-
-@@ -2801,7 +2801,7 @@ static void linphone_core_init(LinphoneCore * lc, Linp
- bool_t push_notification_default = FALSE;
- bool_t auto_iterate_default = FALSE;
- bool_t vibration_incoming_call_default = FALSE;
--
-+
- #if __ANDROID__ || TARGET_OS_IPHONE
- auto_iterate_default = TRUE;
- #endif
-@@ -5303,7 +5303,7 @@ void linphone_core_reload_sound_devices(LinphoneCore*
- build_sound_devices_table(lc);
-
- // Set selection
--
-+
- linphone_core_set_ringer_device(lc, ringer_copy);
- if (ringer_copy != NULL)
- ms_free(ringer_copy);
-@@ -7275,10 +7275,10 @@ void _linphone_core_uninit(LinphoneCore *lc)
- bctbx_list_free(lc->supported_encryptions);
- }
- lc->supported_encryptions = NULL;
--
-+
- if (lc->platform_helper) delete getPlatformHelpers(lc);
- lc->platform_helper = NULL;
--
-+
- linphone_config_unref(lc->config);
- lc->config = NULL;
- #ifdef __ANDROID__
diff --git a/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp b/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp
--- a/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp
+++ b/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp
@@ -1,15 +1,14 @@
---- src/ldap/ldap-contact-provider.cpp.orig 2022-06-16 11:10:05 UTC
+--- src/ldap/ldap-contact-provider.cpp.orig 2022-05-18 10:10:25 UTC
+++ src/ldap/ldap-contact-provider.cpp
-@@ -158,12 +158,6 @@ void LdapContactProvider::initializeLdap(){
- } 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.
-- belle_generic_uri_t *serverUri = belle_generic_uri_parse(mConfig["server"].c_str());
-- std::string hostname = belle_generic_uri_get_host(serverUri);
-- std::vector<char> cHostname(hostname.c_str(), hostname.c_str() + hostname.size() + 1);
-- ldap_set_option(mLd, LDAP_OPT_X_TLS_PEER_CN, &cHostname[0]);
-- }
- ret = ldap_start_tls_s(mLd, NULL, NULL);
- }
- if( ret == LDAP_SUCCESS ) {
+@@ -220,11 +220,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"){
+- 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.
+- belle_generic_uri_t *serverUri = belle_generic_uri_parse(mConfig["server"].c_str());
+- std::string hostname = belle_generic_uri_get_host(serverUri);
+- ldap_set_option(mLd, LDAP_OPT_X_TLS_PEER_CN, &hostname[0]);
+- }
+ mTlsConnectionId = -1;
+ mCurrentAction = ACTION_WAIT_TLS_CONNECT;
+ mTlsConnectionTimeout = time(NULL);
diff --git a/net/liblinphone/files/patch-wrappers_cpp_genwrapper.py b/net/liblinphone/files/patch-wrappers_cpp_genwrapper.py
new file mode 100644
--- /dev/null
+++ b/net/liblinphone/files/patch-wrappers_cpp_genwrapper.py
@@ -0,0 +1,11 @@
+--- wrappers/cpp/genwrapper.py.orig 2022-05-18 10:10:25 UTC
++++ wrappers/cpp/genwrapper.py
+@@ -408,6 +408,8 @@ class ClassHeader:
+ elif isinstance(type_, AbsApi.BaseType):
+ if type_.name == 'integer' and isinstance(type_.size, int):
+ self._add_include('external', 'cstdint')
++ elif type_.name == 'time':
++ self._add_include('external', 'ctime')
+ elif type_.name == 'string':
+ self._add_include('external', 'string')
+ elif isinstance(type_, AbsApi.ListType):
diff --git a/net/liblinphone/pkg-plist b/net/liblinphone/pkg-plist
--- a/net/liblinphone/pkg-plist
+++ b/net/liblinphone/pkg-plist
@@ -27,6 +27,7 @@
include/linphone++/chat_room_listener.hh
include/linphone++/chat_room_params.hh
include/linphone++/conference.hh
+include/linphone++/conference_info.hh
include/linphone++/conference_listener.hh
include/linphone++/conference_params.hh
include/linphone++/config.hh
@@ -44,9 +45,12 @@
include/linphone++/friend.hh
include/linphone++/friend_list.hh
include/linphone++/friend_list_listener.hh
+include/linphone++/friend_phone_number.hh
include/linphone++/headers.hh
include/linphone++/im_notif_policy.hh
include/linphone++/info_message.hh
+include/linphone++/ldap.hh
+include/linphone++/ldap_params.hh
include/linphone++/linphone.hh
include/linphone++/logging_service.hh
include/linphone++/logging_service_listener.hh
@@ -57,6 +61,7 @@
include/linphone++/participant.hh
include/linphone++/participant_device.hh
include/linphone++/participant_device_identity.hh
+include/linphone++/participant_device_listener.hh
include/linphone++/participant_imdn_state.hh
include/linphone++/payload_type.hh
include/linphone++/player.hh
@@ -70,6 +75,8 @@
include/linphone++/push_notification_config.hh
include/linphone++/push_notification_message.hh
include/linphone++/range.hh
+include/linphone++/recorder.hh
+include/linphone++/recorder_params.hh
include/linphone++/search_result.hh
include/linphone++/transports.hh
include/linphone++/tunnel.hh
@@ -99,20 +106,27 @@
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.h
include/linphone/api/c-content.h
include/linphone/api/c-dial-plan.h
include/linphone/api/c-digest-authentication-policy.h
include/linphone/api/c-event-log.h
include/linphone/api/c-factory.h
+include/linphone/api/c-friend-phone-number.h
+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-participant-device-cbs.h
include/linphone/api/c-participant-device-identity.h
include/linphone/api/c-participant-device.h
include/linphone/api/c-participant-imdn-state.h
include/linphone/api/c-participant.h
include/linphone/api/c-push-notification-config.h
include/linphone/api/c-push-notification-message.h
+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/buffer.h
@@ -187,6 +201,7 @@
share/LinphoneCxx/cmake/LinphoneCxxTargets.cmake
share/LinphoneCxx/cmake/LinphoneCxxVersion.cmake
share/belr/grammars/cpim_grammar
+share/belr/grammars/ics_grammar
share/belr/grammars/identity_grammar
share/linphone/rootca.pem
share/sounds/linphone/dont_wait_too_long.mkv

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 19, 7:35 AM (21 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14712563
Default Alt Text
D35804.diff (8 KB)

Event Timeline