CVS commit: pkgsrc/multimedia

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep 22 14:23:24 UTC 2025

Modified Files:
        pkgsrc/multimedia/ffmpeg6: Makefile Makefile.common distinfo
        pkgsrc/multimedia/ffmpeg6/patches: patch-configure
        pkgsrc/multimedia/ffplay6: Makefile
Removed Files:
        pkgsrc/multimedia/ffmpeg6/patches: patch-libavcodec_libx265.c

Log Message:
ffmpeg6 ffplay6: updated to 6.1.3

version 6.1.3:
 libavfilter/dnn/dnn_backend_tf: Remove redundant av_freep() to avoid double free
 avcodec/dxv: Check that we initialize op_data
 avcodec/exr: Check for pixel type consistency in DWA
 avcodec/libvorbisdec: avoid overflow when assinging sample rate from long to int
 avcodec/g726: init missing sample rate
 avformat/lrcdec: limit input timestamp range to avoid overflows
 avcodec/scpr3: Clear clr
 avcodec/ilbcdec: Clear cbvec when used with create_augmented_vector()
 avcodec/jpeg2000dec: Make sure the 4 extra bytes allocated are initialized
 avfilter/avf_showcqt: fix unbounded index when copying to fft_data
 avcodec/aacsbr_template: Check ilb
 avcodec/utvideodec: Set B for the width= 1 case
 avcodec/ffv1: Clear state on alloc
 avcodec/jpeg2000dec: implement cdef remapping during pixel format matching
 avcodec/jpeg2000dec: move cdef default check into get_siz()
 avcodec/exr: Check rle_raw_data and surroundings
 avcodec/exr: Dont access outside xsize/ysize
 examples: Add check and replace av_free() to avoid potential memory errors
 libavcodec/tests/snowenc: Add av_free() to avoid memory leak
 libavfilter/af_firequalizer: Add check for av_malloc_array()
 libavcodec/videotoolbox_vp9: Move av_malloc() to avoid memory leak
 avcodec/mpc8: init avctx->sample_rate
 avcodec/cbs_h266_syntax_template: fix out of bounds access
 avformat/libopenmpt: fix seeking weirdness
 avformat/hls: add cmfv/cmfa exceptions
 avformat/lrcdec: support arbitrary precision timestamp
 avcodec/ffv1dec: Disable frame threading due to race condition
 (origin/release/6.1, fforge/release/6.1) swscale/swscale_unscaled: use 8 line alignment for planarCopyWrapper with dithering
 Update for 6.1.3
 libavcodec/tests/motion: Add check for avcodec_alloc_context3()
 avcodec/tests/avpacket: Add av_free() to avoid memory leak
 examples: Add av_freep to avoid potential memory leak
 avcodec/tests/avpacket: Add av_packet_free() to avoid memory leak
 avcodec/fits: Clear naxis
 avcodec/vqavideo; Check bytestream2_get_buffer() reading next_codebook_buffer
 avcodec/lzf: Check for input space
 avcodec/imc: Clear padding of buf16
 avcodec/iff: Clear ham_buf
 avcodec/cri: Check bytestream2_get_buffer() for end
 avcodec/cri: Factor read_len out
 avformat/dashdec: Allocate space for appended "/"
 avcodec/mpegvideo_dec: Fix lowres=3 field select interlaced mpeg4 frame
 avformat/mxg: clear AV_INPUT_BUFFER_PADDING_SIZE
 avformat/vqf: Ensure that comm_chunk is fully read
 avformat/mov: make sure file_checksum is fully initialized
 avformat/asfdec_f: Check amount of value read
 avcodec/jpegxl_parser: add sanity check for frame size
 avformat/concatdec: Clip duration in one more case in get_best_effort_duration()
 avcodec/ffv1dec: Check k in get_vlc_symbol()
 avcodec/cfhd: Check idwt_buf size before allocation
 avcodec/ivi: Check luma/chroma mb_size
 avcodec/motion_est: don't add offsets to NULL pointers
 swscale/swscale_unscaled: don't add offsets to NULL pointers
 libavcodec/alsdec.c: Add check for av_malloc_array() and av_calloc()
 avcodec/psd: Move frame allocation after RLE processing
 avcodec/smacker: Move buffer allocation to later
 avcodec/opus: don't materialize buf pointer from null
 avcodec/speexdec: consider differing frame sizes in remaining space check
 avformat/iff: Check nb_channels == 0 in CHNL
 avcodec/osq: Request a coding mode 2 sample
 avcodec/osq: Switch back to av_ceil_log2()
 avcodec/osq: Add note about update_stats() count
 avcodec/osq: Fix signed integer overflow in update_stats()
 avcodec/mss2dsp: use FF_PTR_ADD to add offsets to a pointer
 avformat/movenc: fix writing reserved bits in EC3SpecificBox
 avcodec/hevc/hevcdec: Check num_entry_point_offsets
 avcodec/speexdec: Pass and check remaining packets to decode functions
 avcodec/rkmppdec: Fix double-free on error
 avcodec/ppc/vp8dsp_altivec: Fix out-of-bounds access
 fftools/ffmpeg_demux: don't flag timestamps as unreliable if they are generated
 avformat/matroskadec: check that channels fit in signed 32bit int
 avcodec/takdec: Check remaining space for first predictors
 avcodec/svq3: Check there are bits left before decompression
 avcodec/sonic: Check num_taps
 avformat/imf_cpl: fix indention after previous commit
 avformat/imf_cpl: do not continue looping forever
 avformat/mov: reject negative ELST durations
 avformat/avidec: Ignore duplicate GAB2
 avcodec/h264_mb: Fix tmp_cr for arm
 avcodec/vorbisdec: Dont treat overread as error
 avformat/iff: Check nb_channels == 0 in MHDR
 tests/fate/filter-video: Fix dependancy for codecview
 libpostproc: check minimum size
 avformat/hls: Fix flash1.bogulus.cfd support
 avformat/hls: Split allowed_segment_extensions off allowed_extensions
 avformat/hls: Fix Youtube AAC
 avformat/hls: add fmp4 to allowed_extensions
 avformat/hls: Add ec3 to allowed_extensions
 avformat/hls: Add cmfv and cmfa to allowed_extensions
 postproc/postprocess_template: Fix reading uninitialized pixels in dering_C()
 configure: Clearer documentation for "disable-safe-bitstream-reader"
 avcodec/osq: avoid undefined negation
 swscale/output: Fix integer overflow in yuv2gbrp_full_X_c()
 avcodec/libtheora: fix setting keyframe_mask
 avfilter/buffersrc: check for valid sample rate
 doc: replace http/git by https urls
 configure: update copyright year
 avformat/hls: Partially revert "reduce default max reload to 3"
 avfilter/asrc_afirsrc: fix by one smaller allocation of buffer
 avfilter/bwdif: account for chroma sub-sampling in min size calculation
 avfilter/af_afwtdn: fix crash with EOF handling
 avfilter/vf_colorcorrect: fix memory leaks
 avfilter/vf_codecview: fix heap buffer overflow
 avformat/iff: Check that we have a stream in read_dst_frame()
 avformat/mlvdec: fix size checks
 avformat/wavdec: Fix overflow of intermediate in block_align check
 avformat/mxfdec: Check edit unit for overflow in mxf_set_current_edit_unit()
 avformat/hls: Fix twitter
 libavformat/hls: Be more restrictive on mpegts extensions
 avformat/hls: .ts is always ok even if its a mov/mp4
 avcodec/h263dec: Check against previous dimensions instead of coded
 avformat/hls: Print input format in error message
 avformat/hls: Be more picky on extensions
 avformat/mxfdec: Check avio_read() success in mxf_decrypt_triplet()
 avcodec/huffyuvdec: Initialize whole output for decode_gray_bitstream()
 avformat/ipmovie: Check signature_buffer read
 avformat/wtvdec: Initialize buf
 avcodec/cbs_vp9: Initialize VP9RawSuperframeIndex
 avformat/vqf: Propagate errors from add_metadata()
 avformat/vqf: Check avio_read() in add_metadata()
 avformat/dashdec: Check whitelist
 avutil/avstring: dont mess with NULL pointers in av_match_list()
 avfilter/vf_v360: Fix NULL pointer use
 avcodec/mpegvideo_enc: Check FLV1 resolution limits
 avcodec/ffv1enc: Fix handling of 32bit unsigned symbols
 avcodec/vc1dec: Clear block_index in vc1_decode_reset()
 avcodec/aacsbr_template: Clear n_q on error
 avcodec/osq: Fixes several undefined overflows in do_decode()
 swscale/output: Fix undefined overflow in yuv2rgba64_full_X_c_template()
 avfilter/af_pan: Fix sscanf() use
 avfilter/vf_grayworld: Use the correct pointer for av_log()
 avfilter/vf_addroi: Add missing NULL termination to addroi_var_names[]()
 avcodec/get_buffer: Use av_buffer_mallocz() for audio same as its done for video
 avformat/jpegxl_anim_dec: clear buffer padding
 avformat/rmdec: check that buf if completely filled
 avcodec/cfhdenc: Clear dwt_tmp
 avcodec/hapdec: Clear tex buffer
 avformat/mxfdec: Check that key was read sucessfull
 avformat/rpl: Fix check for negative values
 avformat/mlvdec: Check avio_read()
 avcodec/utils: Fix block align overflow for ADPCM_IMA_WAV
 avformat/matroskadec: Check pre_ns for overflow
 tools/target_dec_fuzzer: Adjust threshold for EACMV
 tools/target_dec_fuzzer: Adjust threshold for MVC1
 tools/target_dec_fuzzer: Adjust Threshold for indeo5
 avutil/timecode: Avoid fps overflow in av_timecode_get_smpte_from_framenum()
 avcodec/webp: Check ref_x/y
 avcodec/ilbcdec: Initialize tempbuff2
 avformat/qcp: Check for read failure in header
 avcodec/eatgq: Check bytestream2_get_buffer() for failure
 avformat/dxa: check bpc
 swscale/slice: clear allocated memory in alloc_lines()
 avcodec/h2645_parse: Ignore NAL with nuh_layer_id == 63
 avcodec/mjpegdec: Disallow progressive bayer images
 avformat/icodec: fix integer overflow with nb_pal
 doc/developer: Document relationship between git accounts and MAINTAINERS
 avformat/vividas: Check avio_read() for failure
 avformat/ilbc: Check avio_read() for failure
 avformat/nistspheredec: Clear buffer
 avformat/mccdec: Initialize and check rate.den
 avformat/rpl: check channels
 INSTALL: explain the circular dependency issue and solution
 avformat/mpegts: Initialize predefined_SLConfigDescriptor_seen
 avformat/mxfdec: Fix overflow in midpoint computation
 swscale/output: used unsigned for bit accumulation
 avcodec/rangecoder: only perform renorm check/loop for callers that need it
 avcodec/ffv1dec: Fix end computation with ec=2
 avcodec/ffv1enc: Prevent generation of files with broken slices
 avformat/matroskadec: Check desc_bytes so bits fit in 64bit
 avformat/mov: Avoid overflow in dts
 avcodec/ffv1enc: Correct error message about unsupported version
 avcodec/ffv1enc: Slice combination is unsupported
 avcodec/ffv1enc: 2Pass mode is not possible with golomb coding
 avcodec/ffv1enc: Fix >8bit context size
 avcodec/xan: Add basic input size check
 avcodec/imm4: Check input size
 avcodec/svq3: Check for minimum size input
 avcodec/eacmv: Check input size for intra frames
 tools/target_dec_fuzzer: Adapt threshold for RASC
 avcodec/encode: Check bitrate
 avcodec/cbs_h266_syntax_template: Check bit depth with range extension
 avcodec/osq: use unsigned for decorrelation
 avcodec/jfdctint_template: use unsigned z* in row_fdct()
 avformat/asf: Check picsize
 avcodec/osq: Treat sum = 0 as k = 0
 avformat/mxfdec: Check timecode for overflow
 avformat/mxfdec: More offset_temp checks
 swscale/output: Fix undefined integer overflow in yuv2rgba64_2_c_template()
 swscale/swscale: Use unsigned operation to avoid undefined behavior
 avcodec/vc2enc: basic sanity check on slice_max_bytes
 avformat/mvdec: Check if name was fully read
 avcodec/wmavoice: Do not use uninitialized pitch[0]
 avformat/argo_brp: Check that ASF chunk header is completely read
 avcodec/notchlc: Check bytes left before reading
 avcodec/vc1_block: propagate error codes
 avformat/apetag: Check APETAGEX
 avcodec/magicyuvenc: better slice height
 avcodec/avcodec: Warn about data returned from get_buffer*()
 avformat/av1dec: Better fix for 70872/clusterfuzz-testcase-minimized-ffmpeg_dem_OBU_fuzzer-6005782487826432
 avcodec/apac: Fix discards ‘const’ qualifier
 avcodec/alsdec: clear last_acf_mantissa
 avcodec/aic: Clear slice_data
 avcodec/vc1dec: Clear mb_type_base and ttblk_base
 avcodec/shorten: clear padding
 avformat/mpeg: Check an avio_read() for failure
 avcodec/apac: Clean padding space
 avcodec/mvha: Clear remaining space after inflate()
 bsf/media100_to_mjpegb: Clear output buffer padding
 avformat/segafilm: Set keyframe
 avcodec/sga: av_assert1 check init_get_bits8()
 tools/target_dec_fuzzer: Check that FFv1 doesnt leave uninitialized memory in its buffers
 avdevice/dshow: Initialize 2 pointers
 avcodec/dxva2: initialize hr in ff_dxva2_common_end_frame()
 avcodec/dxva2: initialize validate
 avcodec/dxva2: Initialize ConfigBitstreamRaw
 avcodec/dxva2: Initialize dxva_size and check it
 avfilter/vf_xfade: Compute w2, h2 with float
 avfilter/vf_v360: Assert that vf was initialized
 avfilter/vf_tonemap_opencl: Dereference after NULL check
 avfilter/af_surround: Check output format
 avfilter/vf_xfade_opencl: Check ff_inlink_consume_frame() for failure
 avformat/lmlm4: Eliminate some AVERROR(EIO)
 tools/target_dec_fuzzer: Use av_buffer_allocz() to avoid missing slices to have unpredictable content
 avformat/wtvdec: Check length of read mpeg2_descriptor
 avformat/wtvdec: clear sectors
 avcodec/parser: ensure input padding is zeroed
 avformat/jpegxl_anim_dec: ensure input padding is zeroed
 avformat/img2dec: Clear padding data after EOF
 avformat/wavdec: Check if there are 16 bytes before testing them
 Revert "avformat/mpegts: update stream info when PMT ES stream_type changes"
 configure: Use MSYSTEM_CARCH for default arch on msys2
 avfilter/avfiltergraph: fix regression in picking channel layout
 avformat/mpegts: update stream info when PMT ES stream_type changes
 avformat/wavdec: increase requested probe score for codec probe
 lsws/ppc/yuv2rgb_altivec: Fix build in non-VSX environments with Clang v2
 lsws/ppc/yuv2rgb_altivec: Fix build in non-VSX environments with Clang
 avformat/mov: (v4) fix get_eia608_packet
 configure: Improve the check for the rsync --contimeout option
 rtmpproto: Avoid rare crashes in the fail: codepath in rtmp_open
 lavc/hevcdec: pass an actual codec context to ff_h2645_sei_to_frame()
 lavc/aarch64: Fix ff_pred16x16_plane_neon_10
 lavc/aarch64: Fix ff_pred8x8_plane_neon_10
 vp9: recon: Use emulated edge to prevent buffer overflows
 arm: vp9mc: Load only 12 pixels in the 4 pixel wide horizontal filter
 aarch64: vp9mc: Load only 12 pixels in the 4 pixel wide horizontal filter
 riscv: test for assembler support
 avfilter/f_loop: fix aloop activate logic
 avfilter/f_loop: fix length of aloop leftover buffer
 avcodec/jpegxl_parser: fix reading lz77-pair as initial entropy symbol
 avcodec/jpegxl_parser: check entropy_decoder_read_symbol return value
 avutil/hwcontext: Don't assume frames_uninit is reentrant
 avutil/wchar_filename: re-introduce explicit cast of void* to char*
 avcodec/libx265: unbreak build for X265_BUILD >= 213
 lavc/hevcdec: set per-CTB filter parameters for WPP
 lavc/hevc: check framerate num/den to be strictly positive
 lavc/libx265: unbreak build for X265_BUILD >= 210
 avformat/libzmq: fix check for zmq protocol prefix
 configure: improve check for POSIX ioctl
 configure: restore autodetection of v4l2 and fbdev
 avformat/hlsenc: correctly reset subtitle stream counter per-varstream
 libavcodec/arm/mlpdsp_armv5te: fix label format to work with binutils 2.43


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg6/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/ffmpeg6/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg6/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg6/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_libx265.c
cvs rdiff -u -r1.16 -r1.17 pkgsrc/multimedia/ffplay6/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg6/Makefile
diff -u pkgsrc/multimedia/ffmpeg6/Makefile:1.27 pkgsrc/multimedia/ffmpeg6/Makefile:1.28
--- pkgsrc/multimedia/ffmpeg6/Makefile:1.27     Sat Aug 30 22:45:57 2025
+++ pkgsrc/multimedia/ffmpeg6/Makefile  Mon Sep 22 14:23:24 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2025/08/30 22:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2025/09/22 14:23:24 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg6/}
-PKGREVISION=   11
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v6.x)

