Index: head/net-im/telegram-desktop/Makefile =================================================================== --- head/net-im/telegram-desktop/Makefile (revision 561248) +++ head/net-im/telegram-desktop/Makefile (revision 561249) @@ -1,111 +1,112 @@ # $FreeBSD$ PORTNAME= telegram-desktop DISTVERSION= 2.4.4 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= henry.hu.sh@gmail.com COMMENT= Telegram Desktop messaging app LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe NOT_FOR_ARCHS_REASON= Only little endian is supported BROKEN_i386= Does not build, webrtc related. BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \ dee>0:devel/dee \ microsoft-gsl>0:devel/microsoft-gsl \ pulseaudio>0:audio/pulseaudio \ range-v3>0:devel/range-v3 \ tl-expected>0:devel/tl-expected \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdbusmenu-qt5.so:devel/libdbusmenu-qt \ libenchant-2.so:textproc/enchant2 \ libhunspell-1.7.so:textproc/hunspell \ libjpeg.so:graphics/jpeg-turbo \ liblz4.so:archivers/liblz4 \ libminizip.so:archivers/minizip \ libopenal.so:audio/openal-soft \ libopus.so:audio/opus \ libqrcodegencpp.so:graphics/qr-code-generator \ libusrsctp.so:net/libusrsctp \ libxkbcommon.so:x11/libxkbcommon \ libxxhash.so:devel/xxhash USES= cmake compiler:c++17-lang desktop-file-utils gl \ gnome pkgconfig python:3.7,build qt:5 ssl xorg # see Bugzilla #245452 for details NO_CCACHE= yes USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop GH_TUPLE= desktop-app:tg_owt:c73a471:tg_owt/tg_owt USE_GNOME= glib20 USE_QT= core dbus gui imageformats network widgets buildtools_build \ qmake_build wayland USE_XORG= x11 xcb USE_GL= gl CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_RLOTTIE DESKTOP_APP_USE_PACKAGED_VARIANT \ DESKTOP_APP_USE_GLIBC_WRAPS TDESKTOP_USE_PACKAGED_TGVOIP \ DESKTOP_APP_USE_PACKAGED_FONTS CMAKE_ARGS= -DDESKTOP_APP_SPECIAL_TARGET="" -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \ -Ddisable_autoupdate=1 \ -DDESKTOP_APP_WEBRTC_LOCATION=${WRKSRC}/tg_owt/src # Disable DCHECKs, otherwise video calls will crash. CXXFLAGS+= -DNDEBUG # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_ID= 601761 TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA. # It dynamically loads PulseAudio, and if this fails, it loads ALSA. # If both of them are not installed, then voice calls do not work, but other functionalities still work. OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO OPTIONS_DEFINE= GTK OPTIONS_DEFAULT= ALSA AUDIO_DESC= Audio backend for voice calls GTK_DESC= Gtk integration (Use Gtk dialogs, etc.) ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio GTK_CMAKE_BOOL_OFF= TDESKTOP_DISABLE_GTK_INTEGRATION INSTALLS_ICONS= yes .include .if ${PORT_OPTIONS:MGTK} USE_GNOME+= gtk30 .endif .include pre-configure: @cd ${WRKSRC}/tg_owt && \ ${MKDIR} out/${CMAKE_BUILD_TYPE} && \ cd out/${CMAKE_BUILD_TYPE} && \ ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/tg_owt pre-build: @cd ${WRKSRC}/tg_owt/out/${CMAKE_BUILD_TYPE} && ${DO_MAKE_BUILD} .include Index: head/net-im/telegram-desktop/files/patch-tg__owt_src_media_sctp_sctp__transport.cc =================================================================== --- head/net-im/telegram-desktop/files/patch-tg__owt_src_media_sctp_sctp__transport.cc (revision 561248) +++ head/net-im/telegram-desktop/files/patch-tg__owt_src_media_sctp_sctp__transport.cc (revision 561249) @@ -1,11 +1,20 @@ ---- tg_owt/src/media/sctp/sctp_transport.cc.orig 2020-08-30 09:41:57 UTC +--- tg_owt/src/media/sctp/sctp_transport.cc.orig 2020-10-07 14:11:02 UTC +++ tg_owt/src/media/sctp/sctp_transport.cc -@@ -43,7 +43,7 @@ enum PreservedErrno { +@@ -43,7 +43,7 @@ #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" #include "rtc_base/trace_event.h" -#include "usrsctplib/usrsctp.h" +#include "usrsctp.h" namespace { +@@ -470,7 +470,7 @@ + return transport; + } + +- static int SendThresholdCallback(struct socket* sock, uint32_t sb_free) { ++ static int SendThresholdCallback(struct socket* sock, uint32_t sb_free, void *ulp_info) { + // Fired on our I/O thread. SctpTransport::OnPacketReceived() gets + // a packet containing acknowledgments, which goes into usrsctp_conninput, + // and then back here.