diff --git a/graphics/ffmpeg/Makefile b/graphics/ffmpeg/Makefile index 6e8315c50cb..867ca3fc33a 100644 --- a/graphics/ffmpeg/Makefile +++ b/graphics/ffmpeg/Makefile @@ -2,7 +2,7 @@ COMMENT= audio/video converter and streamer V= 4.4.3 DISTNAME= ffmpeg-${V} -REVISION= 2 +REVISION= 3 EPOCH= 1 CATEGORIES= graphics multimedia MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm b/graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm new file mode 100644 index 00000000000..b1b51bcc2e4 --- /dev/null +++ b/graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm @@ -0,0 +1,37 @@ +Index: libavcodec/x86/fft.asm +--- libavcodec/x86/fft.asm.orig ++++ libavcodec/x86/fft.asm +@@ -548,10 +548,6 @@ DEFINE_ARGS zc, w, n, o1, o3 + %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs + lea r2, [dispatch_tab%1] + mov r2, [r2 + (%2q-2)*gprsize] +-%ifdef PIC +- lea r3, [$$] +- add r2, r3 +-%endif + call r2 + %endmacro ; FFT_DISPATCH + +@@ -731,11 +727,7 @@ DECL_PASS pass_interleave_3dnow, PASS_BIG 0 + %define pass_interleave_3dnowext pass_interleave_3dnow + %endif + +-%ifdef PIC +-%define SECTION_REL - $$ +-%else + %define SECTION_REL +-%endif + + %macro DECL_FFT 1-2 ; nbits, suffix + %ifidn %0, 1 +@@ -773,8 +765,10 @@ fft %+ n %+ fullsuffix: + %endrep + %undef n + ++[SECTION .data.rel.ro write] + align 8 + dispatch_tab %+ fullsuffix: pointer list_of_fft ++__?SECT?__ + %endmacro ; DECL_FFT + + %if HAVE_AVX_EXTERNAL