CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep 22 14:26:13 UTC 2025

Modified Files:
        pkgsrc/multimedia/ffmpeg4: Makefile Makefile.common distinfo
        pkgsrc/multimedia/ffmpeg4/patches: patch-configure
        pkgsrc/multimedia/ffplay4: Makefile

Log Message:
ffmpeg4 ffplay4: updated to 4.4.6

version 4.4.6:
 avcodec/takdec: Check remaining space for first predictors
 avcodec/svq3: Check there are bits left before decompression
 avcodec/sonic: Check num_taps
 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
 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
 configure: Clearer documentation for "disable-safe-bitstream-reader"
 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
 Update for 4.4.6
 configure: update copyright year
 avformat/hls: Partially revert "reduce default max reload to 3"
 avformat/hls: Fix twitter
 libavformat/hls: Be more restrictive on mpegts extensions
 avformat/hls: .ts is always ok even if its a mov/mp4
 avformat/hls: Print input format in error message
 avformat/hls: Be more picky on extensions
 avformat: add ff_match_url_ext()
 avfilter/bwdif: account for chroma sub-sampling in min size calculation
 avformat/iff: Check that we have a stream in read_dst_frame()
 avformat/mlvdec: fix size checks
 avformat/mxfdec: Check edit unit for overflow in mxf_set_current_edit_unit()
 avcodec/h263dec: Check against previous dimensions instead of coded
 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
 swscale/output: Fix undefined overflow in yuv2rgba64_full_X_c_template()
 avfilter/af_pan: Fix sscanf() use
 avfilter/vf_addroi: Add missing NULL termination to addroi_var_names[]()
 avformat/rmdec: check that buf if completely filled
 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
 avutil/timecode: Avoid fps overflow in av_timecode_get_smpte_from_framenum()
 avcodec/webp: Check ref_x/y
 avcodec/ilbcdec: Initialize tempbuff2
 avformat/dxa: check bpc
 swscale/slice: clear allocated memory in alloc_lines()
 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
 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
 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/svq3: Check for minimum size input
 avcodec/eacmv: Check input size for intra frames
 avcodec/jfdctint_template: use unsigned z* in row_fdct()
 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/avcodec: Warn about data returned from get_buffer*()
 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/mvha: Clear remaining space after inflate()
 avformat/segafilm: Set keyframe
 avcodec/sga: av_assert1 check init_get_bits8()
 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/vf_xfade_opencl: Check ff_inlink_consume_frame() for failure
 avformat/lmlm4: Eliminate some AVERROR(EIO)
 avformat/wtvdec: Check length of read mpeg2_descriptor
 avformat/wtvdec: clear sectors
 avcodec/parser: ensure input padding is zeroed
 avformat/img2dec: Clear padding data after EOF
 avformat/wavdec: Check if there are 16 bytes before testing them
 avcodec/snow: Fix off by 1 error in run_buffer
 avcodec/utils: apply the same alignment to YUV410 as we do to YUV420 for snow
 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
 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
 avcodec/libx265: unbreak build for X265_BUILD >= 213
 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
 configure: use just the pkg-config for sndio
 libavcodec/arm/mlpdsp_armv5te: fix label format to work with binutils 2.43


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.33 -r1.34 pkgsrc/multimedia/ffmpeg4/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg4/patches/patch-configure
cvs rdiff -u -r1.47 -r1.48 pkgsrc/multimedia/ffplay4/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/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.100 pkgsrc/multimedia/ffmpeg4/Makefile:1.101
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.100    Sat Aug 30 22:45:57 2025
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Mon Sep 22 14:26:13 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2025/08/30 22:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2025/09/22 14:26:13 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=   9
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v4.x)

Index: pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.37 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.38
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.37      Thu May 22 19:42:40 2025
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Mon Sep 22 14:26:13 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.37 2025/05/22 19:42:40 nia Exp $
+# $NetBSD: Makefile.common,v 1.38 2025/09/22 14:26:13 adam Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
-DISTNAME=      ffmpeg-4.4.5
+DISTNAME=      ffmpeg-4.4.6
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/multimedia/ffmpeg4/distinfo
diff -u pkgsrc/multimedia/ffmpeg4/distinfo:1.33 pkgsrc/multimedia/ffmpeg4/distinfo:1.34
--- pkgsrc/multimedia/ffmpeg4/distinfo:1.33     Tue Sep 17 07:56:47 2024
+++ pkgsrc/multimedia/ffmpeg4/distinfo  Mon Sep 22 14:26:13 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.33 2024/09/17 07:56:47 adam Exp $
+$NetBSD: distinfo,v 1.34 2025/09/22 14:26:13 adam Exp $
 
