ffmpeg: remove patch, fixed upstream (#9777)

This commit is contained in:
kenmays
2023-11-20 09:42:54 -08:00
committed by GitHub
parent be56ec4c6f
commit e259224625
2 changed files with 5 additions and 35 deletions

View File

@@ -6,7 +6,7 @@ HOMEPAGE="https://ffmpeg.org/"
COPYRIGHT="2000-2003 Fabrice Bellard
2003-2023 the FFmpeg developers"
LICENSE="GNU LGPL v3"
REVISION="1"
REVISION="2"
SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
CHECKSUM_SHA256="488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270"
PATCHES="ffmpeg-$portVersion.patchset"

View File

@@ -1,4 +1,4 @@
From c734e9aa1030bde7162c47f241882a88ffb1f04b Mon Sep 17 00:00:00 2001
From 85e880e21a277ee6afc1b13551aa4860f054d278 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 7 Aug 2019 16:21:12 +0300
Subject: disable ebx on x86.
@@ -17,10 +17,10 @@ index 1f0b949..12f64e2 100755
*-dos|freedos|opendos)
if test_cpp_condition sys/version.h "defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ == 5"; then
--
2.42.0
2.42.1
From 45b39d00e380f87d5095bfbfdc8b725582232a28 Mon Sep 17 00:00:00 2001
From 59467d4c2ed3868aa22f6941ce837b8ec3528023 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 7 Aug 2019 16:21:32 +0300
Subject: Re-enable memalign for Haiku
@@ -45,35 +45,5 @@ index 12f64e2..58ad366 100755
;;
*-dos|freedos|opendos)
--
2.42.0
From 07f46060f4acef6df65caa359a75260168bce783 Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Sat, 13 Aug 2022 05:01:14 +0300
Subject: Check for SSSE3
diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
index 6754062..9ad4f20 100644
--- a/libswscale/x86/yuv2rgb.c
+++ b/libswscale/x86/yuv2rgb.c
@@ -70,6 +70,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
+#if HAVE_SSSE3
if (EXTERNAL_SSSE3(cpu_flags)) {
switch (c->dstFormat) {
case AV_PIX_FMT_RGB32:
@@ -98,6 +99,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
return yuv420_rgb15_ssse3;
}
}
+#endif
if (EXTERNAL_MMXEXT(cpu_flags)) {
switch (c->dstFormat) {
--
2.42.0
2.42.1