From 3c450f44d9a10cac52201626387f6b92397f8fb9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 25 Jun 2020 17:17:12 -0700 Subject: [PATCH] ffmpeg: update to 4.3 Remove upstreamed patches. Refreshed other ones. Signed-off-by: Rosen Penev --- multimedia/ffmpeg/Makefile | 4 +- multimedia/ffmpeg/patches/020-drawtext.patch | 31 ---- multimedia/ffmpeg/patches/030-h264-mips.patch | 4 +- multimedia/ffmpeg/patches/040-aac-mips.patch | 141 ------------------ 4 files changed, 4 insertions(+), 176 deletions(-) delete mode 100644 multimedia/ffmpeg/patches/020-drawtext.patch delete mode 100644 multimedia/ffmpeg/patches/040-aac-mips.patch diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 7a9040922..d02595164 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg -PKG_VERSION:=4.2.3 +PKG_VERSION:=4.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ -PKG_HASH:=9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31 +PKG_HASH:=1d0ad06484f44bcb97eba5e93c40bcb893890f9f64aeb43e46cd9bb4cbd6795d PKG_MAINTAINER:=Ted Hess , \ Ian Leonard diff --git a/multimedia/ffmpeg/patches/020-drawtext.patch b/multimedia/ffmpeg/patches/020-drawtext.patch deleted file mode 100644 index 1b1887017..000000000 --- a/multimedia/ffmpeg/patches/020-drawtext.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8beb9e571ca6fb38d5f784bedd581398fb3da06f Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 6 Apr 2020 17:38:59 -0700 -Subject: [PATCH] avfilter/vf_drawtext: only test available exceptions - -soft float systems do not define these macros under musl. - -Fixes: Ticket7102 - -Signed-off-by: Rosen Penev ---- - libavfilter/vf_drawtext.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c -index 887a686d16d..abe1ca6c35c 100644 ---- a/libavfilter/vf_drawtext.c -+++ b/libavfilter/vf_drawtext.c -@@ -1083,10 +1083,12 @@ static int func_eval_expr_int_format(AVFilterContext *ctx, AVBPrint *bp, - - feclearexcept(FE_ALL_EXCEPT); - intval = res; -+#if defined(FE_INVALID) && defined(FE_OVERFLOW) && defined(FE_UNDERFLOW) - if ((ret = fetestexcept(FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW))) { - av_log(ctx, AV_LOG_ERROR, "Conversion of floating-point result to int failed. Control register: 0x%08x. Conversion result: %d\n", ret, intval); - return AVERROR(EINVAL); - } -+#endif - - if (argc == 3) - av_strlcatf(fmt_str, sizeof(fmt_str), "0%u", positions); diff --git a/multimedia/ffmpeg/patches/030-h264-mips.patch b/multimedia/ffmpeg/patches/030-h264-mips.patch index 1626aa52d..53ec3369d 100644 --- a/multimedia/ffmpeg/patches/030-h264-mips.patch +++ b/multimedia/ffmpeg/patches/030-h264-mips.patch @@ -6,9 +6,9 @@ +#ifndef __mips16 #define get_cabac_inline get_cabac_inline_mips - static av_always_inline int get_cabac_inline(CABACContext *c, + static av_always_inline int get_cabac_inline_mips(CABACContext *c, uint8_t * const state){ -@@ -116,4 +117,5 @@ static av_always_inline int get_cabac_inline(CABACContext *c, +@@ -116,4 +117,5 @@ static av_always_inline int get_cabac_inline_mips(CABACContext *c, return bit; } diff --git a/multimedia/ffmpeg/patches/040-aac-mips.patch b/multimedia/ffmpeg/patches/040-aac-mips.patch deleted file mode 100644 index 4605ca728..000000000 --- a/multimedia/ffmpeg/patches/040-aac-mips.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 875ba2333340c2e13af370832e49c9371ffb0f91 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sun, 5 Apr 2020 20:37:10 -0700 -Subject: [PATCH] avcodec/aacdec: fix compilation under soft float MIPS - -Place HAVE_MIPSFPU further up so that functions that use floating point -ASM are defined away. Otherwise compilation failures result when soft -float in enabled on the toolchain. - -Signed-off-by: Rosen Penev ---- - libavcodec/mips/aacdec_mips.c | 4 ++-- - libavcodec/mips/aacpsdsp_mips.c | 4 ++-- - libavcodec/mips/aacsbr_mips.c | 4 ++-- - libavcodec/mips/sbrdsp_mips.c | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/libavcodec/mips/aacdec_mips.c b/libavcodec/mips/aacdec_mips.c -index 01a2b3087ba..8e306529351 100644 ---- a/libavcodec/mips/aacdec_mips.c -+++ b/libavcodec/mips/aacdec_mips.c -@@ -59,6 +59,7 @@ - #include "libavutil/mips/asmdefs.h" - - #if HAVE_INLINE_ASM -+#if HAVE_MIPSFPU - static av_always_inline void float_copy(float *dst, const float *src, int count) - { - // Copy 'count' floats from src to dst -@@ -282,7 +283,6 @@ static void apply_ltp_mips(AACContext *ac, SingleChannelElement *sce) - } - } - --#if HAVE_MIPSFPU - static av_always_inline void fmul_and_reverse(float *dst, const float *src0, const float *src1, int count) - { - /* Multiply 'count' floats in src0 by src1 and store the results in dst in reverse */ -@@ -433,9 +433,9 @@ static void update_ltp_mips(AACContext *ac, SingleChannelElement *sce) - void ff_aacdec_init_mips(AACContext *c) - { - #if HAVE_INLINE_ASM -+#if HAVE_MIPSFPU - c->imdct_and_windowing = imdct_and_windowing_mips; - c->apply_ltp = apply_ltp_mips; --#if HAVE_MIPSFPU - c->update_ltp = update_ltp_mips; - #endif /* HAVE_MIPSFPU */ - #endif /* HAVE_INLINE_ASM */ -diff --git a/libavcodec/mips/aacpsdsp_mips.c b/libavcodec/mips/aacpsdsp_mips.c -index 83fdc2f9dbd..ef47e31a9ea 100644 ---- a/libavcodec/mips/aacpsdsp_mips.c -+++ b/libavcodec/mips/aacpsdsp_mips.c -@@ -57,6 +57,7 @@ - #include "libavutil/mips/asmdefs.h" - - #if HAVE_INLINE_ASM -+#if HAVE_MIPSFPU - static void ps_hybrid_analysis_ileave_mips(float (*out)[32][2], float L[2][38][64], - int i, int len) - { -@@ -187,7 +188,6 @@ static void ps_hybrid_synthesis_deint_mips(float out[2][38][64], - } - } - --#if HAVE_MIPSFPU - #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 - static void ps_add_squares_mips(float *dst, const float (*src)[2], int n) - { -@@ -450,9 +450,9 @@ static void ps_stereo_interpolate_mips(float (*l)[2], float (*r)[2], - void ff_psdsp_init_mips(PSDSPContext *s) - { - #if HAVE_INLINE_ASM -+#if HAVE_MIPSFPU - s->hybrid_analysis_ileave = ps_hybrid_analysis_ileave_mips; - s->hybrid_synthesis_deint = ps_hybrid_synthesis_deint_mips; --#if HAVE_MIPSFPU - #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 - s->add_squares = ps_add_squares_mips; - s->mul_pair_single = ps_mul_pair_single_mips; -diff --git a/libavcodec/mips/aacsbr_mips.c b/libavcodec/mips/aacsbr_mips.c -index 56aa4e86822..2e0cd723d7e 100644 ---- a/libavcodec/mips/aacsbr_mips.c -+++ b/libavcodec/mips/aacsbr_mips.c -@@ -58,6 +58,7 @@ - #define ENVELOPE_ADJUSTMENT_OFFSET 2 - - #if HAVE_INLINE_ASM -+#if HAVE_MIPSFPU - static int sbr_lf_gen_mips(AACContext *ac, SpectralBandReplication *sbr, - float X_low[32][40][2], const float W[2][32][32][2], - int buf_idx) -@@ -310,7 +311,6 @@ static int sbr_x_gen_mips(SpectralBandReplication *sbr, float X[2][38][64], - return 0; - } - --#if HAVE_MIPSFPU - #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 - static void sbr_hf_assemble_mips(float Y1[38][64][2], - const float X_high[64][40][2], -@@ -611,9 +611,9 @@ static void sbr_hf_inverse_filter_mips(SBRDSPContext *dsp, - void ff_aacsbr_func_ptr_init_mips(AACSBRContext *c) - { - #if HAVE_INLINE_ASM -+#if HAVE_MIPSFPU - c->sbr_lf_gen = sbr_lf_gen_mips; - c->sbr_x_gen = sbr_x_gen_mips; --#if HAVE_MIPSFPU - #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 - c->sbr_hf_inverse_filter = sbr_hf_inverse_filter_mips; - c->sbr_hf_assemble = sbr_hf_assemble_mips; -diff --git a/libavcodec/mips/sbrdsp_mips.c b/libavcodec/mips/sbrdsp_mips.c -index 1b0a10608de..83039fd802a 100644 ---- a/libavcodec/mips/sbrdsp_mips.c -+++ b/libavcodec/mips/sbrdsp_mips.c -@@ -59,6 +59,7 @@ - #include "libavutil/mips/asmdefs.h" - - #if HAVE_INLINE_ASM -+#if HAVE_MIPSFPU - static void sbr_qmf_pre_shuffle_mips(float *z) - { - int Temp1, Temp2, Temp3, Temp4, Temp5, Temp6; -@@ -165,7 +166,6 @@ static void sbr_qmf_post_shuffle_mips(float W[32][2], const float *z) - ); - } - --#if HAVE_MIPSFPU - #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 - static void sbr_sum64x5_mips(float *z) - { -@@ -890,9 +890,9 @@ static void sbr_hf_apply_noise_3_mips(float (*Y)[2], const float *s_m, - void ff_sbrdsp_init_mips(SBRDSPContext *s) - { - #if HAVE_INLINE_ASM -+#if HAVE_MIPSFPU - s->qmf_pre_shuffle = sbr_qmf_pre_shuffle_mips; - s->qmf_post_shuffle = sbr_qmf_post_shuffle_mips; --#if HAVE_MIPSFPU - #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 - s->sum64x5 = sbr_sum64x5_mips; - s->sum_square = sbr_sum_square_mips;