-BLAKE2s (ffmpeg-4.4.5.tar.xz) = fe7564e09e79669e3e809f2f374e03ffeacc26c76f9bb61df2734d94ebc92d2c
-SHA512 (ffmpeg-4.4.5.tar.xz) = 70df4e63ef507a7ec76da34438142499139769728fd5130d9cf48d56c110ec82c3d6a7e6d1622da03c70167fa861d901d016bbe52c21d2b284b8a0d9f30811dc
-Size (ffmpeg-4.4.5.tar.xz) = 9575596 bytes
+BLAKE2s (ffmpeg-4.4.6.tar.xz) = c2f1bd55544ecd8aa0ff98d4402864a6413841302d855a8773a4863c9caa43a4
+SHA512 (ffmpeg-4.4.6.tar.xz) = 3805c5ff4661217cd2f85a7443a796b9dece67b6eba7686f5f348a1c6c4c678d26f97f9674bb9552b74cfa5bffaf8048885e57e765ad3e09a31274172c57725b
+Size (ffmpeg-4.4.6.tar.xz) = 9575932 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = 96c53e5ac1d1ff79dd89626a7ef2c11e48d0806e
+SHA1 (patch-configure) = b30da49cad14a29b3a421c06bb472e499d99922b
 SHA1 (patch-doc_Makefile) = 3b86307323fa565f9ad19c5bcb6ea71d323062fc
 SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
 SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c

Index: pkgsrc/multimedia/ffmpeg4/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.10 pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.11
--- pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.10      Tue Sep 17 07:56:47 2024
+++ pkgsrc/multimedia/ffmpeg4/patches/patch-configure   Mon Sep 22 14:26:13 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.10 2024/09/17 07:56:47 adam Exp $
+$NetBSD: patch-configure,v 1.11 2025/09/22 14:26:13 adam Exp $
 
 Sun audio support.
 
@@ -7,9 +7,9 @@ to avoid text relocations.
 
 Do not use 'rsync'.
 
---- configure.orig     2024-07-28 22:54:52.000000000 +0000
+--- configure.orig     2025-05-17 13:52:39.000000000 +0000
 +++ configure
-@@ -2139,6 +2139,7 @@ HEADERS_LIST="
+@@ -2142,6 +2142,7 @@ HEADERS_LIST="
      sys_resource_h
      sys_select_h
      sys_soundcard_h
@@ -17,7 +17,7 @@ Do not use 'rsync'.
      sys_time_h
      sys_un_h
      sys_videoio_h
-@@ -2280,7 +2281,6 @@ TOOLCHAIN_FEATURES="
+@@ -2283,7 +2284,6 @@ TOOLCHAIN_FEATURES="
      inline_asm_labels
      inline_asm_nonlocal_labels
      pragma_deprecated
@@ -25,7 +25,7 @@ Do not use 'rsync'.
      symver_asm_label
      symver_gnu_asm
      vfp_args
-@@ -3431,6 +3431,8 @@ opengl_outdev_deps="opengl"
+@@ -3436,6 +3436,8 @@ opengl_outdev_deps="opengl"
  opengl_outdev_suggest="sdl2"
  oss_indev_deps_any="sys_soundcard_h"
  oss_outdev_deps_any="sys_soundcard_h"
@@ -34,7 +34,7 @@ Do not use 'rsync'.
  pulse_indev_deps="libpulse"
  pulse_outdev_deps="libpulse"
  sdl2_outdev_deps="sdl2"
-@@ -5370,6 +5372,7 @@ case $target_os in
+@@ -5375,6 +5377,7 @@ case $target_os in
      netbsd)
          disable symver
          enable section_data_rel_ro
@@ -42,7 +42,7 @@ Do not use 'rsync'.
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5769,10 +5772,13 @@ done
+@@ -5774,10 +5777,13 @@ done
  check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
  
  # The global variable ensures the bits appear unchanged in the object file.
@@ -59,7 +59,7 @@ Do not use 'rsync'.
  
  check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }"
  
-@@ -6172,6 +6178,7 @@ check_headers malloc.h
+@@ -6182,6 +6188,7 @@ check_headers malloc.h
  check_headers mftransform.h
  check_headers net/udplite.h
  check_headers poll.h
@@ -67,11 +67,11 @@ Do not use 'rsync'.
  check_headers sys/param.h
  check_headers sys/resource.h
  check_headers sys/select.h
-@@ -6611,7 +6618,6 @@ enabled makeinfo \
+@@ -6621,7 +6628,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
  
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
+ check_headers linux/fb.h
+ check_headers linux/videodev2.h

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