aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Strogin <stefan.strogin@gmail.com>2019-03-05 22:12:58 +0200
committerStefan Strogin <stefan.strogin@gmail.com>2019-03-05 22:12:58 +0200
commitf16bab74560cd18d976b937bd257d5516aa1bbfd (patch)
tree4e3afbac59e8d005a07dbc887e5a0e0dafe5fa12 /media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
parentwww-client/lynx: drop; fixed upstream and in gentoo.git (diff)
downloadlibressl-f16bab74560cd18d976b937bd257d5516aa1bbfd.tar.gz
libressl-f16bab74560cd18d976b937bd257d5516aa1bbfd.tar.bz2
libressl-f16bab74560cd18d976b937bd257d5516aa1bbfd.zip
media-video/ffmpeg: drop; fixed upstream and in gentoo.git
Bug: https://bugs.gentoo.org/569818 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
Diffstat (limited to 'media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch')
-rw-r--r--media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch b/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
deleted file mode 100644
index afd130d..0000000
--- a/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur ffmpeg-3.3.orig/libavformat/tls_openssl.c ffmpeg-3.3/libavformat/tls_openssl.c
---- ffmpeg-3.3.orig/libavformat/tls_openssl.c 2017-04-14 09:44:45.035482446 -0700
-+++ ffmpeg-3.3/libavformat/tls_openssl.c 2017-04-14 09:47:43.399194503 -0700
-@@ -43,7 +43,7 @@
- TLSShared tls_shared;
- SSL_CTX *ctx;
- SSL *ssl;
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- BIO_METHOD* url_bio_method;
- #endif
- } TLSContext;
-@@ -68,7 +68,7 @@
-
- static int url_bio_create(BIO *b)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- BIO_set_init(b, 1);
- BIO_set_data(b, NULL);
- BIO_set_flags(b, 0);
-@@ -85,7 +85,7 @@
- return 1;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- #define GET_BIO_DATA(x) BIO_get_data(x)
- #else
- #define GET_BIO_DATA(x) (x)->ptr
-@@ -129,7 +129,7 @@
- return url_bio_bwrite(b, str, strlen(str));
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
- static BIO_METHOD url_bio_method = {
- .type = BIO_TYPE_SOURCE_SINK,
- .name = "urlprotocol bio",
-@@ -208,7 +208,7 @@
- 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)
- if (c->url_bio_method)
- BIO_meth_free(c->url_bio_method);
- #endif
-@@ -266,7 +266,7 @@
- ret = AVERROR(EIO);
- goto fail;
- }
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- 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);