diff --git a/net-im/tg_owt/Makefile b/net-im/tg_owt/Makefile index 2db259476edd..fb1bc2e21067 100644 --- a/net-im/tg_owt/Makefile +++ b/net-im/tg_owt/Makefile @@ -1,38 +1,38 @@ # Created by: Henry Hu PORTNAME= tg_owt PORTVERSION= 0.0.20211021 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MAINTAINER= glebius@FreeBSD.org COMMENT= Webrtc library used by telegram-desktop LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libevent.so:devel/libevent \ libjpeg.so:graphics/jpeg-turbo \ libopus.so:audio/opus \ libpipewire-0.3.so:multimedia/pipewire \ libusrsctp.so:net/libusrsctp \ libvpx.so:multimedia/libvpx USES= cmake pkgconfig xorg USE_XORG= x11 xcomposite xdamage xrender xrandr xtst USE_GITHUB= yes GH_ACCOUNT= desktop-app GH_TAGNAME= d578c76 # libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv GH_TUPLE= webmproject:libvpx:5b63f0f:libvpx/src/third_party/libvpx/source/libvpx \ HenryHu:libyuv:ad89006:libyuv/src/third_party/libyuv CMAKE_OFF= BUILD_SHARED_LIBS TG_OWT_BUILD_AUDIO_BACKENDS # Disable DCHECKs, otherwise video calls will crash. CXXFLAGS+= -DNDEBUG .include diff --git a/net-im/tg_owt/files/patch-src_third__party_abseil-cpp_absl_meta_type__traits.h b/net-im/tg_owt/files/patch-src_third__party_abseil-cpp_absl_meta_type__traits.h new file mode 100644 index 000000000000..eeb40597b6c8 --- /dev/null +++ b/net-im/tg_owt/files/patch-src_third__party_abseil-cpp_absl_meta_type__traits.h @@ -0,0 +1,30 @@ +--- src/third_party/abseil-cpp/absl/meta/type_traits.h.orig 2021-10-21 06:15:41 UTC ++++ src/third_party/abseil-cpp/absl/meta/type_traits.h +@@ -616,19 +616,14 @@ using common_type_t = typename std::common_type: + template + using underlying_type_t = typename std::underlying_type::type; + +-#if _MSVC_LANG > 201703L +-template +-struct result_of_helper; +-template +-struct result_of_helper { +- using type = std::invoke_result_t; +-}; +-template +-using result_of_t = typename result_of_helper::type; +-#else // C++20 +-template +-using result_of_t = typename std::result_of::type; +-#endif // C++20 ++#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) ++// std::result_of is deprecated (C++17) or removed (C++20) ++template struct result_of; ++template ++struct result_of : std::invoke_result {}; ++#else ++template using result_of = std::result_of; ++#endif + + namespace type_traits_internal { + // In MSVC we can't probe std::hash or stdext::hash because it triggers a