diff options
Diffstat (limited to 'pkg/ffmpeg/patch')
| -rw-r--r-- | pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch | 25 | ||||
| -rw-r--r-- | pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch | 71 |
2 files changed, 96 insertions, 0 deletions
diff --git a/pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch b/pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch new file mode 100644 index 00000000..79c67461 --- /dev/null +++ b/pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch @@ -0,0 +1,25 @@ +From 32670e637b460f04d48067174f52ba2f1beb2a45 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sat, 2 Jul 2016 11:58:07 -0700 +Subject: [PATCH] version.sh: Replace all slashes + +--- + version.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/version.sh b/version.sh +index edc4dd3..331aa38 100755 +--- a/version.sh ++++ b/version.sh +@@ -49,7 +49,7 @@ NEW_REVISION="#define FFMPEG_VERSION \"$version\"" + OLD_REVISION=$(cat "$2" 2> /dev/null | head -4 | tail -1) + + # String used for preprocessor guard +-GUARD=$(echo "$2" | sed 's/\//_/' | sed 's/\./_/' | tr '[:lower:]' '[:upper:]' | sed 's/LIB//') ++GUARD=$(echo "$2" | sed 's/\//_/g' | sed 's/\./_/' | tr '[:lower:]' '[:upper:]' | sed 's/LIB//') + + # Update version header only on revision changes to avoid spurious rebuilds + if test "$NEW_REVISION" != "$OLD_REVISION"; then +-- +2.9.0 + diff --git a/pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch b/pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch new file mode 100644 index 00000000..d6b67728 --- /dev/null +++ b/pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch @@ -0,0 +1,71 @@ +From cfe9464c798d231d389053ba3b8f9b49ac0a578b 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 c551ac7..9712856 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) + BIO_METHOD* url_bio_method; + #endif + } TLSContext; +@@ -68,7 +68,7 @@ static unsigned long openssl_thread_id(void) + + 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; +@@ -133,7 +133,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) + static BIO_METHOD url_bio_method = { + .type = BIO_TYPE_SOURCE_SINK, + .name = "urlprotocol bio", +@@ -212,7 +212,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 +@@ -265,7 +265,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) + 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.10.2 + |