Index: pkgsrc/multimedia/ffmpeg6/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg6/Makefile.common:1.13 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.14
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.13      Thu May 22 19:42:40 2025
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Mon Sep 22 14:23:24 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2025/05/22 19:42:40 nia Exp $
+# $NetBSD: Makefile.common,v 1.14 2025/09/22 14:23:24 adam Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
-DISTNAME=      ffmpeg-6.1.2
+DISTNAME=      ffmpeg-6.1.3
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/multimedia/ffmpeg6/distinfo
diff -u pkgsrc/multimedia/ffmpeg6/distinfo:1.9 pkgsrc/multimedia/ffmpeg6/distinfo:1.10
--- pkgsrc/multimedia/ffmpeg6/distinfo:1.9      Mon Dec  2 19:30:59 2024
+++ pkgsrc/multimedia/ffmpeg6/distinfo  Mon Sep 22 14:23:24 2025
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.9 2024/12/02 19:30:59 markd Exp $
+$NetBSD: distinfo,v 1.10 2025/09/22 14:23:24 adam Exp $
 
-BLAKE2s (ffmpeg-6.1.2.tar.xz) = 065a525ea3258702bd7fe9668af6583f2a5cf5990a60800e246899d328b0c1fd
-SHA512 (ffmpeg-6.1.2.tar.xz) = 3a009184d971fc3168e1322d1d724aae787ed0e9c152d8d1813ea0b9099bda3b35c41fcabbd7b140560e7a8fa9fa1ffd7f0938432d5d498c43829fc6cc3d9e08
-Size (ffmpeg-6.1.2.tar.xz) = 10466152 bytes
+BLAKE2s (ffmpeg-6.1.3.tar.xz) = 0b44fa5b33df363ea3dd95d9c20442c995560289ac3c29f30d7ee782d36609f4
+SHA512 (ffmpeg-6.1.3.tar.xz) = 5700b06f6abc23e8e968e52322ad7845ba43cbfe15c4db72b33e4cd3874057bc60b894f64bd95240f9145db218419fff5e96fec6afc2dfc3acde4b030c41b606
+Size (ffmpeg-6.1.3.tar.xz) = 10473704 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = 11c446c3e17d9624bc0141e3d839517834434d53
+SHA1 (patch-configure) = 965ed15ef809d8a5a9e1a4deae8d7bcfe9bef723
 SHA1 (patch-doc_Makefile) = c513af183e374bff4fa5945d374ddae472d51bad
 SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
 SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7
 SHA1 (patch-doc_outdevs.texi) = 0aec04682b516016abe9b81f6efcbbef97b1c3b2
