oasis

commit: f1fb809ce8bc7fa1bec70abf9f70da5af85b547d
parent 979ec8e98ba1bf83bef4915cb4178c56d5fcb71d
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  3 Jan 2020 13:00:57 -0800

ffmpeg: Remove libressl patch

We now build against libtls-bearssl.

Diffstat:
D
pkg/ffmpeg/patch/0001-Fix-build-with-LibreSSL.patch
71
-----------------------------------------------------------------------
R
pkg/ffmpeg/patch/0002-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch -> pkg/ffmpeg/patch/0001-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch
0

M
pkg/ffmpeg/ver
2
+-

3 files changed, 1 insertion(+), 72 deletions(-)
diff --git a/pkg/ffmpeg/patch/0001-Fix-build-with-LibreSSL.patch b/pkg/ffmpeg/patch/0001-Fix-build-with-LibreSSL.patch
@@ -1,71 +0,0 @@
-From 22d9fc0b4c4b8e83d638a3dffa848292f6b58437 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 28 Oct 2016 00:33:53 -0700
-Subject: [PATCH] Fix build with LibreSSL
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- libavformat/tls_openssl.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
-index 59a86150a7..eb9e0bc24f 100644
---- a/libavformat/tls_openssl.c
-+++ b/libavformat/tls_openssl.c
-@@ -43,7 +43,7 @@ typedef struct TLSContext {
-     TLSShared tls_shared;
-     SSL_CTX *ctx;
-     SSL *ssl;
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     BIO_METHOD* url_bio_method;
- #endif
- } TLSContext;
-@@ -137,7 +137,7 @@ static int tls_close(URLContext *h)
-         SSL_CTX_free(c->ctx);
-     if (c->tls_shared.tcp)
-         ffurl_close(c->tls_shared.tcp);
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000f)
-     if (c->url_bio_method)
-         BIO_meth_free(c->url_bio_method);
- #endif
-@@ -147,7 +147,7 @@ static int tls_close(URLContext *h)
- 
- static int url_bio_create(BIO *b)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     BIO_set_init(b, 1);
-     BIO_set_data(b, NULL);
-     BIO_set_flags(b, 0);
-@@ -164,7 +164,7 @@ static int url_bio_destroy(BIO *b)
-     return 1;
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- #define GET_BIO_DATA(x) BIO_get_data(x)
- #else
- #define GET_BIO_DATA(x) (x)->ptr
-@@ -212,7 +212,7 @@ static int url_bio_bputs(BIO *b, const char *str)
-     return url_bio_bwrite(b, str, strlen(str));
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL
- static BIO_METHOD url_bio_method = {
-     .type = BIO_TYPE_SOURCE_SINK,
-     .name = "urlprotocol bio",
-@@ -276,7 +276,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
-         ret = AVERROR(EIO);
-         goto fail;
-     }
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     p->url_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK, "urlprotocol bio");
-     BIO_meth_set_write(p->url_bio_method, url_bio_bwrite);
-     BIO_meth_set_read(p->url_bio_method, url_bio_bread);
--- 
-2.17.0
-
diff --git a/pkg/ffmpeg/patch/0002-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch b/pkg/ffmpeg/patch/0001-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch
diff --git a/pkg/ffmpeg/ver b/pkg/ffmpeg/ver
@@ -1 +1 @@
-4.2.1 r2
+4.2.1 r3