2 files changed, 2 insertions, 68 deletions

diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 871a5a3c7741..81ebc458c471 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-10-15 15:59:36 UTC
+--- configure.orig	2018-04-20 10:02:55 UTC
 +++ configure
-@@ -3371,12 +3371,7 @@ target_os_default=$(tolower $(uname -s))
+@@ -3516,12 +3516,7 @@ target_os_default=$(tolower $(uname -s))
  host_os=$target_os_default
  
  # machine
@@ -14,13 +14,3 @@
  cpu="generic"
  intrinsics="none"
  
-@@ -6491,6 +6486,9 @@ elif enabled llvm_gcc; then
- elif enabled clang; then
-     check_cflags -mllvm -stack-alignment=16
-     check_cflags -mstack-alignment=16
-+    if enabled x86_32; then
-+        check_cflags -mstackrealign
-+    fi
-     check_cflags -Qunused-arguments
-     check_cflags -Werror=implicit-function-declaration
-     check_cflags -Werror=missing-prototypes
diff --git a/multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c b/multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c
deleted file mode 100644
index b602b92a62e4..000000000000
--- a/multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- libavformat/tls_openssl.c.orig	2017-04-13 01:55:55 UTC
-+++ 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)
-     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);