summaryrefslogtreecommitdiff
path: root/package/ffmpeg/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-05-25 22:00:44 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2018-05-27 08:26:55 +0200
commita81f0bbe58cb2e70ee666456e3084b1f41c647f4 (patch)
tree04b923c34543b75a8439e8c265f90db54492b449 /package/ffmpeg/patches
parent07bac1dc01a3e6216fe653acd33311febc84108a (diff)
kodi: update to leia 18 alpha, add all required packages
Diffstat (limited to 'package/ffmpeg/patches')
-rw-r--r--package/ffmpeg/patches/patch-libavformat_tls_openssl_c58
1 files changed, 0 insertions, 58 deletions
diff --git a/package/ffmpeg/patches/patch-libavformat_tls_openssl_c b/package/ffmpeg/patches/patch-libavformat_tls_openssl_c
deleted file mode 100644
index fabb23d1c..000000000
--- a/package/ffmpeg/patches/patch-libavformat_tls_openssl_c
+++ /dev/null
@@ -1,58 +0,0 @@
-https://raw.githubusercontent.com/gentoo/libressl/master/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
-
---- ffmpeg-3.4.1.orig/libavformat/tls_openssl.c 2017-12-10 22:35:10.000000000 +0100
-+++ ffmpeg-3.4.1/libavformat/tls_openssl.c 2018-02-12 18:03:02.844775701 +0100
-@@ -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)
- BIO_METHOD* url_bio_method;
- #endif
- } TLSContext;
-@@ -68,7 +68,7 @@ static unsigned long openssl_thread_id(v
-
- 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 @@ static int url_bio_destroy(BIO *b)
- 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 @@ static int url_bio_bputs(BIO *b, const c
- 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 @@ 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)
- if (c->url_bio_method)
- BIO_meth_free(c->url_bio_method);
- #endif
-@@ -266,7 +266,7 @@ static int tls_open(URLContext *h, const
- 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);