diff options
| -rw-r--r-- | media-video/ffmpeg/Manifest | 2 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-3.2-libressl.patch | 57 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch | 106 |
3 files changed, 0 insertions, 165 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index f4a2f94..de063e2 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,7 +1,5 @@ AUX chromium.patch 1420 SHA256 934ccd37bf4e36b20bf4fc1e6599f6e6489c3bac7940ca48bc93ff93dd20696f SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59 WHIRLPOOL 46889e7842bd134e94f2a79ccddb561e0f7128557973e2ffe0b6a5d85a789a80eecaa64cdcea0cd7fd61a01fe8459b30c62d960a5d449ea1b4dfa938e2cbdff5 -AUX ffmpeg-3.2-libressl.patch 2030 SHA256 7af99ba40d7ae9742203842f5e340c3a0d2b33f41c77cd8bba90e826e71922da SHA512 61c31751f4bf6b8c88b2c985f42e33b3d1738575e41dbc31a5192649d16af0112c555583e37865d809399c6d40f60c85c1ea23b59677c747aeca7c2cfa38254b WHIRLPOOL dcd1890fbaf57d119c18a80f012a768aafe9b51890611be85edbae5d59af18a740b9bf29d7988e3974ed68ac4930e6daff4fc2b12c049a50856ccd36f213af56 AUX ffmpeg-3.3-libressl.patch 2028 SHA256 590b44de9161d1bbcc1062c91ed41a924ddde835c47445a6d4aa3d28cf4f8cdf SHA512 9a259be0b1957b715d07ca27ef72d36a9f297be06e4d875ed711d7b3ebcad345e6e11e1e447daf07e5b5f5f2bcf2f08e14689f36d427ddbf1b6ace1583838e92 WHIRLPOOL 4c34582eb3ed42b6020f276786545ad911283d6dcda47b3d69f4718691a1c7f1cbe89a701549622b1f79a02a338174f1e0b8beac9f8ee21bb2c6db7bce218a9a -AUX ffmpeg32-openjpeg22.patch 4777 SHA256 4a9ed7ff8716fd6e3f311c09af3a062023fe922dcc4b6786922e0e2947f77547 SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d WHIRLPOOL 3d49d34ff0bd5ac8638b91c16e7e1280d60c2565dd4e9593406c240ecc98f14bea1c7f9b54f26fb6f7c65d531cfe793f854f7772addda903abd71f6692aadbd8 AUX openjpeg22.patch 4770 SHA256 48d399b12299da0eb709412e52b6e545afe82ba4bb3e59f4a02828985f9dfed5 SHA512 8a198910cdf43df83fdf50e372c2ec5d911637dd61768d5ac3a1984f99d1f374f594af9ff6c501b248c390a22898e4964f7d07c81eb3586fa1bebad2c9e00730 WHIRLPOOL c655b65761b198225f03a072ec690c81eb27a2972f602a3ef0be260e0e4acb242357f7421a213e32af0159da4a3398c5b5794a0bb616e7e4a36e6698341e9208 AUX openjpeg23.patch 5105 SHA256 c3d4844cee8704f2205694df7be44dcc77ea5fb35e092cd15182f8b0b533cbcb SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7 WHIRLPOOL d2e9bf24aae50ebc27a47aefebab7e81511a0e46fac1344119bd4e9f955af552d6e05450b1675bb799955fc67317d459832fa8d3e48dcc510f5190d6ce9d183f DIST ffmpeg-3.3.5.tar.bz2 9945243 SHA256 1b434cff8a327e54fd0f611420996e3419c58b795d51a5b588ace2a674f1060a SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a WHIRLPOOL d58c5df3fc3df25173a1a719f663d2821bbf283e346ddc289640cacd804e5cbc8359539f4b5931677aacb2c9e8a31d036b79492b00dbe2717c0c5563f2a2857a diff --git a/media-video/ffmpeg/files/ffmpeg-3.2-libressl.patch b/media-video/ffmpeg/files/ffmpeg-3.2-libressl.patch deleted file mode 100644 index 267785a..0000000 --- a/media-video/ffmpeg/files/ffmpeg-3.2-libressl.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur ffmpeg-3.2.orig/libavformat/tls_openssl.c ffmpeg-3.2/libavformat/tls_openssl.c ---- ffmpeg-3.2.orig/libavformat/tls_openssl.c 2016-10-28 10:20:46.872620829 -0700 -+++ ffmpeg-3.2/libavformat/tls_openssl.c 2016-10-28 10:22:46.153045913 -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; -@@ -133,7 +133,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", -@@ -212,7 +212,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 -@@ -265,7 +265,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); diff --git a/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch b/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch deleted file mode 100644 index 0ee6486..0000000 --- a/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch +++ /dev/null @@ -1,106 +0,0 @@ -commit 078322f33ced4b2db6ac3e5002f98233d6fbf643 -Author: Reino17 <rwijnsma@xs4all.nl> -Date: Fri Jun 23 23:49:31 2017 +0200 - - Add support for LibOpenJPEG v2.2/git - - Signed-off-by: Michael Bradshaw <mjbshaw@google.com> - -Index: ffmpeg-3.2.7/configure -=================================================================== ---- ffmpeg-3.2.7.orig/configure -+++ ffmpeg-3.2.7/configure -@@ -1831,6 +1831,7 @@ HEADERS_LIST=" - machine_ioctl_meteor_h - malloc_h - opencv2_core_core_c_h -+ openjpeg_2_2_openjpeg_h - openjpeg_2_1_openjpeg_h - openjpeg_2_0_openjpeg_h - openjpeg_1_5_openjpeg_h -@@ -5721,7 +5722,9 @@ enabled libopencv && { check_hea - require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || - require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; } - enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion --enabled libopenjpeg && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || -+enabled libopenjpeg && { { check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || -+ check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 || -+ { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || - check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || - { check_lib2 openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || - { check_lib2 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || -Index: ffmpeg-3.2.7/libavcodec/libopenjpegdec.c -=================================================================== ---- ffmpeg-3.2.7.orig/libavcodec/libopenjpegdec.c -+++ ffmpeg-3.2.7/libavcodec/libopenjpegdec.c -@@ -34,7 +34,9 @@ - #include "internal.h" - #include "thread.h" - --#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H -+# include <openjpeg-2.2/openjpeg.h> -+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H - # include <openjpeg-2.1/openjpeg.h> - #elif HAVE_OPENJPEG_2_0_OPENJPEG_H - # include <openjpeg-2.0/openjpeg.h> -@@ -44,7 +46,7 @@ - # include <openjpeg.h> - #endif - --#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H - # define OPENJPEG_MAJOR_VERSION 2 - # define OPJ(x) OPJ_##x - #else -@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo - opj_stream_set_read_function(stream, stream_read); - opj_stream_set_skip_function(stream, stream_skip); - opj_stream_set_seek_function(stream, stream_seek); --#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H - opj_stream_set_user_data(stream, &reader, NULL); - #elif HAVE_OPENJPEG_2_0_OPENJPEG_H - opj_stream_set_user_data(stream, &reader); -Index: ffmpeg-3.2.7/libavcodec/libopenjpegenc.c -=================================================================== ---- ffmpeg-3.2.7.orig/libavcodec/libopenjpegenc.c -+++ ffmpeg-3.2.7/libavcodec/libopenjpegenc.c -@@ -32,7 +32,9 @@ - #include "avcodec.h" - #include "internal.h" - --#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H -+# include <openjpeg-2.2/openjpeg.h> -+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H - # include <openjpeg-2.1/openjpeg.h> - #elif HAVE_OPENJPEG_2_0_OPENJPEG_H - # include <openjpeg-2.0/openjpeg.h> -@@ -42,7 +44,7 @@ - # include <openjpeg.h> - #endif - --#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H - # define OPENJPEG_MAJOR_VERSION 2 - # define OPJ(x) OPJ_##x - #else -@@ -306,7 +308,7 @@ static av_cold int libopenjpeg_encode_in - - opj_set_default_encoder_parameters(&ctx->enc_params); - --#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H - switch (ctx->cinema_mode) { - case OPJ_CINEMA2K_24: - ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K; -@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCo - opj_stream_set_write_function(stream, stream_write); - opj_stream_set_skip_function(stream, stream_skip); - opj_stream_set_seek_function(stream, stream_seek); --#if HAVE_OPENJPEG_2_1_OPENJPEG_H -+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H - opj_stream_set_user_data(stream, &writer, NULL); - #elif HAVE_OPENJPEG_2_0_OPENJPEG_H - opj_stream_set_user_data(stream, &writer); |