CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 10 17:14:02 UTC 2022

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.3

version 4.4.3:
- avformat/vividas: Check packet size
- configure: link to libatomic when it's present
- avcodec/dstdec: Check for overflow in build_filter()
- avformat/spdifdec: Use 64bit to compute bit rate
- avformat/rpl: Use 64bit for duration computation
- avformat/xwma: Use av_rescale() for duration computation
- avformat/sdsdec: Use av_rescale() to avoid intermediate overflow in duration calculation
- avformat/sbgdec: Check ts_int in genrate_intervals
- avformat/rmdec: check tag_size
- avformat/nutdec: Check fields
- avformat/flvdec: Use 64bit for sum_flv_tag_size
- avformat/jacosubdec: Fix overflow in get_shift()
- avformat/dxa: avoid bpc overflows
- avformat/cafdec: Check that nb_frasmes fits within 64bit
- avformat/asfdec_o: Limit packet offset
- avformat/ape: Check frames size
- avformat/icodec: Check nb_pal
- avformat/aiffdec: Use 64bit for block_duration use
- avformat/aiffdec: Check block_duration
- avformat/mxfdec: only probe max run in
- avformat/mxfdec: Check run_in is within 65536
- avcodec/mjpegdec: Check for unsupported bayer case
- avcodec/apedec: Fix integer overflow in filter_3800()
- avcodec/tta: Check 24bit scaling for overflow
- avcodec/mobiclip: Check quantizer for overflow
- avcodec/exr: Check preview psize
- avcodec/tiff: Fix loop detection
- libavformat/hls: Free keys
- avcodec/fmvc: Move frame allocation to a later stage
- avfilter/vf_showinfo: remove backspaces
- avcodec/speedhq: Check width
- avcodec/bink: disallow odd positioned scaled blocks
- avformat/asfdec_o: limit recursion depth in asf_read_unknown()
- doc/git-howto.texi: Document commit signing
- libavcodec/8bps: Check that line lengths fit within the buffer
- avcodec/midivid: Perform lzss_uncompress() before ff_reget_buffer()
- libavformat/iff: Check for overflow in body_end calculation
- avformat/avidec: Prevent entity expansion attacks
- avcodec/h263dec: Sanity check against minimal I/P frame size
- avcodec/hevcdec: Check s->ref in the md5 path similar to hwaccel
- avcodec/mpegaudiodec_template: use unsigned shift in handle_crc()
- avformat/subviewerdec: Make read_ts() more flexible
- avcodec/mjpegdec: bayer and rct are incompatible
- MAINTAINERS: Add ED25519 key for signing my commits in the future
- avcodec/hevc_filter: copy_CTB() only within width&height
- avcodec/tiff: Check tile_length and tile_width
- avcodec/mss4: Check image size with av_image_check_size2()
- avformat/flvdec: Check for EOF in index reading
- avformat/nutdec: Check get_packetheader() in mainheader
- avformat/asfdec_f: Use 64bit for packet start time
- avcodec/exr: Check x/ysize
- tools/target_dec_fuzzer: Adjust threshold for MMVIDEO
- avcodec/lagarith: Check dst/src in zero run code
- avcodec/h264dec: Skip late SEI
- avcodec/sbrdsp_fixed: Fix integer overflows in sbr_qmf_deint_neg_c()
- avfilter/vf_signature: Fix integer overflow in filter_frame()
- avformat/rtsp: break on unknown protocols
- avcodec/hevcdsp_template: stay within tables in sao_band_filter()
- avcodec/tiff: Check pixel format types for dng
- avcodec/qpeldsp: copy less for the mc0x cases
- avformat/aaxdec: Check for empty segments
- avcodec/ffv1dec: Limit golomb rice coded slices to width 8M
- avformat/iff: simplify duration calculation
- avcodec/wnv1: Check for width =1
- avcodec/ffv1dec_template: fix indention
- avformat/sctp: close socket on errors
- avcodec/aasc: Fix indention
- avcodec/qdrw: adjust max colors to array size
- avcodec/alacdsp: Make intermediates unsigned
- avformat/aiffdec: cleanup size handling for extreem cases
- avformat/matroskadec: avoid integer overflows in SAR computation
- avcodec/jpeglsdec: fix end check for xfrm
- avcodec/cdgraphics: limit scrolling to the line
- avformat/hls: Limit start_seq_no to one bit less
- avformat/aiffdec: avoid integer overflow in get_meta()
- avformat/ape: more bits in size for less overflows
- avformat/aviobuf: Check buf_size in ffio_ensure_seekback()
- avformat/bfi: Check offsets better
- avformat/asfdec_f: Check packet_frag_timestamp
- avcodec/texturedspenc: Fix indexing in color distribution determination
- avformat/act: Check ff_get_wav_header() for failure
- avcodec/libxavs2: Improve r redundancy in occured
- avformat/libzmq: Improve r redundancy in occured
- avfilter/vsrc_mandelbrot: Check for malloc failure
- avfilter/vf_frei0r: Copy to frame allocated according to frei0r requirements
- avfilter/video: Add ff_default_get_video_buffer2() to set specific alignment
- avformat/genh: Check sample rate
- configure: bump year
- lavc/videotoolbox: do not pass AVCodecContext to decoder output callback
- lavc/pthread_frame: always transfer stashed hwaccel state
- avcodec/arm/sbcenc: avoid callee preserved vfp registers
- avfilter/vf_scale: overwrite the width and height expressions with the original values
- lavc/pthread_frame: avoid leaving stale hwaccel state in worker threads
- configure: extend SDL check to accept all 2.x versions
- lavf/tls_mbedtls: add support for mbedtls version 3


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/multimedia/ffmpeg4/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg4/patches/patch-configure
cvs rdiff -u -r1.26 -r1.27 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.69 pkgsrc/multimedia/ffmpeg4/Makefile:1.70
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.69     Tue Sep 27 20:57:54 2022
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Mon Oct 10 17:14:02 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2022/09/27 20:57:54 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2022/10/10 17:14:02 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=   5
 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.29 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.30
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.29      Tue May 24 09:50:46 2022
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Mon Oct 10 17:14:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.29 2022/05/24 09:50:46 nia Exp $
+# $NetBSD: Makefile.common,v 1.30 2022/10/10 17:14:02 adam Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
-DISTNAME=      ffmpeg-4.4.2
+DISTNAME=      ffmpeg-4.4.3
 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.28 pkgsrc/multimedia/ffmpeg4/distinfo:1.29
