diff --git a/srcpkgs/tg_owt/patches/libressl.patch b/srcpkgs/tg_owt/patches/libressl.patch deleted file mode 100644 index fc352a2a64c..00000000000 --- a/srcpkgs/tg_owt/patches/libressl.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 3f2d8238846d4795f1292c05923b9f212dc4d022 Mon Sep 17 00:00:00 2001 -From: Charlie Li -Date: Sat, 21 Nov 2020 14:24:04 -0500 -Subject: [PATCH] Fix build with LibreSSL - -LibreSSL's dtls1.h uses some definitions from ssl.h and ssl3.h, but -expects consumers to include them. Reorder and include them before -dtls1.h. - -LibreSSL does not define DTLS1_2_VERSION. Remove them from view. ---- - src/rtc_base/openssl_stream_adapter.cc | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/src/rtc_base/openssl_stream_adapter.cc b/src/rtc_base/openssl_stream_adapter.cc -index 7f4b79a5..037002bc 100644 ---- a/src/rtc_base/openssl_stream_adapter.cc -+++ b/src/rtc_base/openssl_stream_adapter.cc -@@ -17,8 +17,11 @@ - #include - #include - #ifndef OPENSSL_IS_BORINGSSL --#include - #include -+#ifdef LIBRESSL_VERSION_NUMBER -+#include -+#endif -+#include - #endif - - #include -@@ -392,8 +395,10 @@ SSLProtocolVersion OpenSSLStreamAdapter::GetSslVersion() const { - if (ssl_mode_ == SSL_MODE_DTLS) { - if (ssl_version == DTLS1_VERSION) { - return SSL_PROTOCOL_DTLS_10; -+#ifndef LIBRESSL_VERSION_NUMBER - } else if (ssl_version == DTLS1_2_VERSION) { - return SSL_PROTOCOL_DTLS_12; -+#endif - } - } else { - if (ssl_version == TLS1_VERSION) { -@@ -985,15 +990,27 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() { - case SSL_PROTOCOL_TLS_12: - default: - SSL_CTX_set_max_proto_version( -+#ifdef LIBRESSL_VERSION_NUMBER -+ ctx, TLS1_2_VERSION); -+#else - ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION); -+#endif - break; - } - } else { - // TODO(https://bugs.webrtc.org/10261): Make this the default in M84. - SSL_CTX_set_min_proto_version( -+#ifdef LIBRESSL_VERSION_NUMBER -+ ctx, TLS1_2_VERSION); -+#else - ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION); -+#endif - SSL_CTX_set_max_proto_version( -+#ifdef LIBRESSL_VERSION_NUMBER -+ ctx, TLS1_2_VERSION); -+#else - ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION); -+#endif - } - - #ifdef OPENSSL_IS_BORINGSSL diff --git a/srcpkgs/tg_owt/patches/libressl.patch.args b/srcpkgs/tg_owt/patches/libressl.patch.args deleted file mode 100644 index 2eba1cb3c5c..00000000000 --- a/srcpkgs/tg_owt/patches/libressl.patch.args +++ /dev/null @@ -1 +0,0 @@ --Np1 diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template index fa0d55fc4ae..b63fd17281a 100644 --- a/srcpkgs/tg_owt/template +++ b/srcpkgs/tg_owt/template @@ -1,9 +1,8 @@ # Template file for 'tg_owt' pkgname=tg_owt -version=0.0.0.1 -revision=2 -_commit=756fd0fb5f40ffb4244c675208e84de781f766f3 -_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9 +version=0.0.0.20210321 +revision=1 +_commit=2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452 wrksrc="tg_owt-$_commit" build_style=cmake @@ -18,7 +17,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/desktop-app/tg_owt" distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz" -checksum="@43d09b00a43f9206b1f04c6d6697f4b0cb3be0285100bf5df91144b1d689c89a +checksum="@2873f3c9a6e5a93976623d4502af59bf6c8a3536aa9928acf45cea0a20e23ec0 @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3" skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"