-SHA1 (patch-libavcodec_libx265.c) = f7b752467201cdf1097bcae417c2310780665e7f
 SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
 SHA1 (patch-libavdevice_alldevices.c) = a9e2a2027fb2c18d5509b68deb5fd8523305dfc7
 SHA1 (patch-libavdevice_sunau.c) = 554a5fc77c0e94828e9eadc7f1f9d4067a76d4ae

Index: pkgsrc/multimedia/ffmpeg6/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.4 pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.5
--- pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.4       Sat Aug  3 06:52:01 2024
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-configure   Mon Sep 22 14:23:24 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.4 2024/08/03 06:52:01 adam Exp $
+$NetBSD: patch-configure,v 1.5 2025/09/22 14:23:24 adam Exp $
 
 Sun audio support.
 
@@ -8,9 +8,9 @@ Fix install_name_dir on Darwin.
 
 Do not use 'rsync'.
 
---- configure.orig     2024-08-01 23:22:54.000000000 +0000
+--- configure.orig     2025-08-14 23:31:21.000000000 +0000
 +++ configure
-@@ -2232,6 +2232,7 @@ HEADERS_LIST="
+@@ -2236,6 +2236,7 @@ HEADERS_LIST="
      sys_resource_h
      sys_select_h
      sys_soundcard_h
