1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00

net/liblinphone: Update version 3.12.0=>5.0.49

- Switch MASTER_SITES to GL_SITE
- Take MAINTAINERSHIP
- Switch LICENSE from GPLv2+ to GPLv3

Relnotes: https://gitlab.linphone.org/BC/public/liblinphone/-/tags/5.0.49
This commit is contained in:
Muhammad Moinur Rahman 2022-06-16 11:27:46 -05:00
parent eb7517e02f
commit 5bf2156db3
12 changed files with 327 additions and 66 deletions

View File

@ -1,45 +1,58 @@
PORTNAME= linphone
PORTVERSION= 3.12.0
PORTREVISION= 5
PORTNAME= liblinphone
DISTVERSION= 5.0.49
CATEGORIES= net
MASTER_SITES= https://www.linphone.org/releases/sources/linphone/
PKGNAMEPREFIX= lib
MAINTAINER= ports@FreeBSD.org
MAINTAINER= bofh@FreeBSD.org
COMMENT= SIP library supporting voice/video calls and text messaging
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= doxygen:devel/doxygen \
${PYTHON_PKGNAMEPREFIX}pystache>=0:textproc/py-pystache@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystache>=0:textproc/py-pystache@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
doxygen:devel/doxygen \
xsd>0:devel/xsd
LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \
libbelcard.so:deskutils/belcard \
libbellesip.so:net/belle-sip \
libbelr.so:textproc/belr \
libbzrtp.so:security/bzrtp \
libmediastreamer_base.so:net/mediastreamer \
libjsoncpp.so:devel/jsoncpp \
liblime.so:security/lime \
libmediastreamer.so:net/mediastreamer \
libortp.so:net/ortp \
libsqlite3.so:databases/sqlite3
libsoci_core.so:databases/soci \
libxerces-c.so:textproc/xerces-c3
USES= cmake compiler:c++11-lib gnome iconv pkgconfig \
python:build
USES= cmake gnome iconv pkgconfig python:build sqlite
USE_GITLAB= yes
GL_SITE= https://gitlab.linphone.org/BC
GL_ACCOUNT= public
GL_COMMIT= b1c3ab19e6d4200293593d29afe8d4f3c121d5db
USE_GNOME= libxml2
USE_LDCONFIG= yes
CMAKE_ARGS= -DENABLE_NLS=NO -DENABLE_STATIC=NO -DENABLE_STRICT=NO \
CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \
-DCMAKE_SKIP_INSTALL_RPATH=ON \
-DENABLE_FLEXIAPI=NO \
-DENABLE_NLS=NO \
-DENABLE_STATIC=NO \
-DENABLE_STRICT=NO \
-DENABLE_UNIT_TESTS=NO
OPTIONS_DEFINE= LDAP VIDEO
OPTIONS_DEFAULT=LDAP VIDEO
OPTIONS_SUB= yes
OPTIONS_DEFINE= LDAP VIDEO
OPTIONS_DEFAULT= LDAP VIDEO
OPTIONS_SUB= yes
LDAP_CMAKE_BOOL= ENABLE_LDAP
LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
LDAP_USE= OPENLDAP=yes
LDAP_CMAKE_BOOL= ENABLE_LDAP
VIDEO_CMAKE_BOOL= ENABLE_VIDEO
#post-patch:
# @${REINPLACE_CMD} 's|jsoncpp_object|jsoncpp|g' \
# ${WRKSRC}/src/CMakeLists.txt
post-install:
${RM} -r ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1538743344
SHA256 (linphone-3.12.0.tar.gz) = 3da4fa55c01aa4a04923a8f028eb7fadeaed094614594e1a12cfb75e4a9f105e
SIZE (linphone-3.12.0.tar.gz) = 18667484
TIMESTAMP = 1655374642
SHA256 (public-liblinphone-b1c3ab19e6d4200293593d29afe8d4f3c121d5db_GL0.tar.gz) = 9b1b902d4d972c900d66795b310932207b8a29bcb1f46ce517a83f8c47ce275c
SIZE (public-liblinphone-b1c3ab19e6d4200293593d29afe8d4f3c121d5db_GL0.tar.gz) = 22624103

View File