--- pkgsrc/multimedia/ffmpeg4/distinfo:1.28     Tue Aug 23 10:04:39 2022
+++ pkgsrc/multimedia/ffmpeg4/distinfo  Mon Oct 10 17:14:02 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.28 2022/08/23 10:04:39 wiz Exp $
+$NetBSD: distinfo,v 1.29 2022/10/10 17:14:02 adam Exp $
 
-BLAKE2s (ffmpeg-4.4.2.tar.xz) = b28c91e749bebf8a0b2911723c60281ff4deea5d6ba613939a27b0ae702c8c0d
-SHA512 (ffmpeg-4.4.2.tar.xz) = abce847c607ac6d63fe32ceff8bf8724888acf2b7db9a083cba50e3235590cdcb27feb7e0a314133d0030809fb54d474f64001fc9ab7d896a819159869c09d5a
-Size (ffmpeg-4.4.2.tar.xz) = 9562968 bytes
+BLAKE2s (ffmpeg-4.4.3.tar.xz) = 731f4c67a288e69e3930d8e35b69defada5c61cd07fc9430fb54c4054d0e4ad9
+SHA512 (ffmpeg-4.4.3.tar.xz) = 0b232b66555237ed1a061807f88dbc5e6cd156e604c5d611bb6ac0c32b9006414cc4f30d632b482d9cb95f526df98b36efa3af9c863c52e7b7aa1a183545d915
+Size (ffmpeg-4.4.3.tar.xz) = 9566020 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = ffa962bb7adb4a64f6c78d84accaa83da6835c0a
+SHA1 (patch-configure) = a79b9e2a8fe60d2848239305461a183dda6f3c12
 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.8 pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.9
--- pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.8       Tue Aug 23 10:04:39 2022
+++ pkgsrc/multimedia/ffmpeg4/patches/patch-configure   Mon Oct 10 17:14:02 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.8 2022/08/23 10:04:39 wiz Exp $
+$NetBSD: patch-configure,v 1.9 2022/10/10 17:14:02 adam Exp $
 
 Sun audio support.
 
@@ -7,9 +7,7 @@ to avoid text relocations.
 
 Do not use 'rsync'.
 
-Allow current SDL2 versions.
-
---- configure.orig     2022-04-14 20:13:38.000000000 +0000
+--- configure.orig     2022-10-09 19:04:43.000000000 +0000
 +++ configure
 @@ -2139,6 +2139,7 @@ HEADERS_LIST="
      sys_resource_h
@@ -70,16 +68,7 @@ Allow current SDL2 versions.
  check_headers sys/param.h
  check_headers sys/resource.h
  check_headers sys/select.h
-@@ -6555,7 +6563,7 @@ fi
- 
- if enabled sdl2; then
-     SDL2_CONFIG="${cross_prefix}sdl2-config"
--    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
-+    test_pkg_config sdl2 "sdl2 >= 2.0.1" SDL_events.h SDL_PollEvent
-     if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
-         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
-         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
-@@ -6599,7 +6607,6 @@ enabled makeinfo \
+@@ -6606,7 +6614,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

Index: pkgsrc/multimedia/ffplay4/Makefile
diff -u pkgsrc/multimedia/ffplay4/Makefile:1.26 pkgsrc/multimedia/ffplay4/Makefile:1.27
--- pkgsrc/multimedia/ffplay4/Makefile:1.26     Tue Sep 27 20:58:25 2022
+++ pkgsrc/multimedia/ffplay4/Makefile  Mon Oct 10 17:14:02 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2022/09/27 20:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/10/10 17:14:02 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay4/}
-PKGREVISION=   3
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg