git: ebf478f80f4b - main - multimedia/ffmpeg6: upgrade to 6.1.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 Mar 2026 22:53:25 UTC
The branch main has been updated by thierry:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ebf478f80f4ba6a0e8f1a36bbe8739e7ef6a3fd2
commit ebf478f80f4ba6a0e8f1a36bbe8739e7ef6a3fd2
Author: Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2026-03-15 19:22:21 +0000
Commit: Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2026-03-15 22:53:18 +0000
multimedia/ffmpeg6: upgrade to 6.1.4
Since this is a legacy version only intended to be used as a dependency
remove the options: only the previously default options are kept.
PR: 278913
---
multimedia/ffmpeg6/Makefile | 664 ++++----------
multimedia/ffmpeg6/distinfo | 6 +-
multimedia/ffmpeg6/files/patch-configure | 36 +-
multimedia/ffmpeg6/files/patch-doc-Makefile | 4 +-
.../ffmpeg6/files/patch-libavcodec_libsvtav1.c | 18 +-
multimedia/ffmpeg6/files/patch-libavdevice_v4l2.c | 18 -
.../ffmpeg6/files/patch-libavfilter_glslang.cpp | 10 -
.../ffmpeg6/files/patch-libavfilter_vf__lensfun.c | 4 +-
multimedia/ffmpeg6/files/patch-libavformat_rtsp.c | 10 +-
multimedia/ffmpeg6/files/patch-libavutil-common.h | 8 +-
multimedia/ffmpeg6/files/patch-libavutil-x86-asm.h | 4 +-
.../files/patch-libswscale_ppc_yuv2rgb__altivec.c | 15 -
multimedia/ffmpeg6/files/patch-svtav1 | 472 ----------
multimedia/ffmpeg6/files/patch-vmaf | 951 ---------------------
multimedia/ffmpeg6/override.mk | 2 +-
multimedia/ffmpeg6/pkg-descr | 3 +
multimedia/ffmpeg6/pkg-plist | 120 +--
17 files changed, 257 insertions(+), 2088 deletions(-)
diff --git a/multimedia/ffmpeg6/Makefile b/multimedia/ffmpeg6/Makefile
index e5cb726577fb..3d77cf9849a8 100644
--- a/multimedia/ffmpeg6/Makefile
+++ b/multimedia/ffmpeg6/Makefile
@@ -1,19 +1,17 @@
PORTNAME= ffmpeg
-PORTVERSION= 4.4.4
-PORTREVISION= 30
+PORTVERSION= 6.1.4
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/
-PKGNAMESUFFIX= 4
+PKGNAMESUFFIX= 6
-MAINTAINER= multimedia@FreeBSD.org
-COMMENT= Realtime audio/video encoder/converter and streaming server (legacy 4.* series)
+MAINTAINER= thierry@FreeBSD.org
+COMMENT= Realtime audio/video encoder/converter and streaming server (legacy 6.* series)
WWW= https://ffmpeg.org/
-LICENSE= GPLv2+ LGPL21+
-LICENSE_COMB= multi
-
-DEPRECATED= Outdated and unsupported version, consider migrating to multimedia/ffmpeg
-EXPIRATION_DATE=2026-06-30
+LICENSE= GPLv3+ LGPL3+
+LICENSE_COMB= multi
+LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3
+LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}}
BUILD_DEPENDS_aarch64= as:devel/binutils
@@ -23,6 +21,81 @@ BUILD_DEPENDS_armv7= as:devel/binutils
BUILD_DEPENDS_i386= nasm:devel/nasm
HAS_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-alsa \
+ --disable-libopencore-amrnb \
+ --disable-libopencore-amrwb \
+ --disable-libaribb24 \
+ --disable-libbs2b \
+ --disable-libcaca \
+ --disable-libcdio \
+ --disable-libcodec2 \
+ --disable-libdavs2 \
+ --disable-libdc1394 \
+ --disable-libfdk-aac \
+ --disable-libflite \
+ --disable-libfribidi \
+ --disable-libglslang \
+ --disable-libgme \
+ --disable-libgsm \
+ --disable-libilbc \
+ --disable-libjack \
+ --disable-libkvazaar \
+ --disable-ladspa \
+ --disable-libklvanc \
+ --disable-liblensfun \
+ --disable-libbluray \
+ --disable-librsvg \
+ --disable-lv2 \
+ --disable-libmfx \
+ --disable-libmodplug \
+ --disable-libmysofa \
+ --disable-nvenc \
+ --disable-openal \
+ --disable-opencl \
+ --disable-opengl \
+ --disable-libopenh264 \
+ --disable-libopenjpeg \
+ --disable-libopenmpt \
+ --disable-libopenvino \
+ --disable-pocketsphinx \
+ --disable-libpulse \
+ --disable-librabbitmq \
+ --disable-librav1e \
+ --disable-librist \
+ --disable-librubberband \
+ --disable-sdl2 \
+ --disable-libsmbclient \
+ --disable-libsnappy \
+ --disable-sndio \
+ --disable-libsoxr \
+ --disable-libspeex \
+ --disable-libsrt \
+ --disable-libssh \
+ --disable-libtensorflow \
+ --disable-libtesseract \
+ --disable-libtheora \
+ --disable-libtwolame \
+ --disable-libuavs3d \
+ --disable-vapoursynth \
+ --disable-libvidstab \
+ --disable-libvo-amrwbenc \
+ --disable-vulkan \
+ --disable-libxavs2 \
+ --disable-libxvid \
+ --disable-outdev=xv \
+ --disable-libzimg \
+ --disable-libzmq \
+ --disable-libzvbi \
+ --disable-gcrypt \
+ --disable-mbedtls \
+ --disable-openssl \
+ --disable-libtls \
+ --disable-nonfree
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--disable-stripping
+.else
+CONFIGURE_ARGS+=--disable-debug
+.endif
CONFIGURE_LOG= ffbuild/config.log
USES= compiler:c11 cpe gmake localbase:ldflags perl5 \
pkgconfig shebangfix tar:xz
@@ -32,186 +105,26 @@ SHEBANG_FILES= doc/texi2pod.pl
NOPRECIOUSMAKEVARS= yes # ARCH
.ifdef PKGNAMESUFFIX
-PORTSCOUT= limit:^4\.
+PORTSCOUT= limit:^6\.
PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default
.endif
-# Option CHROMAPRINT disabled, it cannot work and people are baffled.
-OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \
- CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \
- FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC \
- JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBRSVG2 \
- LIBXML2 LTO LV2 MODPLUG MYSOFA NETWORK NVENC OPENAL OPENCL OPENGL \
- OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \
- PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SMB SNAPPY \
- SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \
- TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \
- VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \
- XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI
-# intel-media-sdk only for i386/amd64
-OPTIONS_DEFINE_amd64= MFX
-OPTIONS_DEFINE_i386= MFX
-
-OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \
- GNUTLS ICONV LAME LIBXML2 NETWORK OPTIMIZED_CFLAGS OPUS \
- RTCPU SVTAV1 V4L VAAPI VDPAU VMAF VORBIS VPX WEBP X264 \
- X265 XCB
-
-# i386 is too register-starved for LTO (PR257124)
-OPTIONS_EXCLUDE_i386= LTO
-
-.if !exists(${.CURDIR:H:H}/multimedia/davs2)
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5985a1bf7233
-OPTIONS_EXCLUDE+= DAVS2
-.endif
-
-.if !exists(${.CURDIR:H:H}/multimedia/uavs3d)
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c952db9d68d3
-OPTIONS_EXCLUDE+= UAVS3D
-.endif
-
-.if !exists(${.CURDIR:H:H}/multimedia/xavs2)
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/85a921f4618
-OPTIONS_EXCLUDE+= XAVS2
-.endif
-
-.if !exists(${.CURDIR:H:H}/multimedia/klvanc)
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/8732dfa9954
-OPTIONS_EXCLUDE+= KLVANC
-.endif
-
-.if !exists(${.CURDIR:H:H}/science/openvino)
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ff37ebaf30e6
-OPTIONS_EXCLUDE+= OPENVINO
-.endif
-
-OPTIONS_RADIO= RTMP SSL
-OPTIONS_RADIO_RTMP= GCRYPT GMP
-OPTIONS_RADIO_SSL= GNUTLS MBEDTLS OPENSSL
-OPTIONS_GROUP= LICENSE
-OPTIONS_GROUP_LICENSE= GPL3 NONFREE
-
-ASS_DESC= Subtitles rendering via libass
-AOM_DESC= AV1 video encoding/decoding via libaom
-ARIBB24_DESC= ARIB text and caption decoding via libaribb24
-BS2B_DESC= Bauer Stereophonic-to-Binaural filter
-CHROMAPRINT_DESC= Audio fingerprinting with chromaprint
-CODEC2_DESC= Codec 2 audio encoding/decoding via libcodec2
-DAV1D_DESC= AV1 video decoding via libdav1d
-DAVS2_DESC= AVS2 decoding via libdavs2
-DC1394_DESC= IIDC-1394 grabbing using libdc1394
-DRM_DESC= KMS grabbing using libdrm
-FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
-FLITE_DESC= Voice synthesis support via libflite
-GLSLANG_DESC= GLSL->SPIRV compilation via libglslang
-GME_DESC= Game Music Emu demuxer
-GPL3_DESC= Allow (L)GPL version 3 code(cs)
-ILBC_DESC= Internet Low Bit Rate codec
-KLVANC_DESC= Kernel Labs VANC processing
-KVAZAAR_DESC= H.265 video codec support via Kvazaar
-LICENSE_DESC= Licensing options
-LV2_DESC= LV2 audio filtering
-MFX_DESC= Intel MediaSDK (aka Quick Sync Video)
-MYSOFA_DESC= SOFAlizer binaural filter
-NETWORK_DESC= Networking support
-NONFREE_DESC= Allow use of nonfree code
-NVENC_DESC= NVIDIA decoder/encoder with CUDA support
-OPENMPT_DESC= Decoding tracked files via libopenmpt
-OPENH264_DESC= H.264 video codec support via OpenH264
-OPENVINO_DESC= OpenVINO as a DNN module backend for DNN based filters like dnn_processing
-POCKETSPHINX_DESC= Automatic Speech Recognition via PocketSphinx
-RAV1E_DESC= AV1 encoding via librav1e
-RABBITMQ_DESC= AMQP 0-9-1 protocol via RabbitMQ
-RIST_DESC= Reliable Internet Stream Transport protocol via librist
-RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
-RTCPU_DESC= Detect CPU capabilities at runtime
-RTMP_DESC= RTMP(T)E protocol support
-SRT_DESC= Haivision SRT protocol via libsrt
-SVTAV1_DESC= AV1 encoding via SVT-AV1
-SVTHEVC_DESC= HEVC encoding via SVT-HEVC
-SVTVP9_DESC= VP9 encoding via SVT-VP9
-TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr
-TESSERACT_DESC= Optical Character Recognition via Tesseract
-THEORA_DESC= Encoding support for theora via libtheora
-UAVS3D_DESC= AVS3 decoding via libuavs3d
-VAPOURSYNTH_DESC= VapourSynth demuxer
-VIDSTAB_DESC= Video stabilization filter
-VMAF_DESC= VMAF filter via libvmaf
-VULKAN_DESC= Vulkan filters
-XAVS2_DESC= AVS2 encoding via libxavs2
-XCB_DESC= X11 grabbing using XCB
-XVID_DESC= Encoding support for MPEG-4 ASP via libxvid
-ZIMG_DESC= "z" library video scaling filter
-ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION}
-ZVBI_DESC= Teletext support via libzvbi
-
-OPTIONS_SUB= yes
-
-# alsa
-ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
-ALSA_CONFIGURE_ENABLE= alsa
-
-# Opencore AMR NB
-AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
-AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb
-AMR_NB_IMPLIES= GPL3
-
-# Opencore AMR WB
-AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr
-AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb
-AMR_WB_IMPLIES= GPL3
+OPTIONS_DEFINE= DOCS
# aom
-AOM_LIB_DEPENDS= libaom.so:multimedia/aom
-AOM_CONFIGURE_ENABLE= libaom
-
-# arib
-ARIBB24_LIB_DEPENDS= libaribb24.so:multimedia/aribb24
-ARIBB24_CONFIGURE_ENABLE= libaribb24
+LIB_DEPENDS+= libaom.so:multimedia/aom
+CONFIGURE_ARGS+= --enable-libaom
# asm support
-ASM_CONFIGURE_ENABLE= asm
+CONFIGURE_ARGS+= --enable-asm
# ass
-ASS_LIB_DEPENDS= libass.so:multimedia/libass
-ASS_CONFIGURE_ENABLE= libass
-
-# bs2b
-BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b
-BS2B_CONFIGURE_ENABLE= libbs2b
-
-# caca
-CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca
-CACA_CONFIGURE_ENABLE= libcaca
-
-# cdio
-CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia
-CDIO_CONFIGURE_ENABLE= libcdio
-
-# chromaprint
-CHROMAPRINT_BROKEN= Dependency loop
-CHROMAPRINT_LIB_DEPENDS= libchromaprint.so:audio/chromaprint
-CHROMAPRINT_CONFIGURE_ENABLE= chromaprint
-
-# codec2
-CODEC2_LIB_DEPENDS= libcodec2.so:audio/codec2
-CODEC2_CONFIGURE_ENABLE= libcodec2
+LIB_DEPENDS+= libass.so:multimedia/libass
+CONFIGURE_ARGS+= --enable-libass
# dav1d
-DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d
-DAV1D_CONFIGURE_ENABLE= libdav1d
-
-# davs2
-DAVS2_LIB_DEPENDS= libdavs2.so:multimedia/davs2
-DAVS2_CONFIGURE_ENABLE= libdavs2
-
-# dc1394
-DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394
-DC1394_CONFIGURE_ENABLE= libdc1394
-
-# debugging
-DEBUG_CONFIGURE_ON= --disable-stripping
-DEBUG_CONFIGURE_OFF= --disable-debug
+LIB_DEPENDS+= libdav1d.so:multimedia/dav1d
+CONFIGURE_ARGS+= --enable-libdav1d
# docs
DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html
@@ -219,387 +132,109 @@ DOCS_CONFIGURE_ENABLE= htmlpages
DOCS_BINARY_ALIAS= makeinfo=${FALSE} # force texi2html
# drm
-DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm
-DRM_CONFIGURE_ENABLE= libdrm
-
-# fdk_aac
-FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac
-FDK_AAC_CONFIGURE_ENABLE= libfdk-aac
-FDK_AAC_IMPLIES= NONFREE
-
-# flite
-FLITE_LIB_DEPENDS= libflite.so:audio/flite
-FLITE_CONFIGURE_ENABLE= libflite
+LIB_DEPENDS+= libdrm.so:graphics/libdrm
+CONFIGURE_ARGS+= --enable-libdrm
# fontconfig
-FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
-FONTCONFIG_CONFIGURE_ENABLE= fontconfig
+LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig
+CONFIGURE_ARGS+= --enable-fontconfig
# freetype
-FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
-FREETYPE_CONFIGURE_ENABLE= libfreetype
+LIB_DEPENDS+= libfreetype.so:print/freetype2
+CONFIGURE_ARGS+= --enable-libfreetype
# frei0r
-FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r
-FREI0R_CONFIGURE_ENABLE= frei0r
-
-# fribidi
-FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
-FRIBIDI_CONFIGURE_ENABLE= libfribidi
-
-# gcrypt
-GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
-GCRYPT_CONFIGURE_ENABLE= gcrypt
-
-# glslang
-GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang \
- spirv-tools>0:graphics/spirv-tools
-GLSLANG_CONFIGURE_ENABLE= libglslang
-GLSLANG_LDFLAGS= -lm
-GLSLANG_IMPLIES= VULKAN
+BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:graphics/frei0r
+CONFIGURE_ARGS+= --enable-frei0r
# gnutls
-GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
-GNUTLS_CONFIGURE_ENABLE= gnutls
-
-# gme
-GME_LIB_DEPENDS= libgme.so:audio/libgme
-GME_CONFIGURE_ENABLE= libgme
+LIB_DEPENDS+= libgnutls.so:security/gnutls
+CONFIGURE_ARGS+= --enable-gnutls
# gmp
-GMP_LIB_DEPENDS= libgmp.so:math/gmp
-GMP_CONFIGURE_ENABLE= gmp
-GMP_IMPLIES= GPL3
-
-# gsm
-GSM_LIB_DEPENDS= libgsm.so:audio/gsm
-GSM_CONFIGURE_ENABLE= libgsm
+LIB_DEPENDS+= libgmp.so:math/gmp
+CONFIGURE_ARGS+= --enable-gmp
# iconv
-ICONV_USES= iconv
-ICONV_CONFIGURE_ENABLE= iconv
-
-# ilbc
-ILBC_LIB_DEPENDS= libilbc.so:net/libilbc
-ILBC_CONFIGURE_ENABLE= libilbc
-
-# jack
-JACK_LIB_DEPENDS= libjack.so:audio/jack
-JACK_CONFIGURE_ENABLE= libjack
-
-# klvanc
-KLVANC_LIB_DEPENDS= libklvanc.so:multimedia/libklvanc
-KLVANC_CONFIGURE_ENABLE= libklvanc
-
-# kvazaar
-KVAZAAR_LIB_DEPENDS= libkvazaar.so:multimedia/kvazaar
-KVAZAAR_CONFIGURE_ENABLE= libkvazaar
-
-# ladspa
-LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa
-LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
-LADSPA_CONFIGURE_ENABLE= ladspa
+USES+= iconv
+CONFIGURE_ARGS+= --enable-iconv
# lame
-LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
-LAME_CONFIGURE_ENABLE= libmp3lame
-
-# lensfun
-LENSFUN_LIB_DEPENDS= liblensfun.so:graphics/lensfun
-LENSFUN_CONFIGURE_ENABLE= liblensfun
-
-# libbluray
-LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
-LIBBLURAY_CONFIGURE_ENABLE= libbluray
-
-# librsvg
-LIBRSVG2_USES= gnome
-LIBRSVG2_USE= GNOME=cairo,librsvg2
-LIBRSVG2_CONFIGURE_ENABLE= librsvg
+LIB_DEPENDS+= libmp3lame.so:audio/lame
+CONFIGURE_ARGS+= --enable-libmp3lame
# libxml
-LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2
-LIBXML2_CONFIGURE_ENABLE= libxml2
-
-# lto
-LTO_CONFIGURE_ENABLE= lto
-
-# lv2
-LV2_BUILD_DEPENDS= lv2>0:audio/lv2
-LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv
-LV2_CONFIGURE_ENABLE= lv2
+USES+= gnome
+USE_GNOME+= libxml2
+CONFIGURE_ARGS+= --enable-libxml2
# libv4l
-V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat
-V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
-V4L_CONFIGURE_ENABLE= libv4l2
-V4L_CONFIGURE_OFF= --disable-indev=v4l2 \
- --disable-outdev=v4l2
-
-# mbedtls
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2
-MBEDTLS_CONFIGURE_ENABLE= mbedtls
-
-# mfx
-MFX_LIB_DEPENDS= libmfx.so:multimedia/intel-media-sdk
-MFX_CONFIGURE_ENABLE= libmfx
-
-# modplug
-MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug
-MODPLUG_CONFIGURE_ENABLE= libmodplug
-
-# mysofa
-MYSOFA_LIB_DEPENDS= libmysofa.so:audio/libmysofa
-MYSOFA_CONFIGURE_ENABLE= libmysofa
+BUILD_DEPENDS+= v4l_compat>0:multimedia/v4l_compat
+LIB_DEPENDS+= libv4l2.so:multimedia/libv4l
+CONFIGURE_ARGS+= --enable-libv4l2
# network
-NETWORK_CONFIGURE_ENABLE= network
-
-# nvenc
-NVENC_BROKEN= Fails to configure or build with ffnvcodec-headers >= 13.0
-NVENC_BUILD_DEPENDS= ${LOCALBASE}/include/ffnvcodec/nvEncodeAPI.h:multimedia/ffnvcodec-headers
-NVENC_CONFIGURE_ENABLE= nvenc
-
-# OpenAL
-OPENAL_LIB_DEPENDS= libopenal.so:audio/openal-soft
-OPENAL_CONFIGURE_ENABLE= openal
-
-# opencl
-OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl
-OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd
-OPENCL_CONFIGURE_ENABLE= opencl
-
-# opengl
-OPENGL_USES= gl
-OPENGL_USE= GL=gl
-OPENGL_CONFIGURE_ENABLE= opengl
-
-# openh264
-OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264
-OPENH264_CONFIGURE_ENABLE= libopenh264
-
-# openjpeg
-OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
-OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
-
-# openmpt
-OPENMPT_LIB_DEPENDS= libopenmpt.so:audio/libopenmpt
-OPENMPT_CONFIGURE_ENABLE= libopenmpt
-
-# openssl/libtls
-OPENSSL_USES= ssl
-OPENSSL_CONFIGURE_ENABLE= ${"${SSL_DEFAULT:Mlibressl*}"!="":?libtls:openssl}
-OPENSSL_IMPLIES= NONFREE
-
-# openvino
-OPENVINO_LIB_DEPENDS= libinference_engine_c_api.so:science/openvino
-OPENVINO_CONFIGURE_ENABLE= libopenvino
+CONFIGURE_ARGS+= --enable-network
# optimizations
-OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations
+CONFIGURE_ARGS+= --enable-optimizations
# opus
-OPUS_LIB_DEPENDS= libopus.so:audio/opus
-OPUS_CONFIGURE_ENABLE= libopus
-
-# pocketsphinx
-POCKETSPHINX_LIB_DEPENDS= libpocketsphinx.so:audio/pocketsphinx
-POCKETSPHINX_CONFIGURE_ENABLE= pocketsphinx
-POCKETSPHINX_BROKEN= pocketsphinx < 5prealpha is not supported
-
-# pulseaudio
-PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
-PULSEAUDIO_CONFIGURE_ENABLE= libpulse
-
-# rav1e
-RAV1E_LIB_DEPENDS= librav1e.so:multimedia/librav1e
-RAV1E_CONFIGURE_ENABLE= librav1e
-
-# rabbitmq
-RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c
-RABBITMQ_CONFIGURE_ENABLE= librabbitmq
-
-# rist
-RIST_LIB_DEPENDS= librist.so:multimedia/librist
-RIST_CONFIGURE_ENABLE= librist
-
-# rubberband
-RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband
-RUBBERBAND_CONFIGURE_ENABLE= librubberband
+LIB_DEPENDS+= libopus.so:audio/opus
+CONFIGURE_ARGS+= --enable-libopus
# rtcpu
-RTCPU_CONFIGURE_ENABLE= runtime-cpudetect
-
-# sdl
-SDL_USES= sdl
-SDL_USE= SDL=sdl2
-SDL_CONFIGURE_ENABLE= sdl2
-
-# smbclient
-SMB_USES= samba:lib
-SMB_CONFIGURE_ENABLE= libsmbclient
-SMB_IMPLIES= GPL3
-
-# snappy
-SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
-SNAPPY_CONFIGURE_ENABLE= libsnappy
-
-# sndio
-SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
-SNDIO_CONFIGURE_ENABLE= sndio
-
-# soxr
-SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
-SOXR_CONFIGURE_ENABLE= libsoxr
-
-# speex
-SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
-SPEEX_CONFIGURE_ENABLE= libspeex
-
-# ssh
-SSH_LIB_DEPENDS= libssh.so:security/libssh
-SSH_CONFIGURE_ENABLE= libssh
-
-# srt
-SRT_LIB_DEPENDS= libsrt.so:www/srt
-SRT_CONFIGURE_ENABLE= libsrt
+CONFIGURE_ARGS+= --enable-runtime-cpudetect
# svt-av1
-SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1
-SVTAV1_CONFIGURE_ON= --enable-libsvtav1
-
-# svt-hevc
-SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc
-SVTHEVC_CONFIGURE_ON= --enable-libsvthevc
-SVTHEVC_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.0-3-g86b58f77/ffmpeg_plugin/:svthevc
-SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
- 0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
-.if make(makesum)
-.MAKEFLAGS: WITH+=SVTHEVC
-.endif
-
-# svt-vp9
-SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9
-SVTVP9_CONFIGURE_ON= --enable-libsvtvp9
-SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-4-gabd5c59/ffmpeg_plugin/:svtvp9
-SVTVP9_PATCHFILES= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
-.if make(makesum)
-.MAKEFLAGS: WITH+=SVTVP9
-.endif
-
-# tensorflow
-TENSORFLOW_LIB_DEPENDS= libtensorflow.so:science/py-tensorflow
-TENSORFLOW_CONFIGURE_ENABLE= libtensorflow
-
-# tesseract
-TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract
-TESSERACT_CONFIGURE_ENABLE= libtesseract
-
-# theora
-THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora
-THEORA_CONFIGURE_ENABLE= libtheora
-
-# twolame
-TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
-TWOLAME_CONFIGURE_ENABLE= libtwolame
-
-# uavs3d
-UAVS3D_LIB_DEPENDS= libuavs3d.so:multimedia/uavs3d
-UAVS3D_CONFIGURE_ENABLE= libuavs3d
+LIB_DEPENDS+= libSvtAv1Enc.so:multimedia/svt-av1
+CONFIGURE_ARGS+= --enable-libsvtav1
# vaapi
-VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
-VAAPI_CONFIGURE_ENABLE= vaapi
-
-# vapoursynth
-VAPOURSYNTH_LIB_DEPENDS= libvapoursynth-script.so:multimedia/vapoursynth
-VAPOURSYNTH_CONFIGURE_ENABLE= vapoursynth
+LIB_DEPENDS+= libva.so:multimedia/libva
+CONFIGURE_ARGS+= --enable-vaapi
# vdpau
-VDPAU_USES= xorg
-VDPAU_USE= XORG=x11
-VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
-VDPAU_CONFIGURE_ENABLE= vdpau
+USES+= xorg
+USE_XORG+= x11
+LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau
+CONFIGURE_ARGS+= --enable-vdpau
# vmaf
-VMAF_LIB_DEPENDS= libvmaf.so:multimedia/vmaf
-VMAF_CONFIGURE_ENABLE= libvmaf
-
-# vo-amrwbenc
-VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc
-VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc
-VO_AMRWBENC_IMPLIES= GPL3
-
-# vid.stab
-VIDSTAB_LIB_DEPENDS= libvidstab.so:multimedia/vid.stab
-VIDSTAB_CONFIGURE_ENABLE= libvidstab
+LIB_DEPENDS+= libvmaf.so:multimedia/vmaf
+CONFIGURE_ARGS+= --enable-libvmaf
# vorbis
-VORBIS_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis
-VORBIS_CONFIGURE_ENABLE= libvorbis
+LIB_DEPENDS+= libvorbisenc.so:audio/libvorbis
+CONFIGURE_ARGS+= --enable-libvorbis
# vp8
-VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
-VPX_CONFIGURE_ENABLE= libvpx
-
-# vulkan
-VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
-VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
-VULKAN_CONFIGURE_ENABLE= vulkan
+LIB_DEPENDS+= libvpx.so:multimedia/libvpx
+CONFIGURE_ARGS+= --enable-libvpx
# webp
-WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
-WEBP_CONFIGURE_ENABLE= libwebp
+LIB_DEPENDS+= libwebp.so:graphics/webp
+CONFIGURE_ARGS+= --enable-libwebp
# x264
-X264_LIB_DEPENDS= libx264.so:multimedia/libx264
-X264_CONFIGURE_ENABLE= libx264
+LIB_DEPENDS+= libx264.so:multimedia/libx264
+CONFIGURE_ARGS+= --enable-libx264
# x265
-X265_LIB_DEPENDS= libx265.so:multimedia/x265
-X265_CONFIGURE_ENABLE= libx265
-
-# xavs2
-XAVS2_LIB_DEPENDS= libxavs2.so:multimedia/xavs2
-XAVS2_CONFIGURE_ENABLE= libxavs2
+LIB_DEPENDS+= libx265.so:multimedia/x265
+CONFIGURE_ARGS+= --enable-libx265
# xcb
-XCB_USES= xorg
-XCB_USE= XORG=xcb
-XCB_CONFIGURE_ENABLE= libxcb
-
-# xvid
-XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid
-XVID_CONFIGURE_ENABLE= libxvid
-
-# xv
-XVIDEO_USES= xorg
-XVIDEO_USE= XORG=x11,xext,xv
-XVIDEO_CONFIGURE_OFF= --disable-outdev=xv
-
-# zimg
-ZIMG_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg
-ZIMG_CONFIGURE_ENABLE= libzimg
-
-# zmq
-ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq${ZMQ_VERSION}
-ZMQ_CONFIGURE_ENABLE= libzmq
-ZMQ_VERSION?= 4
-
-# zvbi
-ZVBI_LIB_DEPENDS= libzvbi.so:devel/libzvbi
-ZVBI_CONFIGURE_ENABLE= libzvbi
+#USES+= xorg
+USE_XORG+= xcb
+CONFIGURE_ARGS+= --enable-libxcb
# License knobs
-GPL3_CONFIGURE_ENABLE= version3
-GPL3_VARS= LICENSE="GPLv3+ LGPL3+"
-LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING.GPLv3
-LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LGPLv3
-
-NONFREE_CONFIGURE_ENABLE=nonfree
+CONFIGURE_ARGS+= --enable-version3
INSTALL_TARGET= install-progs install-doc install-data \
install-libs install-headers install-examples
+#TEST_TARGET= check
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
@@ -619,7 +254,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--enable-shared \
--enable-pic \
--enable-gpl \
- --enable-avresample \
--cc="${CC}" \
--cxx="${CXX}"
@@ -629,16 +263,6 @@ DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
DOC_DOCFILES= APIchanges *.txt
PORTDOCS= *
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNONFREE}
-LICENSE+= NONFREE
-LICENSE_COMB= multi
-LICENSE_NAME_NONFREE= Non free code
-LICENSE_TEXT_NONFREE= enabling OPENSSL or FDK_AAC restricts redistribution
-LICENSE_PERMS_NONFREE= auto-accept
-.endif
-
post-install:
(cd ${WRKSRC} && ${COPYTREE_SHARE} \
"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})
diff --git a/multimedia/ffmpeg6/distinfo b/multimedia/ffmpeg6/distinfo
index 287f9dba3d86..176f745232d7 100644
--- a/multimedia/ffmpeg6/distinfo
+++ b/multimedia/ffmpeg6/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1681325571
-SHA256 (ffmpeg-4.4.4.tar.xz) = e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
-SIZE (ffmpeg-4.4.4.tar.xz) = 9565584
+TIMESTAMP = 1773574763
+SHA256 (ffmpeg-6.1.4.tar.xz) = a231e3d5742c44b1cdaebfb98ad7b6200d12763e0b6db9e1e2c5891f2c083a18
+SIZE (ffmpeg-6.1.4.tar.xz) = 10479060
SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 376ea23e9d876390fbca936c80cb437bb9daa6232ff65df0ea91673e18b739ff
SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 24259
SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = d16589efc4be2602a9f436e9938cfee0cc7b5ccd7a4a6b41c0c9a59ae0859fda
diff --git a/multimedia/ffmpeg6/files/patch-configure b/multimedia/ffmpeg6/files/patch-configure
index 6135beab7ee8..0487e53ede67 100644
--- a/multimedia/ffmpeg6/files/patch-configure
+++ b/multimedia/ffmpeg6/files/patch-configure
@@ -1,6 +1,8 @@
---- configure.orig 2023-04-12 18:52:51 UTC
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d
+
+--- configure.orig 2025-11-23 02:57:58 UTC
+++ configure
-@@ -3784,13 +3784,7 @@ target_os_default=$(tolower $(uname -s))
+@@ -3963,15 +3963,7 @@ host_os=$target_os_default
host_os=$target_os_default
# machine
@@ -8,6 +10,8 @@
- arch_default=$(uname -p)
- strip_default="strip -X32_64"
- nm_default="nm -g -X32_64"
+-elif test "$MSYSTEM_CARCH" != ""; then
+- arch_default="$MSYSTEM_CARCH"
-else
- arch_default=$(uname -m)
-fi
@@ -15,29 +19,17 @@
cpu="generic"
intrinsics="none"
-@@ -5387,6 +5381,7 @@ case $target_os in
- disable symver
- ;;
- freebsd)
-+ enable section_data_rel_ro
- ;;
- bsd/os)
- add_extralibs -lpoll -lgnugetopt
-@@ -6369,7 +6369,7 @@ enabled libfribidi && require_pkg_config libfri
- enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
+@@ -6729,12 +6721,7 @@ enabled libharfbuzz && require_pkg_config libhar
enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
--enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
+ enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
+-enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
+- -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
+- -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
+- require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
+- -lglslang -lOSDependent -lHLSL -lOGLCompiler \
+- -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
+enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-@@ -6758,7 +6753,7 @@ enabled vulkan &&
-
- if enabled x86; then
- case $target_os in
-- mingw32*|mingw64*|win32|win64|linux|cygwin*)
-+ freebsd|mingw32*|mingw64*|win32|win64|linux|cygwin*)
- ;;
- *)
- disable ffnvcodec cuvid nvdec nvenc
diff --git a/multimedia/ffmpeg6/files/patch-doc-Makefile b/multimedia/ffmpeg6/files/patch-doc-Makefile
index 52ab4033ad98..85ecbde5f2f2 100644
--- a/multimedia/ffmpeg6/files/patch-doc-Makefile
+++ b/multimedia/ffmpeg6/files/patch-doc-Makefile
@@ -1,6 +1,6 @@
---- doc/Makefile.orig 2015-06-19 20:44:35 UTC
+--- doc/Makefile.orig 2025-11-23 02:57:58 UTC
+++ doc/Makefile
-@@ -145,7 +145,7 @@ install-html: $(HTMLPAGES)
+@@ -123,7 +123,7 @@ ifdef CONFIG_MANPAGES
endif
ifdef CONFIG_MANPAGES
diff --git a/multimedia/ffmpeg6/files/patch-libavcodec_libsvtav1.c b/multimedia/ffmpeg6/files/patch-libavcodec_libsvtav1.c
index 36eb954b63e1..f707c5aa6d81 100644
--- a/multimedia/ffmpeg6/files/patch-libavcodec_libsvtav1.c
+++ b/multimedia/ffmpeg6/files/patch-libavcodec_libsvtav1.c
@@ -1,8 +1,18 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/d1ed5c06e3ed
-
---- libavcodec/libsvtav1.c.orig 2024-08-01 23:22:48 UTC
+--- libavcodec/libsvtav1.c.orig 2025-11-23 02:57:58 UTC
+++ libavcodec/libsvtav1.c
-@@ -389,7 +389,11 @@ static av_cold int eb_enc_init(AVCodecContext *avctx)
+@@ -195,7 +195,11 @@ static int config_enc_params(EbSvtAv1EncConfiguration
+ } else if (svt_enc->qp > 0) {
+ param->qp = svt_enc->qp;
+ param->rate_control_mode = 0;
++#if SVT_AV1_CHECK_VERSION(4, 0, 1)
++ param->aq_mode = 0;
++#else
+ param->enable_adaptive_quantization = 0;
++#endif
+ }
+
+ desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+@@ -389,7 +393,11 @@ static av_cold int eb_enc_init(AVCodecContext *avctx)
svt_enc->eos_flag = EOS_NOT_REACHED;
diff --git a/multimedia/ffmpeg6/files/patch-libavdevice_v4l2.c b/multimedia/ffmpeg6/files/patch-libavdevice_v4l2.c
deleted file mode 100644
index 8518fadce3af..000000000000
--- a/multimedia/ffmpeg6/files/patch-libavdevice_v4l2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-- ioctl() prototype on BSDs follows Version 7 AT&T UNIX
-
---- libavdevice/v4l2.c.orig 2019-04-21 04:37:17 UTC
-+++ libavdevice/v4l2.c
-@@ -95,10 +95,10 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#ifdef __GLIBC__
-- int (*ioctl_f)(int fd, unsigned long int request, ...);
--#else
-+#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
- int (*ioctl_f)(int fd, int request, ...);
-+#else
-+ int (*ioctl_f)(int fd, unsigned long int request, ...);
- #endif
- ssize_t (*read_f)(int fd, void *buffer, size_t n);
- void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
diff --git a/multimedia/ffmpeg6/files/patch-libavfilter_glslang.cpp b/multimedia/ffmpeg6/files/patch-libavfilter_glslang.cpp
deleted file mode 100644
index a331fdeb349f..000000000000
--- a/multimedia/ffmpeg6/files/patch-libavfilter_glslang.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- libavfilter/glslang.cpp.orig 2023-04-12 18:01:50 UTC
-+++ libavfilter/glslang.cpp
-@@ -16,6 +16,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include <cassert>
- #include <pthread.h>
-
- extern "C" {
diff --git a/multimedia/ffmpeg6/files/patch-libavfilter_vf__lensfun.c b/multimedia/ffmpeg6/files/patch-libavfilter_vf__lensfun.c
index 805d07687521..0bc120e8a03d 100644
--- a/multimedia/ffmpeg6/files/patch-libavfilter_vf__lensfun.c
+++ b/multimedia/ffmpeg6/files/patch-libavfilter_vf__lensfun.c
@@ -2,9 +2,9 @@ Partially revert https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/8b78eb312de
until graphics/lensfun is updated to a version that contains
https://github.com/lensfun/lensfun/commit/b135e05d729d
---- libavfilter/vf_lensfun.c.orig 2021-04-08 21:28:40 UTC
+--- libavfilter/vf_lensfun.c.orig 2025-11-23 02:57:58 UTC
+++ libavfilter/vf_lensfun.c
-@@ -222,20 +222,39 @@ static int config_props(AVFilterLink *inlink)
+@@ -213,20 +213,39 @@ static int config_props(AVFilterLink *inlink)
if (!lensfun->modifier) {
if (lensfun->camera && lensfun->lens) {
diff --git a/multimedia/ffmpeg6/files/patch-libavformat_rtsp.c b/multimedia/ffmpeg6/files/patch-libavformat_rtsp.c
index 7cd751dbd79c..0a2343320910 100644
--- a/multimedia/ffmpeg6/files/patch-libavformat_rtsp.c
+++ b/multimedia/ffmpeg6/files/patch-libavformat_rtsp.c
*** 1761 LINES SKIPPED ***