@@ -18,7 +18,7 @@ Do not use 'rsync'.
      sys_time_h
      sys_un_h
      sys_videoio_h
-@@ -2377,7 +2378,6 @@ TOOLCHAIN_FEATURES="
+@@ -2381,7 +2382,6 @@ TOOLCHAIN_FEATURES="
      inline_asm_labels
      inline_asm_nonlocal_labels
      pragma_deprecated
@@ -26,7 +26,7 @@ Do not use 'rsync'.
      symver_asm_label
      symver_gnu_asm
      vfp_args
-@@ -3601,6 +3601,8 @@ opengl_outdev_deps="opengl"
+@@ -3608,6 +3608,8 @@ opengl_outdev_deps="opengl"
  opengl_outdev_suggest="sdl2"
  oss_indev_deps_any="sys_soundcard_h"
  oss_outdev_deps_any="sys_soundcard_h"
@@ -35,7 +35,7 @@ Do not use 'rsync'.
  pulse_indev_deps="libpulse"
  pulse_outdev_deps="libpulse"
  sdl2_outdev_deps="sdl2"
-@@ -5589,6 +5591,7 @@ case $target_os in
+@@ -5598,6 +5600,7 @@ case $target_os in
      netbsd)
          disable symver
          enable section_data_rel_ro
