aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2017-04-14 10:01:39 -0700
committerAric Belsito <lluixhi@gmail.com>2017-04-14 10:02:53 -0700
commit1dc69e381468a069b9bf2b6d1c347ed97d8a95dd (patch)
treebc3ac8028d3f2a0365074a775a949874dbff22ca /media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
parentapp-crypt/rhash: add most recent version (diff)
downloadlibressl-1dc69e381468a069b9bf2b6d1c347ed97d8a95dd.tar.gz
libressl-1dc69e381468a069b9bf2b6d1c347ed97d8a95dd.tar.bz2
libressl-1dc69e381468a069b9bf2b6d1c347ed97d8a95dd.zip
media-video/ffmpeg: version bump to 3.3
minor change in patch since 3.2 (semicolons)
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, 57 insertions, 0 deletions
diff --git a/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch b/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
new file mode 100644
index 0000000..afd130d
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
@@ -0,0 +1,57 @@
+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);