Here is an update to FFmpeg 9.1. Tested on aarch64 with MPlayer, MPV, VLC, Xine-lib. Needs testing with an amd64 BTI system. Index: graphics/ffmpeg/Makefile =================================================================== RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v retrieving revision 1.263 diff -u -p -u -p -r1.263 Makefile --- graphics/ffmpeg/Makefile 19 Sep 2026 19:36:37 -0000 1.263 +++ graphics/ffmpeg/Makefile 21 Nov 2026 03:05:39 -0000 @@ -1,7 +1,7 @@ COMMENT= audio/video converter and streamer # keep it synced with x11/mplayer -V= 9.0.2 +V= 9.1 DISTNAME= ffmpeg-${V} CATEGORIES= graphics multimedia SITES= https://ffmpeg.org/releases/ @@ -22,12 +22,12 @@ USE_NOBTCFI-amd64= Yes EPOCH= 1 -SHARED_LIBS= avcodec 28.0 \ +SHARED_LIBS= avcodec 28.1 \ avdevice 16.0 \ - avfilter 14.0 \ - avformat 25.0 \ - avutil 18.0 \ - swresample 7.0 \ + avfilter 14.1 \ + avformat 25.1 \ + avutil 18.1 \ + swresample 7.1 \ swscale 10.0 HOMEPAGE= https://ffmpeg.org/ @@ -120,6 +120,7 @@ CONFIGURE_ARGS+=--enable-shared \ --cc=${CC} \ --cxx=${CXX} \ --enable-debug \ + --disable-libcurl \ --disable-stripping \ --disable-indev=jack \ --disable-vulkan \ Index: graphics/ffmpeg/distinfo =================================================================== RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v retrieving revision 1.76 diff -u -p -u -p -r1.76 distinfo --- graphics/ffmpeg/distinfo 19 Sep 2026 19:36:37 -0000 1.76 +++ graphics/ffmpeg/distinfo 21 Nov 2026 03:05:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-9.0.2.tar.xz) = jDhQKD6yX6AmSCB4oEBR4L4XNHsJ74GghJvsFaluAC4= -SIZE (ffmpeg-9.0.2.tar.xz) = 12040788 +SHA256 (ffmpeg-9.1.tar.xz) = Gk05SuY9GQpSbNBS60QVwVa1xeLfN++rQafeC4/eJDM= +SIZE (ffmpeg-9.1.tar.xz) = 12557532 Index: graphics/ffmpeg/patches/patch-configure =================================================================== RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-configure,v retrieving revision 1.81 diff -u -p -u -p -r1.81 patch-configure --- graphics/ffmpeg/patches/patch-configure 25 Aug 2026 07:12:12 -0000 1.81 +++ graphics/ffmpeg/patches/patch-configure 21 Nov 2026 03:05:39 -0000 @@ -3,7 +3,7 @@ Index: configure --- configure.orig +++ configure -@@ -6159,7 +6159,6 @@ case $target_os in +@@ -6083,7 +6083,6 @@ case $target_os in enable section_data_rel_ro striptype="" SHFLAGS='-shared' @@ -11,7 +11,7 @@ Index: configure SLIB_INSTALL_LINKS= oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" -@@ -6534,7 +6533,7 @@ set_default libdir +@@ -6419,7 +6418,7 @@ set_default libdir set_default $PATHS_LIST set_default nm @@ -20,28 +20,7 @@ Index: configure enable_weak_pic() { disabled pic && return -@@ -6830,11 +6829,19 @@ elif enabled x86; then - # As 'i' is stored on the stack, this program will crash - # if the base pointer is used to access it because the - # base pointer is cleared in the inline assembly code. -- check_exec_crash <<EOF && enable ebp_available -+ # Since https://github.com/llvm/llvm-project/commit/0d471b3f64d3116bd57c79d872f7384fff80daa5, -+ # Clang can save/restore EBP around clobber-only asm, so the old -+ # crash probe can be a false positive. -+ check_exec_crash <<EOF && test_cc <<EOF_EBP_REGS && enable ebp_available - volatile int i=0; - __asm__ volatile ("xorl %%ebp, %%ebp" ::: "%ebp"); - return i; - EOF -+void foo(void *a, void *b, void *c, void *d, int e, void *f) -+{ -+ __asm__ volatile ("" :: "r"(a), "r"(b), "r"(c), "r"(d), "g"(e), "r"(f) : "%eax", "%edx"); -+} -+EOF_EBP_REGS - - # check whether EBX is available on x86 - check_inline_asm ebx_available '""::"b"(0)' && -@@ -7090,7 +7097,7 @@ check_headers asm/types.h +@@ -6987,7 +6986,7 @@ check_headers asm/types.h # # some configurations also require linking to libatomic, so try # both with -latomic and without @@ -50,7 +29,7 @@ Index: configure check_builtin stdatomic stdatomic.h \ "atomic_int foo, bar = -1; atomic_store(&foo, 0); foo += bar" \ $LATOMIC && eval stdatomic_extralibs="\$LATOMIC" && break -@@ -7551,7 +7558,7 @@ enabled opengl && { check_lib opengl GL/glx +@@ -7460,7 +7459,7 @@ enabled opencl && { check_pkg_config opencl enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h DTLS_get_data_mtu && { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } || { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } || Index: graphics/ffmpeg/patches/patch-ffbuild_library_mak =================================================================== RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-ffbuild_library_mak,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-ffbuild_library_mak --- graphics/ffmpeg/patches/patch-ffbuild_library_mak 25 Aug 2026 07:12:12 -0000 1.6 +++ graphics/ffmpeg/patches/patch-ffbuild_library_mak 21 Nov 2026 03:05:39 -0000 @@ -1,12 +1,11 @@ Index: ffbuild/library.mak --- ffbuild/library.mak.orig +++ ffbuild/library.mak -@@ -113,8 +113,6 @@ clean:: - install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) - $(Q)mkdir -p "$(SHLIBDIR)" - $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" -- $$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" +@@ -116,7 +116,6 @@ install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) + ifneq ($(STRIPTYPE),nostrip) + $$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" + endif - $(Q)$(foreach F,$(SLIB_INSTALL_LINKS),(cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F));) - $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)") + $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(call INSTALL_FILES,-m 644,$(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%),$(SHLIBDIR))) $(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)") - $(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)") + $(if $(SLIB_INSTALL_EXTRA_LIB),$$(call INSTALL_FILES,-m 644,$(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%),$(LIBDIR))) Index: graphics/ffmpeg/patches/patch-libavcodec_aarch64_h26x_sao_neon_S =================================================================== RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavcodec_aarch64_h26x_sao_neon_S,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-libavcodec_aarch64_h26x_sao_neon_S --- graphics/ffmpeg/patches/patch-libavcodec_aarch64_h26x_sao_neon_S 25 Aug 2026 07:23:52 -0000 1.1 +++ graphics/ffmpeg/patches/patch-libavcodec_aarch64_h26x_sao_neon_S 21 Nov 2026 03:05:39 -0000 @@ -7,12 +7,12 @@ Index: libavcodec/aarch64/h26x/sao_neon. +.section .rodata + - .Lhevc_sao_edge_pos: + .Lhevc_sao_edge_pos_8: .word 1 // horizontal .word HEVC_SAO_STRIDE // vertical -@@ -112,8 +114,11 @@ endfunc - .word VVC_SAO_STRIDE + 1 // 45 degree - .word VVC_SAO_STRIDE - 1 // 135 degree +@@ -124,8 +126,11 @@ endfunc + .word VVC_SAO_STRIDE + 2 // 135 degree + .word VVC_SAO_STRIDE - 2 // 45 degree +.previous + @@ -23,17 +23,37 @@ Index: libavcodec/aarch64/h26x/sao_neon. mov x15, #VVC_SAO_STRIDE b 1f endfunc -@@ -121,7 +126,8 @@ endfunc +@@ -133,7 +138,8 @@ endfunc // ff_hevc_sao_edge_filter_16x16_8_neon(char *dst, char *src, ptrdiff stride_dst, // int16 *sao_offset_val, int eo, int width, int height) function ff_hevc_sao_edge_filter_16x16_8_neon, export=1 -- adr x7, .Lhevc_sao_edge_pos -+ adrp x7, .Lhevc_sao_edge_pos -+ add x7, x7, :lo12:.Lhevc_sao_edge_pos +- adr x7, .Lhevc_sao_edge_pos_8 ++ adrp x7, .Lhevc_sao_edge_pos_8 ++ add x7, x7, :lo12:.Lhevc_sao_edge_pos_8 mov x15, #HEVC_SAO_STRIDE 1: ld1 {v3.8h}, [x3] // load sao_offset_val -@@ -180,7 +186,8 @@ function ff_hevc_sao_edge_filter_16x16_8_neon, export= +@@ -241,7 +247,8 @@ endfunc + function ff_vvc_sao_edge_filter_16x16_10_neon, export=1 + mvni v31.8h, #0xfc, lsl #8 // 1023 + .Lvvc_sao_edge_16x16_16bit: +- adr x7, .Lvvc_sao_edge_pos_16bit ++ adrp x7, .Lvvc_sao_edge_pos_16bit ++ add x7, x7, :lo12:.Lvvc_sao_edge_pos_16bit + mov x15, #VVC_SAO_STRIDE + b .Lh26x_sao_edge_16x16_16bit + endfunc +@@ -258,7 +265,8 @@ endfunc + function ff_hevc_sao_edge_filter_16x16_10_neon, export=1 + mvni v31.8h, #0xfc, lsl #8 // 1023 + .Lhevc_sao_edge_16bit: +- adr x7, .Lhevc_sao_edge_pos_16bit ++ adrp x7, .Lhevc_sao_edge_pos_16bit ++ add x7, x7, :lo12:.Lhevc_sao_edge_pos_16bit + mov x15, #HEVC_SAO_STRIDE + .Lh26x_sao_edge_16x16_16bit: + add w5, w5, #7 +@@ -288,7 +296,8 @@ function ff_hevc_sao_edge_filter_16x16_10_neon, export endfunc function ff_vvc_sao_edge_filter_8x8_8_neon, export=1 @@ -43,13 +63,33 @@ Index: libavcodec/aarch64/h26x/sao_neon. mov x15, #VVC_SAO_STRIDE b 1f endfunc -@@ -188,7 +195,8 @@ endfunc +@@ -296,7 +305,8 @@ endfunc // ff_hevc_sao_edge_filter_8x8_8_neon(char *dst, char *src, ptrdiff stride_dst, // int16 *sao_offset_val, int eo, int width, int height) function ff_hevc_sao_edge_filter_8x8_8_neon, export=1 -- adr x7, .Lhevc_sao_edge_pos -+ adrp x7, .Lhevc_sao_edge_pos -+ add x7, x7, :lo12:.Lhevc_sao_edge_pos +- adr x7, .Lhevc_sao_edge_pos_8 ++ adrp x7, .Lhevc_sao_edge_pos_8 ++ add x7, x7, :lo12:.Lhevc_sao_edge_pos_8 mov x15, #HEVC_SAO_STRIDE 1: ldr w4, [x7, w4, uxtw #2] +@@ -356,7 +366,8 @@ endfunc + function ff_vvc_sao_edge_filter_8x8_10_neon, export=1 + mvni v31.8h, #0xfc, lsl #8 // 1023 + .Lvvc_sao_edge_8x8_16bit: +- adr x7, .Lvvc_sao_edge_pos_16bit ++ adrp x7, .Lvvc_sao_edge_pos_16bit ++ add x7, x7, :lo12:.Lvvc_sao_edge_pos_16bit + mov x15, #VVC_SAO_STRIDE + b .Lh26x_sao_edge_8x8_16bit + endfunc +@@ -373,7 +384,8 @@ endfunc + function ff_hevc_sao_edge_filter_8x8_10_neon, export=1 + mvni v31.8h, #0xfc, lsl #8 // 1023 + .Lhevc_sao_edge_8x8_16bit: +- adr x7, .Lhevc_sao_edge_pos_16bit ++ adrp x7, .Lhevc_sao_edge_pos_16bit ++ add x7, x7, :lo12:.Lhevc_sao_edge_pos_16bit + mov x15, #HEVC_SAO_STRIDE + .Lh26x_sao_edge_8x8_16bit: + ldr w4, [x7, w4, uxtw #2] // a/b offsets in bytes Index: graphics/ffmpeg/patches/patch-libavcodec_aarch64_vc1dsp_neon_S =================================================================== RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavcodec_aarch64_vc1dsp_neon_S,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-libavcodec_aarch64_vc1dsp_neon_S --- graphics/ffmpeg/patches/patch-libavcodec_aarch64_vc1dsp_neon_S 25 Aug 2026 07:23:52 -0000 1.1 +++ graphics/ffmpeg/patches/patch-libavcodec_aarch64_vc1dsp_neon_S 21 Nov 2026 03:05:39 -0000 @@ -47,7 +47,7 @@ Index: libavcodec/aarch64/vc1dsp_neon.S +.section .rodata + - .align 5 + .align 4 .Lcoeffs_it8: .quad 0x000F00090003 @@ -704,6 +710,8 @@ endfunc Index: graphics/ffmpeg/patches/patch-libavformat_avformat_h =================================================================== RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavformat_avformat_h,v retrieving revision 1.8 diff -u -p -u -p -r1.8 patch-libavformat_avformat_h --- graphics/ffmpeg/patches/patch-libavformat_avformat_h 25 Aug 2026 07:12:12 -0000 1.8 +++ graphics/ffmpeg/patches/patch-libavformat_avformat_h 21 Nov 2026 03:05:39 -0000 @@ -3,7 +3,7 @@ Add av_stream_get_first_dts for Chromium Index: libavformat/avformat.h --- libavformat/avformat.h.orig +++ libavformat/avformat.h -@@ -1229,6 +1229,10 @@ typedef struct AVStreamGroup { +@@ -1316,6 +1316,10 @@ typedef struct AVStreamGroup { struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); Index: graphics/ffmpeg/patches/patch-libavformat_tls_openssl_c =================================================================== RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavformat_tls_openssl_c,v retrieving revision 1.5 diff -u -p -u -p -r1.5 patch-libavformat_tls_openssl_c --- graphics/ffmpeg/patches/patch-libavformat_tls_openssl_c 25 Aug 2026 07:12:12 -0000 1.5 +++ graphics/ffmpeg/patches/patch-libavformat_tls_openssl_c 21 Nov 2026 03:05:39 -0000 @@ -58,7 +58,7 @@ Index: libavformat/tls_openssl.c done: BIO_free(mem); if (out && out_sz) -@@ -847,7 +861,9 @@ static int tls_open(URLContext *h, const char *uri, in +@@ -858,7 +872,9 @@ static int tls_open(URLContext *h, const char *uri, in s->mtu = 1096; SSL_set_options(c->ssl, SSL_OP_NO_QUERY_MTU); SSL_set_mtu(c->ssl, s->mtu); @@ -68,7 +68,7 @@ Index: libavformat/tls_openssl.c } init_bio_method(h); -@@ -960,10 +976,12 @@ static int tls_write(URLContext *h, const uint8_t *buf +@@ -974,10 +990,12 @@ static int tls_write(URLContext *h, const uint8_t *buf uc->flags &= ~AVIO_FLAG_NONBLOCK; uc->flags |= h->flags & AVIO_FLAG_NONBLOCK; @@ -79,5 +79,5 @@ Index: libavformat/tls_openssl.c } +
No comments:
Post a Comment