@ -1,11 +0,0 @@
--- cmake/FindIntl.cmake.orig 2017-04-06 09:25:59 UTC
+++ cmake/FindIntl.cmake
@@ -41,7 +41,7 @@ if(INTL_INCLUDE_DIRS)
endif()
set(INTL_ARGS INTL_INCLUDE_DIRS HAVE_LIBINTL_H)
-if(NOT UNIX OR APPLE)
+if(NOT UNIX OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
find_library(INTL_LIBRARIES
NAMES intl
HINTS ${_INTL_ROOT_PATHS}

View File

@ -0,0 +1,58 @@
--- cmake/Findjsoncpp.cmake.orig 2022-06-15 23:17:21 UTC
+++ cmake/Findjsoncpp.cmake
@@ -0,0 +1,55 @@
+# -*- cmake -*-
+
+# - Find JSONCpp
+# Find the JSONCpp includes and library
+# This module defines
+# JSONCPP_INCLUDE_DIR, where to find json.h, etc.
+# JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
+# JSONCPP_FOUND, If false, do not try to use jsoncpp.
+# also defined, but not for general use are
+# JSONCPP_LIBRARY, where to find the jsoncpp library.
+
+FIND_PATH(JSONCPP_INCLUDE_DIR jsoncpp/json.h
+/usr/local/include
+/usr/include
+)
+
+# Get the GCC compiler version
+EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+ ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+ OUTPUT_VARIABLE _gcc_COMPILER_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
+FIND_LIBRARY(JSONCPP_LIBRARY
+ NAMES ${JSONCPP_NAMES}
+ PATHS /usr/lib /usr/local/lib
+ )
+
+IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
+ SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
+ SET(JSONCPP_FOUND "YES")
+ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
+ SET(JSONCPP_FOUND "NO")
+ENDIF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
+
+
+IF (JSONCPP_FOUND)
+ IF (NOT JSONCPP_FIND_QUIETLY)
+ MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}")
+ ENDIF (NOT JSONCPP_FIND_QUIETLY)
+ELSE (JSONCPP_FOUND)
+ IF (JSONCPP_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find JSONCpp library")
+ ENDIF (JSONCPP_FIND_REQUIRED)
+ENDIF (JSONCPP_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+ JSONCPP_LIBRARY
+ JSONCPP_INCLUDE_DIR
+ )

View File

@ -1,6 +1,6 @@
--- coreapi/presence.c.orig 2016-08-18 12:21:44 UTC
--- coreapi/presence.c.orig 2022-06-15 08:21:53 UTC
+++ coreapi/presence.c
@@ -160,11 +160,6 @@ static void presence_activity_delete(Lin
@@ -198,11 +198,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",
@@ -172,17 +167,12 @@ static time_t parse_timestamp(const char
@@ -210,17 +205,12 @@ static time_t parse_timestamp(const char *timestamp) {
ret.tm_mon--;
ret.tm_year -= 1900;
ret.tm_isdst = 0;

View File

@ -0,0 +1,52 @@
--- coreapi/linphonecore.c.orig 2022-06-16 11:26:25 UTC
+++ coreapi/linphonecore.c
@@ -720,7 +720,7 @@ static void _close_log_collection_file(void) {
}
}
-#if (!__ANDROID__ && !__APPLE__) || (__ANDROID__ && __ANDROID_API__ < 21)
+#if (!__ANDROID__ && !__APPLE__ && !__FreeBSD__) || (__ANDROID__ && __ANDROID_API__ < 21)
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__

View File

@ -0,0 +1,19 @@
--- src/core/paths/paths-linux.cpp.orig 2022-06-16 11:20:59 UTC
+++ src/core/paths/paths-linux.cpp
@@ -22,6 +22,16 @@
#include "paths-linux.h"
+#ifdef __FreeBSD__
+/* get_current_dir_name() is a GNU extension.
+ *
+ */
+char *get_current_dir_name()
+{
+return getcwd(nullptr, 0);
+}
+#endif
+
// =============================================================================
using namespace std;

View File

@ -0,0 +1,11 @@
--- src/core/paths/paths.cpp.orig 2022-06-16 10:38:29 UTC
+++ src/core/paths/paths.cpp
@@ -26,7 +26,7 @@
#include "paths-android.h"
#elif defined(_WIN32)
#include "paths-windows.h"
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
#include "paths-linux.h"
#else
#error "Unsupported system."

View File

@ -0,0 +1,15 @@
--- src/ldap/ldap-contact-provider.cpp.orig 2022-06-16 11:10:05 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 ) {

View File

@ -0,0 +1,54 @@
--- src/utils/utils.cpp.orig 2022-06-16 10:56:15 UTC
+++ src/utils/utils.cpp
@@ -142,7 +142,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) {
@@ -215,12 +215,6 @@ time_t Utils::getTmAsTimeT (const tm &t) {
time_t Utils::getTmAsTimeT (const tm &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(&const_cast<tm &>(t));
adjustTimezone = 0;
@@ -228,11 +222,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));
- #if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
- _get_timezone(&adjustTimezone);
- #else
- adjustTimezone = timezone;
- #endif
#endif
if (result == time_t(-1)) {
@@ -240,7 +229,7 @@ time_t Utils::getTmAsTimeT (const tm &t) {
return time_t(-1);
}
- return result - time_t(adjustTimezone);
+ return result;
}
// -----------------------------------------------------------------------------
@@ -283,7 +272,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;
}

View File

@ -1,11 +0,0 @@
--- wrappers/cpp/genwrapper.py.orig 2017-06-20 10:03:59 UTC
+++ wrappers/cpp/genwrapper.py
@@ -650,6 +650,8 @@ class ClassHeader(object):
self._add_include(includes, 'external', 'cstdint')
elif _type.name == 'string':
self._add_include(includes, 'external', 'string')
+ elif _type.name == 'time':
+ self._add_include(includes, 'external', 'time.h')
elif isinstance(_type, AbsApi.ListType):
self._add_include(includes, 'external', 'list')
self._needed_includes_from_type(_type.containedTypeDesc, includes)

View File

@ -1,7 +1,3 @@
bin/buddy_status
bin/chatroom
bin/filetransfer
bin/helloworld
bin/linphone-daemon
bin/linphone-daemon-pipetest
bin/linphonec
@ -10,14 +6,14 @@ bin/lp-auto-answer
bin/lp-sendmsg
bin/lp-test-ecc
bin/lpc2xml_test
bin/notify
bin/realtimetext_receiver
bin/realtimetext_sender
bin/registration
bin/xml2lpc_test
include/linphone++/account.hh
include/linphone++/account_creator.hh
include/linphone++/account_creator_listener.hh
include/linphone++/account_listener.hh
include/linphone++/account_params.hh
include/linphone++/address.hh
include/linphone++/audio_device.hh
include/linphone++/auth_info.hh
include/linphone++/buffer.hh
include/linphone++/call.hh
@ -28,27 +24,40 @@ include/linphone++/call_stats.hh
include/linphone++/chat_message.hh
include/linphone++/chat_message_listener.hh
include/linphone++/chat_room.hh
include/linphone++/chat_room_listener.hh
include/linphone++/chat_room_params.hh
include/linphone++/conference.hh
include/linphone++/conference_listener.hh
include/linphone++/conference_params.hh
include/linphone++/config.hh
include/linphone++/content.hh
include/linphone++/core.hh
include/linphone++/core_listener.hh
include/linphone++/dial_plan.hh
include/linphone++/digest_authentication_policy.hh
include/linphone++/enums.hh
include/linphone++/error_info.hh
include/linphone++/event.hh
include/linphone++/event_listener.hh
include/linphone++/event_log.hh
include/linphone++/factory.hh
include/linphone++/friend.hh
include/linphone++/friend_list.hh
include/linphone++/friend_list_listener.hh
include/linphone++/headers.hh
include/linphone++/im_encryption_engine.hh
include/linphone++/im_encryption_engine_listener.hh
include/linphone++/im_notif_policy.hh
include/linphone++/info_message.hh
include/linphone++/linphone.hh
include/linphone++/logging_service.hh
include/linphone++/logging_service_listener.hh
include/linphone++/magic_search.hh
include/linphone++/magic_search_listener.hh
include/linphone++/nat_policy.hh
include/linphone++/object.hh
include/linphone++/participant.hh
include/linphone++/participant_device.hh
include/linphone++/participant_device_identity.hh
include/linphone++/participant_imdn_state.hh
include/linphone++/payload_type.hh
include/linphone++/player.hh
include/linphone++/player_listener.hh
@ -58,9 +67,13 @@ include/linphone++/presence_note.hh
include/linphone++/presence_person.hh
include/linphone++/presence_service.hh
include/linphone++/proxy_config.hh
include/linphone++/push_notification_config.hh
include/linphone++/push_notification_message.hh
include/linphone++/range.hh
include/linphone++/search_result.hh
include/linphone++/transports.hh
include/linphone++/tunnel.hh
include/linphone++/tunnel_config.hh
include/linphone++/vcard.hh
include/linphone++/video_activation_policy.hh
include/linphone++/video_definition.hh
@ -69,8 +82,39 @@ include/linphone++/xml_rpc_request_listener.hh
include/linphone++/xml_rpc_session.hh
include/linphone/account_creator.h
include/linphone/account_creator_service.h
include/linphone/address.h
include/linphone/auth_info.h
include/linphone/api/c-account-cbs.h
include/linphone/api/c-account-params.h
include/linphone/api/c-account.h
include/linphone/api/c-address.h
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-stats.h
include/linphone/api/c-call.h
include/linphone/api/c-callbacks.h
include/linphone/api/c-chat-message-cbs.h
include/linphone/api/c-chat-message.h
include/linphone/api/c-chat-room-cbs.h
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.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-magic-search-cbs.h
include/linphone/api/c-magic-search.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-search-result.h
include/linphone/api/c-types.h
include/linphone/buffer.h
include/linphone/call.h
include/linphone/call_log.h
@ -80,11 +124,17 @@ include/linphone/callbacks.h
include/linphone/chat.h
include/linphone/conference.h
include/linphone/contactprovider.h
include/linphone/content.h
include/linphone/core.h
include/linphone/core_utils.h
include/linphone/defs.h
include/linphone/dictionary.h
include/linphone/enums/call-enums.h
include/linphone/enums/chat-message-enums.h
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/security-event-enums.h
include/linphone/error_info.h
include/linphone/event.h
include/linphone/factory.h
@ -94,13 +144,13 @@ include/linphone/headers.h
include/linphone/im_encryption_engine.h
include/linphone/im_notif_policy.h
include/linphone/info_message.h
include/linphone/ldapprovider.h
include/linphone/linphone_proxy_config.h
include/linphone/linphone_tunnel.h
include/linphone/linphonecore.h
include/linphone/linphonecore_utils.h
include/linphone/linphonefriend.h
include/linphone/linphonepresence.h
include/linphone/logging.h
include/linphone/lpconfig.h
include/linphone/misc.h
include/linphone/nat_policy.h
@ -112,14 +162,22 @@ include/linphone/ringtoneplayer.h
include/linphone/sipsetup.h
include/linphone/tunnel.h
include/linphone/types.h
include/linphone/utils/algorithm.h
include/linphone/utils/enum-generator.h
include/linphone/utils/enum-mask.h
include/linphone/utils/fs.h
include/linphone/utils/general.h
include/linphone/utils/magic-macros.h
include/linphone/utils/traits.h
include/linphone/utils/utils.h
include/linphone/vcard.h
include/linphone/video_definition.h
include/linphone/wrapper_utils.h
include/linphone/xmlrpc.h
lib/liblinphone++.so
lib/liblinphone++.so.9
lib/liblinphone++.so.10
lib/liblinphone.so
lib/liblinphone.so.9
lib/liblinphone.so.10
share/Linphone/cmake/LinphoneConfig.cmake
share/Linphone/cmake/LinphoneConfigVersion.cmake
share/Linphone/cmake/LinphoneTargets-%%CMAKE_BUILD_TYPE%%.cmake
@ -128,7 +186,9 @@ share/LinphoneCxx/cmake/LinphoneCxxConfig.cmake
share/LinphoneCxx/cmake/LinphoneCxxTargets-%%CMAKE_BUILD_TYPE%%.cmake
share/LinphoneCxx/cmake/LinphoneCxxTargets.cmake
share/LinphoneCxx/cmake/LinphoneCxxVersion.cmake
%%DATADIR%%/rootca.pem
share/belr/grammars/cpim_grammar
share/belr/grammars/identity_grammar
share/linphone/rootca.pem
share/sounds/linphone/dont_wait_too_long.mkv
share/sounds/linphone/hello16000.wav
share/sounds/linphone/hello8000.wav
@ -141,4 +201,5 @@ share/sounds/linphone/rings/leaving_dreams.mkv
share/sounds/linphone/rings/notes_of_the_optimistic.mkv
share/sounds/linphone/rings/oldphone-mono.wav
share/sounds/linphone/rings/soft_as_snow.mkv
share/sounds/linphone/silence.mkv
share/sounds/linphone/toy-mono.wav