@@ -43,7 +43,7 @@ Do not use 'rsync'.
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5615,7 +5618,7 @@ case $target_os in
+@@ -5624,7 +5627,7 @@ case $target_os in
          ;;
      darwin)
          enabled ppc && add_asflags -force_cpusubtype_ALL
@@ -52,7 +52,7 @@ Do not use 'rsync'.
          SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(INSTALL_NAME_DIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
          enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
          strip="${strip} -x"
-@@ -5992,10 +5995,13 @@ done
+@@ -6001,10 +6004,13 @@ done
  check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
  
  # The global variable ensures the bits appear unchanged in the object file.
@@ -69,7 +69,7 @@ Do not use 'rsync'.
  
  check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }"
  
-@@ -6464,6 +6470,7 @@ check_headers mftransform.h
+@@ -6479,6 +6485,7 @@ check_headers mftransform.h
  check_headers net/udplite.h
  check_headers poll.h
  check_headers pthread_np.h
@@ -77,11 +77,11 @@ Do not use 'rsync'.
  check_headers sys/param.h
  check_headers sys/resource.h
  check_headers sys/select.h
-@@ -6982,7 +6989,6 @@ enabled makeinfo \
+@@ -6997,7 +7004,6 @@ enabled makeinfo \
  disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
  perl -v            > /dev/null 2>&1 && enable perl      || disable perl
  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
--rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
+-rsync --help 2> /dev/null | grep -q 'contimeout=' && enable rsync_contimeout || disable rsync_contimeout
  xmllint --version  > /dev/null 2>&1 && enable xmllint   || disable xmllint
  
- # check V4L2 codecs available in the API
+ check_headers linux/fb.h

Index: pkgsrc/multimedia/ffplay6/Makefile
diff -u pkgsrc/multimedia/ffplay6/Makefile:1.16 pkgsrc/multimedia/ffplay6/Makefile:1.17
--- pkgsrc/multimedia/ffplay6/Makefile:1.16     Thu Apr 17 21:51:45 2025
+++ pkgsrc/multimedia/ffplay6/Makefile  Mon Sep 22 14:23:24 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2025/04/17 21:51:45 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2025/09/22 14:23:24 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay6/}
-PKGREVISION=   6
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg