summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/media/ffmpeg/ffmpeg-4.3.2.exheres-0 (renamed from packages/media/ffmpeg/ffmpeg-4.3.1.exheres-0)1
-rw-r--r--packages/media/ffmpeg/ffmpeg.exlib2
-rw-r--r--packages/media/ffmpeg/files/ffmpeg-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch55
3 files changed, 1 insertions, 57 deletions
diff --git a/packages/media/ffmpeg/ffmpeg-4.3.1.exheres-0 b/packages/media/ffmpeg/ffmpeg-4.3.2.exheres-0
index 7dfe70f9..0e0b50ba 100644
--- a/packages/media/ffmpeg/ffmpeg-4.3.1.exheres-0
+++ b/packages/media/ffmpeg/ffmpeg-4.3.2.exheres-0
@@ -8,6 +8,5 @@ PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/ffmpeg-4.3-disable-ssse3.patch
- "${FILES}"/${PN}-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch
)
diff --git a/packages/media/ffmpeg/ffmpeg.exlib b/packages/media/ffmpeg/ffmpeg.exlib
index 4f685993..24de8171 100644
--- a/packages/media/ffmpeg/ffmpeg.exlib
+++ b/packages/media/ffmpeg/ffmpeg.exlib
@@ -224,7 +224,7 @@ DEPENDENCIES="
)
providers:libressl? ( dev-libs/libressl:= )
providers:mbedtls? ( dev-libs/mbedtls )
- providers:openssl? ( dev-libs/openssl )
+ providers:openssl? ( dev-libs/openssl:= )
pulseaudio? ( media-sound/pulseaudio )
rtmp? ( media-video/rtmpdump[>=2.2] )
rubberband? ( media-libs/rubberband[>=1.8.1] )
diff --git a/packages/media/ffmpeg/files/ffmpeg-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch b/packages/media/ffmpeg/files/ffmpeg-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch
deleted file mode 100644
index 43cbca0a..00000000
--- a/packages/media/ffmpeg/files/ffmpeg-4.3-Revert-avutil-mem-Use-max_alloc_size-as-is.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Source/Upstream: Unknown, https://bugs.chromium.org/p/chromium/issues/detail?id=1095962
-Reason: Temporary fix for Chromium crashing
-
-From e783562c3c6001fa5e585698e9a37119d028da70 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <tgurr@exherbo.org>
-Date: Fri, 19 Jun 2020 23:10:56 +0200
-Subject: [PATCH] Revert "avutil/mem: Use max_alloc_size as-is"
-
-This reverts commit 731c77589841c02e014aa7f8285dcfc8b20f2ee5.
----
- libavutil/mem.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/libavutil/mem.c b/libavutil/mem.c
-index cfb6d8ab8f..a29c224264 100644
---- a/libavutil/mem.c
-+++ b/libavutil/mem.c
-@@ -78,7 +78,8 @@ void *av_malloc(size_t size)
- {
- void *ptr = NULL;
-
-- if (size > max_alloc_size)
-+ /* let's disallow possibly ambiguous cases */
-+ if (size > (max_alloc_size - 32))
- return NULL;
-
- #if HAVE_POSIX_MEMALIGN
-@@ -133,7 +134,8 @@ void *av_malloc(size_t size)
-
- void *av_realloc(void *ptr, size_t size)
- {
-- if (size > max_alloc_size)
-+ /* let's disallow possibly ambiguous cases */
-+ if (size > (max_alloc_size - 32))
- return NULL;
-
- #if HAVE_ALIGNED_MALLOC
-@@ -480,12 +482,12 @@ void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size)
- if (min_size <= *size)
- return ptr;
-
-- if (min_size > max_alloc_size) {
-+ if (min_size > max_alloc_size - 32) {
- *size = 0;
- return NULL;
- }
-
-- min_size = FFMIN(max_alloc_size, FFMAX(min_size + min_size / 16 + 32, min_size));
-+ min_size = FFMIN(max_alloc_size - 32, FFMAX(min_size + min_size / 16 + 32, min_size));
-
- ptr = av_realloc(ptr, min_size);
- /* we could set this to the unmodified min_size but this is safer
---
-2.27.0
-