hi, here's a wip update to linphone, i've quickly tested it and it connects fine to my $workplace asterisk instance. placing/receving calls worked.
only downside seen so far, a crash upon exit if you've made a call, something in the belle-sip destructors probably frees too much. feedback welcome. Landry
Index: Makefile.inc =================================================================== RCS file: /cvs/ports/telephony/linphone/Makefile.inc,v retrieving revision 1.4 diff -u -r1.4 Makefile.inc --- Makefile.inc 11 Mar 2022 19:58:31 -0000 1.4 +++ Makefile.inc 26 Jun 2022 16:14:22 -0000 @@ -1,4 +1,4 @@ -V ?= 5.0.0 +V ?= 5.1.45 CATEGORIES = telephony MODULES += devel/cmake MASTER_SITES = https://gitlab.linphone.org/BC/public/${MODULE}/-/archive/${V}/ Index: bctoolbox/Makefile =================================================================== RCS file: /cvs/ports/telephony/linphone/bctoolbox/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- bctoolbox/Makefile 18 Mar 2022 21:15:45 -0000 1.5 +++ bctoolbox/Makefile 26 Jun 2022 16:14:22 -0000 @@ -1,9 +1,8 @@ COMMENT = utilities library used by linphone stack MODULE = bctoolbox -REVISION = 0 -SHARED_LIBS += bctoolbox 0.0 # 1 +SHARED_LIBS += bctoolbox 0.1 # 1 #SHARED_LIBS += bctoolbox-tester 0.0 # 1 CONFIGURE_ARGS =-DENABLE_STATIC=NO Index: bctoolbox/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/bctoolbox/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- bctoolbox/distinfo 10 Jul 2021 16:56:03 -0000 1.2 +++ bctoolbox/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (bctoolbox-5.0.0.tar.gz) = s2rEbBQ4C+eyWxiPPdLkkyJNO/W+4wsXK0p49hd1yO4= -SIZE (bctoolbox-5.0.0.tar.gz) = 178893 +SHA256 (bctoolbox-5.1.45.tar.gz) = 2sS7OCM7YPOZUcxJgaOfvj6ceBbpfyg3tID43ynA4Nw= +SIZE (bctoolbox-5.1.45.tar.gz) = 181515 Index: bctoolbox/patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/telephony/linphone/bctoolbox/patches/patch-CMakeLists_txt,v retrieving revision 1.4 diff -u -r1.4 patch-CMakeLists_txt --- bctoolbox/patches/patch-CMakeLists_txt 18 Mar 2022 21:15:45 -0000 1.4 +++ bctoolbox/patches/patch-CMakeLists_txt 26 Jun 2022 16:14:22 -0000 @@ -3,7 +3,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -60,9 +60,7 @@ if(NOT CPACK_GENERATOR AND NOT CMAKE_INSTALL_RPATH AND +@@ -69,9 +69,7 @@ if(NOT CPACK_GENERATOR AND NOT CMAKE_INSTALL_RPATH AND message(STATUS "Setting install rpath to ${CMAKE_INSTALL_RPATH}") endif() @@ -14,7 +14,7 @@ if(ENABLE_MBEDTLS) find_package(MbedTLS) -@@ -151,7 +149,11 @@ set(EXPORT_TARGETS_NAME "bctoolbox") +@@ -166,7 +164,11 @@ set(EXPORT_TARGETS_NAME "bctoolbox") check_library_exists("rt" "clock_gettime" "" HAVE_LIBRT) check_library_exists("dl" "dladdr" "" HAVE_LIBDL) Index: bctoolbox/patches/patch-src_CMakeLists_txt =================================================================== RCS file: /cvs/ports/telephony/linphone/bctoolbox/patches/patch-src_CMakeLists_txt,v retrieving revision 1.3 diff -u -r1.3 patch-src_CMakeLists_txt --- bctoolbox/patches/patch-src_CMakeLists_txt 11 Mar 2022 19:58:32 -0000 1.3 +++ bctoolbox/patches/patch-src_CMakeLists_txt 26 Jun 2022 16:14:22 -0000 @@ -1,8 +1,8 @@ Index: src/CMakeLists.txt --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -151,6 +151,8 @@ if(ENABLE_SHARED) - target_compile_definitions(bctoolbox PRIVATE "-DBCTBX_EXPORTS") +@@ -165,6 +165,8 @@ if(ENABLE_SHARED) + endif() endif() set_target_properties(bctoolbox PROPERTIES LINKER_LANGUAGE "CXX") + target_include_directories(bctoolbox SYSTEM PRIVATE ${ICONV_INCLUDE_DIRS}) @@ -10,7 +10,7 @@ if(NOT ANDROID) # Do not version shared library on Android set_target_properties(bctoolbox PROPERTIES SOVERSION ${BCTOOLBOX_SO_VERSION}) -@@ -174,6 +176,7 @@ if(ENABLE_SHARED) +@@ -188,6 +190,7 @@ if(ENABLE_SHARED) endif() if(ENABLE_TESTS_COMPONENT) add_library(bctoolbox-tester SHARED ${BCTOOLBOX_TESTER_SOURCE_FILES}) Index: belcard/Makefile =================================================================== RCS file: /cvs/ports/telephony/linphone/belcard/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- belcard/Makefile 11 Mar 2022 19:58:32 -0000 1.3 +++ belcard/Makefile 26 Jun 2022 16:14:22 -0000 @@ -1,6 +1,5 @@ COMMENT = library to manipulate VCard standard format -V = 4.5.22 MODULE = belcard SHARED_LIBS += belcard 0.0 # 1 Index: belcard/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/belcard/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- belcard/distinfo 10 Jul 2021 16:54:43 -0000 1.2 +++ belcard/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (belcard-4.5.22.tar.gz) = 7HrozWNJjTlnN7kTbwG8WI27XjIAiE4FTrY7HGucgTA= -SIZE (belcard-4.5.22.tar.gz) = 201498 +SHA256 (belcard-5.1.45.tar.gz) = 9YF2g32Ef+E4aHKH/wk3nvA8BqiZi+YSQAYtankGQ+M= +SIZE (belcard-5.1.45.tar.gz) = 201332 Index: belle-sip/Makefile =================================================================== RCS file: /cvs/ports/telephony/linphone/belle-sip/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- belle-sip/Makefile 18 Mar 2022 21:15:46 -0000 1.5 +++ belle-sip/Makefile 26 Jun 2022 16:14:22 -0000 @@ -2,7 +2,7 @@ MODULE = belle-sip -SHARED_LIBS += bellesip 0.0 # 1 +SHARED_LIBS += bellesip 0.1 # 1 CONFIGURE_ARGS= -DENABLE_STATIC=NO CONFIGURE_ARGS += -DENABLE_TESTS=NO Index: belle-sip/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/belle-sip/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- belle-sip/distinfo 10 Jul 2021 16:58:01 -0000 1.2 +++ belle-sip/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (belle-sip-5.0.0.tar.gz) = cvf1m2VkzJw9hxM5rgxN01es8tg4GX/u/XetaOUInkk= -SIZE (belle-sip-5.0.0.tar.gz) = 3741976 +SHA256 (belle-sip-5.1.45.tar.gz) = 5CAAHz+Gs7Oi0nFFwAzHz7lU9FuT7leJdNnRKP42EKM= +SIZE (belle-sip-5.1.45.tar.gz) = 3746523 Index: belle-sip/patches/patch-src_dns_dns_c =================================================================== RCS file: /cvs/ports/telephony/linphone/belle-sip/patches/patch-src_dns_dns_c,v retrieving revision 1.2 diff -u -r1.2 patch-src_dns_dns_c --- belle-sip/patches/patch-src_dns_dns_c 11 Mar 2022 19:58:32 -0000 1.2 +++ belle-sip/patches/patch-src_dns_dns_c 26 Jun 2022 16:14:22 -0000 @@ -14,7 +14,7 @@ return resconf; error: -@@ -9175,6 +9177,7 @@ static struct dns_resolv_conf *resconf(void) { +@@ -9179,6 +9181,7 @@ static struct dns_resolv_conf *resconf(void) { panic("%s: %s", path, dns_strerror(error)); } @@ -22,7 +22,7 @@ for (i = 0; i < MAIN.nssconf.count; i++) { path = MAIN.nssconf.path[i]; -@@ -9195,7 +9198,7 @@ static struct dns_resolv_conf *resconf(void) { +@@ -9199,7 +9202,7 @@ static struct dns_resolv_conf *resconf(void) { else if (error != ENOENT) panic("%s: %s", path, dns_strerror(error)); } Index: belle-sip/patches/patch-src_transports_udp_listeningpoint_c =================================================================== RCS file: /cvs/ports/telephony/linphone/belle-sip/patches/patch-src_transports_udp_listeningpoint_c,v retrieving revision 1.2 diff -u -r1.2 patch-src_transports_udp_listeningpoint_c --- belle-sip/patches/patch-src_transports_udp_listeningpoint_c 11 Mar 2022 19:58:32 -0000 1.2 +++ belle-sip/patches/patch-src_transports_udp_listeningpoint_c 26 Jun 2022 16:14:22 -0000 @@ -3,7 +3,7 @@ Index: src/transports/udp_listeningpoint.c --- src/transports/udp_listeningpoint.c.orig +++ src/transports/udp_listeningpoint.c -@@ -77,7 +77,7 @@ static belle_sip_socket_t create_udp_socket(const char +@@ -82,7 +82,7 @@ belle_sip_socket_t udp_listening_point_create_udp_sock snprintf(portnum,sizeof(portnum),"%i",*port); Index: belle-sip/pkg/PLIST =================================================================== RCS file: /cvs/ports/telephony/linphone/belle-sip/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- belle-sip/pkg/PLIST 11 Mar 2022 19:58:32 -0000 1.3 +++ belle-sip/pkg/PLIST 26 Jun 2022 16:14:22 -0000 @@ -29,7 +29,6 @@ include/belle-sip/types.h include/belle-sip/utils.h include/belle-sip/wakelock.h -lib/cmake/ lib/cmake/BelleSIP/ lib/cmake/BelleSIP/BelleSIPConfig.cmake lib/cmake/BelleSIP/BelleSIPConfigVersion.cmake Index: belr/Makefile =================================================================== RCS file: /cvs/ports/telephony/linphone/belr/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- belr/Makefile 18 Mar 2022 21:15:46 -0000 1.4 +++ belr/Makefile 26 Jun 2022 16:14:22 -0000 @@ -1,6 +1,5 @@ COMMENT = language recognition library -V = 5.0.0-alpha PKGNAME = ${MODULE}-${V:S/-alpha//} MODULE = belr Index: belr/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/belr/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- belr/distinfo 10 Jul 2021 16:56:38 -0000 1.2 +++ belr/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (belr-5.0.0-alpha.tar.gz) = 7/V9MhIYpHvwDDvD2IigEGC37gVCrTq3xAomlpiawdQ= -SIZE (belr-5.0.0-alpha.tar.gz) = 67643 +SHA256 (belr-5.1.45.tar.gz) = TZkZdMqWYLq4hbBai3HAace3ku8FoQ5jYaYjXGQaIq8= +SIZE (belr-5.1.45.tar.gz) = 67830 Index: bzrtp/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/bzrtp/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- bzrtp/distinfo 10 Jul 2021 16:57:01 -0000 1.2 +++ bzrtp/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (bzrtp-5.0.0.tar.gz) = n+N/PZJyFq5qhDOfc6fCQoxUCHkkFyxlkxwICINKR0E= -SIZE (bzrtp-5.0.0.tar.gz) = 180081 +SHA256 (bzrtp-5.1.45.tar.gz) = ei1LwwjzEgpY/XuEsFUDU/NfLgwsNeZE5dJAbWG9erM= +SIZE (bzrtp-5.1.45.tar.gz) = 180112 Index: liblinphone/Makefile =================================================================== RCS file: /cvs/ports/telephony/linphone/liblinphone/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- liblinphone/Makefile 18 Mar 2022 21:15:46 -0000 1.5 +++ liblinphone/Makefile 26 Jun 2022 16:14:22 -0000 @@ -2,8 +2,8 @@ MODULE = liblinphone -SHARED_LIBS += linphone 0.0 \ - linphone++ 0.0 # 10 +SHARED_LIBS += linphone 1.0 \ + linphone++ 1.0 # 10 CONFIGURE_ARGS =-DENABLE_STATIC=NO \ -DENABLE_UNIT_TESTS=NO \ @@ -29,6 +29,8 @@ WANTLIB += xml2 z post-install: - mv ${PREFIX}/share/doc/liblinphone-5.0.0 ${PREFIX}/share/doc/liblinphone + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/liblinphone + mv ${WRKBUILD}/coreapi/help/doc/doxygen/c ${PREFIX}/share/doc/liblinphone + mv ${WRKBUILD}/wrappers/cpp/cpp ${PREFIX}/share/doc/liblinphone .include <bsd.port.mk> Index: liblinphone/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/liblinphone/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- liblinphone/distinfo 10 Jul 2021 17:00:37 -0000 1.2 +++ liblinphone/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (liblinphone-5.0.0.tar.gz) = PaCTIwin4c3arunOFBbvXrvjZKv/fjoVZ/sa5TV4ujA= -SIZE (liblinphone-5.0.0.tar.gz) = 20953680 +SHA256 (liblinphone-5.1.45.tar.gz) = 8mQa0CRtOOTlOl1Zhc6gD7Ppq2Pggig1aOTIHMzVRJw= +SIZE (liblinphone-5.1.45.tar.gz) = 22748059 Index: liblinphone/patches/patch-coreapi_linphonecore_c =================================================================== RCS file: /cvs/ports/telephony/linphone/liblinphone/patches/patch-coreapi_linphonecore_c,v retrieving revision 1.2 diff -u -r1.2 patch-coreapi_linphonecore_c --- liblinphone/patches/patch-coreapi_linphonecore_c 11 Mar 2022 19:58:33 -0000 1.2 +++ liblinphone/patches/patch-coreapi_linphonecore_c 26 Jun 2022 16:14:22 -0000 @@ -3,7 +3,7 @@ Index: coreapi/linphonecore.c --- coreapi/linphonecore.c.orig +++ coreapi/linphonecore.c -@@ -706,7 +706,7 @@ static void _close_log_collection_file(void) { +@@ -746,7 +746,7 @@ static void _close_log_collection_file(void) { } } @@ -12,7 +12,7 @@ static const char* getprogname() { #if defined(__GLIBC__) return program_invocation_short_name; -@@ -1560,7 +1560,7 @@ static void sip_config_read(LinphoneCore *lc) { +@@ -1597,7 +1597,7 @@ static void sip_config_read(LinphoneCore *lc) { const char *tmpstr; LinphoneSipTransports tr; int i,tmp; Index: liblinphone/patches/patch-src_CMakeLists_txt =================================================================== RCS file: /cvs/ports/telephony/linphone/liblinphone/patches/patch-src_CMakeLists_txt,v retrieving revision 1.2 diff -u -r1.2 patch-src_CMakeLists_txt --- liblinphone/patches/patch-src_CMakeLists_txt 11 Mar 2022 19:58:33 -0000 1.2 +++ liblinphone/patches/patch-src_CMakeLists_txt 26 Jun 2022 16:14:22 -0000 @@ -3,7 +3,7 @@ Index: src/CMakeLists.txt --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -482,8 +482,6 @@ endif() +@@ -584,8 +584,6 @@ endif() set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${LIBXSD_INCLUDE_DIRS} Index: liblinphone/patches/patch-src_core_paths_paths-linux_cpp =================================================================== RCS file: /cvs/ports/telephony/linphone/liblinphone/patches/patch-src_core_paths_paths-linux_cpp,v retrieving revision 1.2 diff -u -r1.2 patch-src_core_paths_paths-linux_cpp --- liblinphone/patches/patch-src_core_paths_paths-linux_cpp 11 Mar 2022 19:58:33 -0000 1.2 +++ liblinphone/patches/patch-src_core_paths_paths-linux_cpp 26 Jun 2022 16:14:22 -0000 @@ -1,7 +1,7 @@ Index: src/core/paths/paths-linux.cpp --- src/core/paths/paths-linux.cpp.orig +++ src/core/paths/paths-linux.cpp -@@ -34,7 +34,7 @@ static string getBaseDirectory () { +@@ -35,7 +35,7 @@ static string getBaseDirectory () { char *dir = getenv("HOME"); if (!dir){ lError() << "Unable to get $HOME directory, will use current directory instead as base directory."; Index: liblinphone/patches/patch-src_nat_ice-service_cpp =================================================================== RCS file: /cvs/ports/telephony/linphone/liblinphone/patches/patch-src_nat_ice-service_cpp,v retrieving revision 1.2 diff -u -r1.2 patch-src_nat_ice-service_cpp --- liblinphone/patches/patch-src_nat_ice-service_cpp 11 Mar 2022 19:58:33 -0000 1.2 +++ liblinphone/patches/patch-src_nat_ice-service_cpp 26 Jun 2022 16:14:22 -0000 @@ -1,14 +1,18 @@ Index: src/nat/ice-service.cpp --- src/nat/ice-service.cpp.orig +++ src/nat/ice-service.cpp -@@ -595,8 +595,10 @@ const struct addrinfo *IceService::getIcePreferredStun - while (it) { +@@ -683,12 +683,14 @@ const struct addrinfo *IceService::getIcePreferredStun + bctbx_addrinfo_to_printable_ip_address(it, ip_port, sizeof(ip_port)-1); if (it->ai_family == AF_INET) break; +#ifndef __OpenBSD__ - if ((it->ai_family == AF_INET6) && (it->ai_flags & AI_V4MAPPED)) - break; + if (it->ai_family == AF_INET6){ + struct sockaddr_in6 * in6 = (struct sockaddr_in6*) it->ai_addr; + if (IN6_IS_ADDR_V4MAPPED(&in6->sin6_addr)){ + break; + } + } +#endif - it = it->ai_next; } preferredAi = it; + } Index: liblinphone/pkg/PLIST =================================================================== RCS file: /cvs/ports/telephony/linphone/liblinphone/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- liblinphone/pkg/PLIST 11 Mar 2022 19:58:33 -0000 1.3 +++ liblinphone/pkg/PLIST 26 Jun 2022 16:14:22 -0000 @@ -29,6 +29,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 @@ -36,6 +37,7 @@ 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 @@ -45,9 +47,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 @@ -58,6 +63,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 @@ -71,6 +77,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 @@ -101,19 +109,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 @@ -192,6 +208,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/doc/liblinphone/ share/doc/liblinphone/c/ @@ -203,16 +220,16 @@ share/doc/liblinphone/c/classes.html share/doc/liblinphone/c/closed.png share/doc/liblinphone/c/deprecated.html -share/doc/liblinphone/c/dir_213a781ee028c35b0ddab204aab0971f.html -share/doc/liblinphone/c/dir_5c89313423021cb897b25a8de03be05c.html -share/doc/liblinphone/c/dir_6645b99962fe3bb1b283205619995343.html -share/doc/liblinphone/c/dir_6993a52c5963af114567760a55f2d7b0.html -share/doc/liblinphone/c/dir_6e2f483d5e9f40ff76440f46be730eb2.html -share/doc/liblinphone/c/dir_8d7f2c6fca42deff8cd213d4ac1cd5cb.html -share/doc/liblinphone/c/dir_985ea9178e0a0ecd84633c374150e5e6.html -share/doc/liblinphone/c/dir_f48b578e101484536794987b8fb8acd9.html -share/doc/liblinphone/c/dir_f6fdcffabf60bed990bae1087170bf90.html -share/doc/liblinphone/c/dir_f94eacf4504c3b534108470e09460398.html +share/doc/liblinphone/c/dir_010264825198565a89294f9be76e860a.html +share/doc/liblinphone/c/dir_287ef22752dd1e1af6bab3533a531e56.html +share/doc/liblinphone/c/dir_67e17913961567a4be700909b5df7117.html +share/doc/liblinphone/c/dir_7a7f2ea18a07f9dc3135239da5786d95.html +share/doc/liblinphone/c/dir_7ce14383e8a11604675c7287969fd8d7.html +share/doc/liblinphone/c/dir_7e60707415b465d26e2d740dce7a27e0.html +share/doc/liblinphone/c/dir_ae989e9c90b1f473c64d5aa4090d24aa.html +share/doc/liblinphone/c/dir_c8e32e295a9a5f3b3abaaadb58a8985f.html +share/doc/liblinphone/c/dir_d013a622ce9b895f8736dc74bba34dec.html +share/doc/liblinphone/c/dir_f0f2d86dc6ca824ef3ffe257aa22fee1.html share/doc/liblinphone/c/doc.png share/doc/liblinphone/c/doxygen.css share/doc/liblinphone/c/doxygen.svg @@ -231,6 +248,7 @@ share/doc/liblinphone/c/group__basic__call__tutorials.html share/doc/liblinphone/c/group__buddy__list.html share/doc/liblinphone/c/group__buddy__tutorials.html +share/doc/liblinphone/c/group__call-control.html share/doc/liblinphone/c/group__call__control.html share/doc/liblinphone/c/group__call__logs.html share/doc/liblinphone/c/group__call__misc.html @@ -242,6 +260,7 @@ share/doc/liblinphone/c/group__event__api.html share/doc/liblinphone/c/group__events.html share/doc/liblinphone/c/group__initializing.html +share/doc/liblinphone/c/group__ldap.html share/doc/liblinphone/c/group__linphone__address.html share/doc/liblinphone/c/group__logging.html share/doc/liblinphone/c/group__media__parameters.html @@ -360,6 +379,9 @@ share/doc/liblinphone/cpp/classlinphone_1_1Conference-members.html share/doc/liblinphone/cpp/classlinphone_1_1Conference.html share/doc/liblinphone/cpp/classlinphone_1_1Conference.png +share/doc/liblinphone/cpp/classlinphone_1_1ConferenceInfo-members.html +share/doc/liblinphone/cpp/classlinphone_1_1ConferenceInfo.html +share/doc/liblinphone/cpp/classlinphone_1_1ConferenceInfo.png share/doc/liblinphone/cpp/classlinphone_1_1ConferenceListener-members.html share/doc/liblinphone/cpp/classlinphone_1_1ConferenceListener.html share/doc/liblinphone/cpp/classlinphone_1_1ConferenceListener.png @@ -381,6 +403,9 @@ share/doc/liblinphone/cpp/classlinphone_1_1DialPlan-members.html share/doc/liblinphone/cpp/classlinphone_1_1DialPlan.html share/doc/liblinphone/cpp/classlinphone_1_1DialPlan.png +share/doc/liblinphone/cpp/classlinphone_1_1DigestAuthenticationPolicy-members.html +share/doc/liblinphone/cpp/classlinphone_1_1DigestAuthenticationPolicy.html +share/doc/liblinphone/cpp/classlinphone_1_1DigestAuthenticationPolicy.png share/doc/liblinphone/cpp/classlinphone_1_1ErrorInfo-members.html share/doc/liblinphone/cpp/classlinphone_1_1ErrorInfo.html share/doc/liblinphone/cpp/classlinphone_1_1ErrorInfo.png @@ -405,6 +430,9 @@ share/doc/liblinphone/cpp/classlinphone_1_1FriendListListener-members.html share/doc/liblinphone/cpp/classlinphone_1_1FriendListListener.html share/doc/liblinphone/cpp/classlinphone_1_1FriendListListener.png +share/doc/liblinphone/cpp/classlinphone_1_1FriendPhoneNumber-members.html +share/doc/liblinphone/cpp/classlinphone_1_1FriendPhoneNumber.html +share/doc/liblinphone/cpp/classlinphone_1_1FriendPhoneNumber.png share/doc/liblinphone/cpp/classlinphone_1_1Headers-members.html share/doc/liblinphone/cpp/classlinphone_1_1Headers.html share/doc/liblinphone/cpp/classlinphone_1_1Headers.png @@ -414,6 +442,12 @@ share/doc/liblinphone/cpp/classlinphone_1_1InfoMessage-members.html share/doc/liblinphone/cpp/classlinphone_1_1InfoMessage.html share/doc/liblinphone/cpp/classlinphone_1_1InfoMessage.png +share/doc/liblinphone/cpp/classlinphone_1_1Ldap-members.html +share/doc/liblinphone/cpp/classlinphone_1_1Ldap.html +share/doc/liblinphone/cpp/classlinphone_1_1Ldap.png +share/doc/liblinphone/cpp/classlinphone_1_1LdapParams-members.html +share/doc/liblinphone/cpp/classlinphone_1_1LdapParams.html +share/doc/liblinphone/cpp/classlinphone_1_1LdapParams.png share/doc/liblinphone/cpp/classlinphone_1_1LoggingService-members.html share/doc/liblinphone/cpp/classlinphone_1_1LoggingService.html share/doc/liblinphone/cpp/classlinphone_1_1LoggingService.png @@ -438,6 +472,9 @@ share/doc/liblinphone/cpp/classlinphone_1_1ParticipantDeviceIdentity-members.html share/doc/liblinphone/cpp/classlinphone_1_1ParticipantDeviceIdentity.html share/doc/liblinphone/cpp/classlinphone_1_1ParticipantDeviceIdentity.png +share/doc/liblinphone/cpp/classlinphone_1_1ParticipantDeviceListener-members.html +share/doc/liblinphone/cpp/classlinphone_1_1ParticipantDeviceListener.html +share/doc/liblinphone/cpp/classlinphone_1_1ParticipantDeviceListener.png share/doc/liblinphone/cpp/classlinphone_1_1ParticipantImdnState-members.html share/doc/liblinphone/cpp/classlinphone_1_1ParticipantImdnState.html share/doc/liblinphone/cpp/classlinphone_1_1ParticipantImdnState.png @@ -477,6 +514,12 @@ share/doc/liblinphone/cpp/classlinphone_1_1Range-members.html share/doc/liblinphone/cpp/classlinphone_1_1Range.html share/doc/liblinphone/cpp/classlinphone_1_1Range.png +share/doc/liblinphone/cpp/classlinphone_1_1Recorder-members.html +share/doc/liblinphone/cpp/classlinphone_1_1Recorder.html +share/doc/liblinphone/cpp/classlinphone_1_1Recorder.png +share/doc/liblinphone/cpp/classlinphone_1_1RecorderParams-members.html +share/doc/liblinphone/cpp/classlinphone_1_1RecorderParams.html +share/doc/liblinphone/cpp/classlinphone_1_1RecorderParams.png share/doc/liblinphone/cpp/classlinphone_1_1SearchResult-members.html share/doc/liblinphone/cpp/classlinphone_1_1SearchResult.html share/doc/liblinphone/cpp/classlinphone_1_1SearchResult.png Index: linphone-desktop/Makefile =================================================================== RCS file: /cvs/ports/telephony/linphone/linphone-desktop/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- linphone-desktop/Makefile 11 Mar 2022 19:58:33 -0000 1.3 +++ linphone-desktop/Makefile 26 Jun 2022 16:14:22 -0000 @@ -1,7 +1,6 @@ COMMENT = graphical audio and video SIP phone -V = 4.2.5 -REVISION = 0 +V = 4.4.6 MODULE = linphone-desktop PKGNAME = linphone-${V} @@ -25,7 +24,7 @@ WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickControls2 -WANTLIB += Qt5Svg Qt5TextToSpeech Qt5Widgets bctoolbox belcard +WANTLIB += Qt5Svg Qt5Test Qt5TextToSpeech Qt5Widgets bctoolbox belcard WANTLIB += c linphone linphone++ m mediastreamer ortp post-patch: @@ -33,7 +32,7 @@ # from https://salsa.debian.org/pkg-voip-team/linphone-stack/linphone-desktop/-/blob/master/debian/rules#L14 post-configure: - sed -i '/linphone-sdk/d' ${WRKBUILD}/linphone-app/cmake_builder/linphone_package/cmake_install.cmake + sed -i '/INSTALL.*linphone-sdk/d' ${WRKBUILD}/linphone-app/cmake_builder/linphone_package/cmake_install.cmake sed -i "s|${WRKBUILD}/OUTPUT|${TRUEPREFIX}|" ${WRKBUILD}/linphone-app/cmake_install.cmake sed -i "s|${WRKBUILD}/OUTPUT|${TRUEPREFIX}|" ${WRKBUILD}/cmake_install.cmake .include <bsd.port.mk> Index: linphone-desktop/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/linphone-desktop/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- linphone-desktop/distinfo 10 Jul 2021 12:03:20 -0000 1.1.1.1 +++ linphone-desktop/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (linphone-desktop-4.2.5.tar.gz) = KrJDL3q0F5yKq9UnV4jJw9pt+hdGd5KiwXYyJK8i4ag= -SIZE (linphone-desktop-4.2.5.tar.gz) = 2423856 +SHA256 (linphone-desktop-4.4.6.tar.gz) = PO9F+ftSdYtuP0asDbKl+z90NEGyp5/RZUljFYQfN0E= +SIZE (linphone-desktop-4.4.6.tar.gz) = 2750527 Index: linphone-desktop/patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/telephony/linphone/linphone-desktop/patches/patch-CMakeLists_txt,v retrieving revision 1.2 diff -u -r1.2 patch-CMakeLists_txt --- linphone-desktop/patches/patch-CMakeLists_txt 11 Mar 2022 19:58:33 -0000 1.2 +++ linphone-desktop/patches/patch-CMakeLists_txt 26 Jun 2022 16:14:22 -0000 @@ -3,18 +3,19 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${EN - +@@ -152,7 +152,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${EN list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") + list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video -include(ExternalProject) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -136,29 +135,9 @@ if(UNIX AND NOT APPLE) - set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") - list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") +@@ -191,26 +190,6 @@ if(ENABLE_BUILD_APP_PLUGINS) endif() + + +-if(NOT LINPHONE_QT_ONLY) -ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" - INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" @@ -25,7 +26,7 @@ - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -- #BUILD_ALWAYS NO #${DO_BUILD} +- BUILD_ALWAYS NO #${DO_BUILD} -) -ExternalProject_Add_Step(sdk force_build - COMMENT "Forcing build for 'desktop'" @@ -33,19 +34,14 @@ - DEPENDERS build - ALWAYS 1 -) +-endif() include(FindPkgConfig) --set(APP_DEPENDS sdk) - -- - find_package(Qt5 5.12 COMPONENTS Core REQUIRED) - - if ( NOT Qt5_FOUND ) -@@ -172,40 +151,6 @@ find_package(belcard CONFIG QUIET) + set(APP_DEPENDS sdk) +@@ -227,62 +206,6 @@ find_package(belcard CONFIG QUIET) find_package(Mediastreamer2 CONFIG QUIET) find_package(ortp CONFIG QUIET) -- -if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) - message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") - ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" @@ -54,22 +50,47 @@ - BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" - DEPENDS ${APP_DEPENDS} - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project" +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} - # ${APP_OPTIONS} - BUILD_ALWAYS ON - ) +- if( ENABLE_BUILD_APP_PLUGINS) +- ExternalProject_Add(app-plugins PREFIX "${CMAKE_BINARY_DIR}/plugins-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/plugins-app" +- DEPENDS linphone-qt +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- ) +- endif() - install(CODE "message(STATUS Running install)") - set(AUTO_REGENERATION auto_regeneration) -- add_custom_target(${AUTO_REGENERATION} ALL -- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS linphone-qt) +- if( ENABLE_BUILD_APP_PLUGINS) +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS app-plugins) +- else() +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS linphone-qt) +- endif() -else() - message("Adding Linphone Desktop in an IDE-friendly state") - set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -- add_dependencies(app-library ${APP_DEPENDS}) ++message("Adding Linphone Desktop in an IDE-friendly state") ++set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") + add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +- if(NOT LINPHONE_QT_ONLY) +- add_dependencies(app-library ${APP_DEPENDS}) +- endif() +- if( ENABLE_BUILD_APP_PLUGINS) +- add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") +- endif() -endif() -ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" @@ -80,8 +101,5 @@ - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} - EXCLUDE_FROM_ALL ON -- BUILD_ALWAYS ON +- #BUILD_ALWAYS ON -) -+message("Adding Linphone Desktop in an IDE-friendly state") -+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) Index: linphone-desktop/patches/patch-linphone-app_CMakeLists_txt =================================================================== RCS file: /cvs/ports/telephony/linphone/linphone-desktop/patches/patch-linphone-app_CMakeLists_txt,v retrieving revision 1.2 diff -u -r1.2 patch-linphone-app_CMakeLists_txt --- linphone-desktop/patches/patch-linphone-app_CMakeLists_txt 11 Mar 2022 19:58:33 -0000 1.2 +++ linphone-desktop/patches/patch-linphone-app_CMakeLists_txt 26 Jun 2022 16:14:22 -0000 @@ -20,5 +20,5 @@ - -project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + if(ENABLE_BUILD_VERBOSE) - #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") Index: linphone-desktop/patches/patch-linphone-app_cmake_builder_linphone_package_CMakeLists_txt =================================================================== RCS file: /cvs/ports/telephony/linphone/linphone-desktop/patches/patch-linphone-app_cmake_builder_linphone_package_CMakeLists_txt,v retrieving revision 1.2 diff -u -r1.2 patch-linphone-app_cmake_builder_linphone_package_CMakeLists_txt --- linphone-desktop/patches/patch-linphone-app_cmake_builder_linphone_package_CMakeLists_txt 11 Mar 2022 19:58:33 -0000 1.2 +++ linphone-desktop/patches/patch-linphone-app_cmake_builder_linphone_package_CMakeLists_txt 26 Jun 2022 16:14:22 -0000 @@ -8,7 +8,7 @@ Index: linphone-app/cmake_builder/linphone_package/CMakeLists.txt --- linphone-app/cmake_builder/linphone_package/CMakeLists.txt.orig +++ linphone-app/cmake_builder/linphone_package/CMakeLists.txt -@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../. +@@ -39,15 +39,7 @@ set(QT_PATH "${Qt5Core_DIR}/../../..") # ============================================================================== # Build package version. # ============================================================================== @@ -25,8 +25,8 @@ set(APP_PROJECT_VERSION "0.0.0") endif () string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") -@@ -243,8 +235,6 @@ else()# Not Windows and Apple - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") +@@ -275,8 +267,6 @@ else()# Not Windows and Apple + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) set(APP_QT_CONF_PATH "") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/qt.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/../../qt.conf" @ONLY) Index: linphone-desktop/patches/patch-linphone-app_src_app_App_cpp =================================================================== RCS file: /cvs/ports/telephony/linphone/linphone-desktop/patches/patch-linphone-app_src_app_App_cpp,v retrieving revision 1.2 diff -u -r1.2 patch-linphone-app_src_app_App_cpp --- linphone-desktop/patches/patch-linphone-app_src_app_App_cpp 11 Mar 2022 19:58:33 -0000 1.2 +++ linphone-desktop/patches/patch-linphone-app_src_app_App_cpp 26 Jun 2022 16:14:22 -0000 @@ -1,25 +1,25 @@ Index: linphone-app/src/app/App.cpp --- linphone-app/src/app/App.cpp.orig +++ linphone-app/src/app/App.cpp -@@ -73,7 +73,7 @@ namespace { +@@ -61,7 +61,7 @@ + using namespace std; - constexpr char AssistantViewName[] = "Assistant"; - -- #ifdef Q_OS_LINUX -+ #if defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) - const QString AutoStartDirectory(QDir::homePath().append(QStringLiteral("/.config/autostart/"))); - #elif defined(Q_OS_MACOS) - const QString OsascriptExecutable(QStringLiteral("osascript")); -@@ -86,7 +86,7 @@ namespace { + namespace { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) + const QString AutoStartDirectory(QDir::homePath().append(QStringLiteral("/.config/autostart/"))); + #elif defined(Q_OS_MACOS) + const QString OsascriptExecutable(QStringLiteral("osascript")); +@@ -74,7 +74,7 @@ const QString AutoStartSettingsFilePath( // ----------------------------------------------------------------------------- -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) - static inline bool autoStartEnabled () { - return QDir(AutoStartDirectory).exists() && QFile(AutoStartDirectory + EXECUTABLE_NAME ".desktop").exists(); - } -@@ -679,7 +679,7 @@ QString App::getLocale () const { + static inline bool autoStartEnabled () { + return QDir(AutoStartDirectory).exists() && QFile(AutoStartDirectory + EXECUTABLE_NAME ".desktop").exists(); + } +@@ -840,7 +840,7 @@ QString App::getLocale () const { // ----------------------------------------------------------------------------- @@ -27,4 +27,4 @@ +#if defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) void App::setAutoStart (bool enabled) { - if (enabled == mAutoStart) + if (enabled == mAutoStart) Index: linphone-desktop/patches/patch-linphone-app_src_app_cli_Cli_cpp =================================================================== RCS file: linphone-desktop/patches/patch-linphone-app_src_app_cli_Cli_cpp diff -N linphone-desktop/patches/patch-linphone-app_src_app_cli_Cli_cpp --- linphone-desktop/patches/patch-linphone-app_src_app_cli_Cli_cpp 11 Mar 2022 19:58:33 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -https://gitlab.linphone.org/BC/public/linphone-desktop/-/commit/89ea3a8cb8c002258b932d4d77fd426f492382b6#4ffbc771f870da769da19839ba8a3b4ab37d33f1 - -Index: linphone-app/src/app/cli/Cli.cpp ---- linphone-app/src/app/cli/Cli.cpp.orig -+++ linphone-app/src/app/cli/Cli.cpp -@@ -147,7 +147,7 @@ static void cliInitiateConference (QHash<QString, QStr - - qInfo() << QStringLiteral("Create conference with id: `%1`.").arg(id); - auto confParameters = core->createConferenceParams(); -- confParameters->enableVideo(false);// Video is not yet fully supported by the application in conference -+ confParameters->setVideoEnabled(false);// Video is not yet fully supported by the application in conference - conference = core->createConferenceWithParams(confParameters); - conference->setId(Utils::appStringToCoreString(id)); - Index: linphone-desktop/patches/patch-linphone-app_src_components_camera_MSFunctions_hpp =================================================================== RCS file: linphone-desktop/patches/patch-linphone-app_src_components_camera_MSFunctions_hpp diff -N linphone-desktop/patches/patch-linphone-app_src_components_camera_MSFunctions_hpp --- linphone-desktop/patches/patch-linphone-app_src_components_camera_MSFunctions_hpp 11 Mar 2022 19:58:33 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -Index: linphone-app/src/components/camera/MSFunctions.hpp ---- linphone-app/src/components/camera/MSFunctions.hpp.orig -+++ linphone-app/src/components/camera/MSFunctions.hpp -@@ -162,8 +162,8 @@ class MSFunctions { (public) - GL_CALL(glPixelStorei(pname, param)); - } - -- static void qtResolveGlShaderSource (GLuint shader, GLsizei count, const char **string, const GLint *length) { -- GL_CALL(glShaderSource(shader, count, string, length)); -+ static void qtResolveGlShaderSource (GLuint shader, GLsizei count, const char * const *string, const GLint *length) { -+ GL_CALL(glShaderSource(shader, count, (const char **) string, length)); - } - - static void qtResolveGlTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels) { Index: linphone-desktop/patches/patch-linphone-app_src_components_conference_ConferenceAddModel_cpp =================================================================== RCS file: linphone-desktop/patches/patch-linphone-app_src_components_conference_ConferenceAddModel_cpp diff -N linphone-desktop/patches/patch-linphone-app_src_components_conference_ConferenceAddModel_cpp --- linphone-desktop/patches/patch-linphone-app_src_components_conference_ConferenceAddModel_cpp 11 Mar 2022 19:58:33 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -https://gitlab.linphone.org/BC/public/linphone-desktop/-/commit/89ea3a8cb8c002258b932d4d77fd426f492382b6#4ffbc771f870da769da19839ba8a3b4ab37d33f1 - -Index: linphone-app/src/components/conference/ConferenceAddModel.cpp ---- linphone-app/src/components/conference/ConferenceAddModel.cpp.orig -+++ linphone-app/src/components/conference/ConferenceAddModel.cpp -@@ -137,7 +137,7 @@ void ConferenceHelperModel::ConferenceAddModel::update - shared_ptr<linphone::Conference> conference = mConferenceHelperModel->mCore->getConference(); - if(!conference){ - auto parameters = mConferenceHelperModel->mCore->createConferenceParams(); -- parameters->enableVideo(false);// Video is not yet fully supported by the application in conference -+ parameters->setVideoEnabled(false);// Video is not yet fully supported by the application in conference - conference = mConferenceHelperModel->mCore->createConferenceWithParams(parameters); - } - auto currentCalls = CoreManager::getInstance()->getCore()->getCalls(); Index: linphone-desktop/patches/patch-linphone-app_src_config_h_cmake =================================================================== RCS file: /cvs/ports/telephony/linphone/linphone-desktop/patches/patch-linphone-app_src_config_h_cmake,v retrieving revision 1.2 diff -u -r1.2 patch-linphone-app_src_config_h_cmake --- linphone-desktop/patches/patch-linphone-app_src_config_h_cmake 11 Mar 2022 19:58:33 -0000 1.2 +++ linphone-desktop/patches/patch-linphone-app_src_config_h_cmake 26 Jun 2022 16:14:22 -0000 @@ -1,8 +1,9 @@ Index: linphone-app/src/config.h.cmake --- linphone-app/src/config.h.cmake.orig +++ linphone-app/src/config.h.cmake -@@ -28,3 +28,4 @@ +@@ -30,4 +30,5 @@ #cmakedefine ENABLE_UPDATE_CHECK 1 #cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}" #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" +#define LINPHONE_QT_GIT_VERSION "${PROJECT_VERSION}" + #cmakedefine ENABLE_APP_WEBVIEW "${ENABLE_APP_WEBVIEW}" Index: linphone-desktop/pkg/PLIST =================================================================== RCS file: /cvs/ports/telephony/linphone/linphone-desktop/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- linphone-desktop/pkg/PLIST 11 Mar 2022 19:58:33 -0000 1.3 +++ linphone-desktop/pkg/PLIST 26 Jun 2022 16:14:22 -0000 @@ -1,4 +1,10 @@ @bin bin/linphone +include/LinphoneApp/ +include/LinphoneApp/LinphonePlugin.hpp +include/LinphoneApp/PluginDataAPI.hpp +include/LinphoneApp/PluginExample.json +include/LinphoneApp/PluginNetworkHelper.hpp +@so lib/libapp-plugin.so share/applications/linphone.desktop share/icons/hicolor/128x128/apps/linphone.png share/icons/hicolor/16x16/apps/linphone.png Index: mediastreamer2/Makefile =================================================================== RCS file: /cvs/ports/telephony/linphone/mediastreamer2/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- mediastreamer2/Makefile 28 May 2022 06:20:03 -0000 1.8 +++ mediastreamer2/Makefile 26 Jun 2022 16:14:22 -0000 @@ -1,9 +1,8 @@ COMMENT = streaming engine for voice/video telephony applications MODULE = mediastreamer2 -REVISION = 1 -SHARED_LIBS += mediastreamer 0.0 # 11 +SHARED_LIBS += mediastreamer 1.0 # 11 CONFIGURE_ARGS =-DENABLE_STATIC=NO \ -DENABLE_DOC=NO \ Index: mediastreamer2/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/mediastreamer2/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- mediastreamer2/distinfo 10 Jul 2021 17:02:41 -0000 1.2 +++ mediastreamer2/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (mediastreamer2-5.0.0.tar.gz) = rkbrXVJZCyXIrGYLAgjn78+7yZaKCWfmPIaE4VP/D1U= -SIZE (mediastreamer2-5.0.0.tar.gz) = 25284226 +SHA256 (mediastreamer2-5.1.45.tar.gz) = ESAs1bIOtwH8YMKNpMQu85szWjrXCjV/cYjzfx2EWsk= +SIZE (mediastreamer2-5.1.45.tar.gz) = 25301075 Index: mediastreamer2/pkg/PLIST =================================================================== RCS file: /cvs/ports/telephony/linphone/mediastreamer2/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- mediastreamer2/pkg/PLIST 11 Mar 2022 19:58:33 -0000 1.2 +++ mediastreamer2/pkg/PLIST 26 Jun 2022 16:14:22 -0000 @@ -13,6 +13,7 @@ include/mediastreamer2/ice.h include/mediastreamer2/mediastream.h include/mediastreamer2/ms_srtp.h +include/mediastreamer2/msanalysedisplay.h include/mediastreamer2/msasync.h include/mediastreamer2/msaudiomixer.h include/mediastreamer2/mschanadapter.h @@ -32,6 +33,8 @@ include/mediastreamer2/msjava.h include/mediastreamer2/msjpegwriter.h include/mediastreamer2/msmediaplayer.h +include/mediastreamer2/msmediarecorder.h +include/mediastreamer2/msmire.h include/mediastreamer2/msogl.h include/mediastreamer2/msogl_functions.h include/mediastreamer2/mspcapfileplayer.h Index: ortp/Makefile =================================================================== RCS file: /cvs/ports/telephony/linphone/ortp/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- ortp/Makefile 18 Mar 2022 21:15:46 -0000 1.4 +++ ortp/Makefile 26 Jun 2022 16:14:22 -0000 @@ -2,7 +2,7 @@ MODULE = ortp -SHARED_LIBS += ortp 0.0 # 15 +SHARED_LIBS += ortp 1.0 # 15 CONFIGURE_ARGS= -DENABLE_STATIC=NO \ -DENABLE_TESTS=NO \ Index: ortp/distinfo =================================================================== RCS file: /cvs/ports/telephony/linphone/ortp/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- ortp/distinfo 10 Jul 2021 16:58:38 -0000 1.2 +++ ortp/distinfo 26 Jun 2022 16:14:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (ortp-5.0.0.tar.gz) = 5XYvGiL2vbsfs24Y4n5hCEienQck2JjCDhbLmJgwnrw= -SIZE (ortp-5.0.0.tar.gz) = 234013 +SHA256 (ortp-5.1.45.tar.gz) = /Vh3StCkS78OKOlqk9IcuEmMVjWw8N2suaxJcODDKKY= +SIZE (ortp-5.1.45.tar.gz) = 240095 Index: ortp/pkg/PLIST =================================================================== RCS file: /cvs/ports/telephony/linphone/ortp/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- ortp/pkg/PLIST 11 Mar 2022 19:58:33 -0000 1.2 +++ ortp/pkg/PLIST 26 Jun 2022 16:14:22 -0000 @@ -2,6 +2,7 @@ include/ortp/ include/ortp/b64.h include/ortp/event.h +include/ortp/fecstream.h include/ortp/logging.h include/ortp/nack.h include/ortp/ortp.h
