CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Sep 17 08:31:30 UTC 2024

Modified Files:
        pkgsrc/multimedia/ffmpeg2: Makefile Makefile.common distinfo
        pkgsrc/multimedia/ffplay2: Makefile
Added Files:
        pkgsrc/multimedia/ffmpeg2/patches: patch-libavcodec_libfdk-aacenc.c

Log Message:
ffmpeg2 ffplay2: updated to 2.8.22

2.8.22:
avformat/rtsp: Use rtsp_st->stream_index
avcodec/jpeg2000dec: Check image offset
Update for FFmpeg 2.8.22
avcodec/xvididct: Make c* unsigned to avoid undefined overflows
avformat/tmv: Check video chunk size
avformat/matroskadec: Check prebuffered_ns for overflow
avformat/wavdec: Check left avio_tell for overflow
avformat/tta: Better totalframes check
avformat/rpl: Check for number_of_chunks overflow
avformat/jacosubdec: Check timeres
avcodec/escape124: Do not return random numbers
avformat/avs: Check if return code is representable
avcodec/lcldec: Make PNG filter addressing match the code afterwards
avformat/westwood_vqa: Check chunk size
avformat/sbgdec: Check for period overflow
avcodec/xvididct: Fix integer overflow in idct_row()
avcodec/celp_math: avoid overflow in shift
avformat/format: Stop reading data at EOF during probing
avcodec/huffyuvdec: avoid undefined behavior with get_vlc2() failure
avcodec/mpeg4videodec: more unsigned in amv computation
avcodec/tta: fix signed overflow in decorrelate
avcodec/xvididct: Fix integer overflow in idct_row()
avcodec/jpeg2000dec: Check for reduction factor and image offset
avutil/softfloat: Basic documentation for av_sincos_sf()
avutil/softfloat: fix av_sincos_sf()
avcodec/utils: fix 2 integer overflows in get_audio_frame_duration()
avcodec/hevcdec: Avoid null pointer dereferences in MC
avcodec: Ignoring errors is only possible before the input end
avformat/wavdec: Check that smv block fits in available space
avcodec/tak: Check remaining bits in ff_tak_decode_frame_header()
avcodec/utils: the IFF_ILBM implementation assumes that there are a multiple of 16 allocated
avcodec/pngdec: Do not pass AVFrame into global header decode
avcodec/vorbisdec: Check codebook float values to be finite
avcodec/lcldec: More space for rgb24
avcodec/lcldec: Support 4:1:1 and 4:2:2 with odd width
libavcodec/lcldec: width and height should not be unsigned
avcodec/escape124: Check that blocks are allocated before use
avcodec/huffyuvdec: Fix undefined behavior with shift
avcodec/vp3: Check width to avoid assertion failure
avcodec/g729postfilter: Limit shift in long term filter
configure: update copyright year
avcodec/vp3: Add missing check for av_malloc
avcodec/escape124: Fix some return codes
avcodec/escape124: fix signdness of end of input check
Use https for repository links
avcodec/motionpixels: Mask pixels to valid values
avcodec/bink: Avoid undefined out of array end pointers in binkb_decode_plane()
avcodec/bink: Fix off by 1 error in ref end
avcodec/utils: Ensure linesize for SVQ3
avcodec/utils: allocate a line more for VC1 and WMV3
avcodec/videodsp_template: Adjust pointers to avoid undefined pointer things
avcodec/pngdec: Check deloco index more exactly
avcodec/ffv1dec: Check that num h/v slices is supported
avformat/mov: Check samplesize and offset to avoid integer overflow
avcodec/pictordec: Remove mid exit branch
avcodec/utils: use 32pixel alignment for bink
avcodec/012v: Order operations for odd size handling
avcodec/eatgq: : Check index increments in tgq_decode_block()
avcodec/sunrast: Fix maplength check
avcodec/wavpack: Avoid undefined shift in get_tail()
avformat/id3v2: Check taglen in read_uslt()
avcodec/ffv1dec: restructure slice coordinate reading a bit
avcodec/mlpdec: Check max matrix instead of max channel in noise check
swscale/input: Use more unsigned intermediates
avcodec/alsdec: The minimal block is at least 7 bits
avformat/replaygain: avoid undefined / negative abs
avcodec/ffv1dec: Fail earlier if prior context is corrupted


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/multimedia/ffmpeg2/Makefile.common
cvs rdiff -u -r1.63 -r1.64 pkgsrc/multimedia/ffmpeg2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_libfdk-aacenc.c
cvs rdiff -u -r1.38 -r1.39 pkgsrc/multimedia/ffplay2/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/ffmpeg2/Makefile
diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.101 pkgsrc/multimedia/ffmpeg2/Makefile:1.102
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.101    Mon Sep 16 07:20:16 2024
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Tue Sep 17 08:31:29 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2024/09/16 07:20:16 adam Exp $
+# $NetBSD: Makefile,v 1.102 2024/09/17 08:31:29 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=   20
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v2.x)

Index: pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg2/Makefile.common:1.69 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.70
--- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.69      Sat Jan 27 02:54:36 2024
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common   Tue Sep 17 08:31:29 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.69 2024/01/27 02:54:36 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.70 2024/09/17 08:31:29 adam Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=      ffmpeg-2.8.20
+DISTNAME=      ffmpeg-2.8.22
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/multimedia/ffmpeg2/distinfo
diff -u pkgsrc/multimedia/ffmpeg2/distinfo:1.63 pkgsrc/multimedia/ffmpeg2/distinfo:1.64
--- pkgsrc/multimedia/ffmpeg2/distinfo:1.63     Sat Jan 27 02:51:31 2024
+++ pkgsrc/multimedia/ffmpeg2/distinfo  Tue Sep 17 08:31:29 2024
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.63 2024/01/27 02:51:31 riastradh Exp $
+$NetBSD: distinfo,v 1.64 2024/09/17 08:31:29 adam Exp $
 
-BLAKE2s (ffmpeg-2.8.20.tar.xz) = b6a9511dcd7287693f399cf1205dfa5e86e8d41554e677773db2006d9b918ec2
-SHA512 (ffmpeg-2.8.20.tar.xz) = 3f00cda4bc49573eee78ee7d57758d61895bab4a0f230316f1fb4671e197e81124121d6023cdcb56c3db4055be48f585908ee624aa4bd0ebe601a2a1ea0120a0
-Size (ffmpeg-2.8.20.tar.xz) = 7244096 bytes
+BLAKE2s (ffmpeg-2.8.22.tar.xz) = 786bd29ff69cd7890762ff87e30f9f570f25d462cc5d33bb6bde5a824ec54cba
+SHA512 (ffmpeg-2.8.22.tar.xz) = bf67ccea938045de5ce5648e45b36fa718d8dec787e02c37ca9124f02d15f56ae0d00b903f9bbe4083aab3071110c4a083915edf79db04f32834c0a761276161
+Size (ffmpeg-2.8.22.tar.xz) = 7242444 bytes
 SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
 SHA1 (patch-configure) = bdc91d620c077f82739a901255241799cd7dc477
 SHA1 (patch-doc_Makefile) = 48d3b3ccd800303a73fcda79e78533228f79d750
+SHA1 (patch-libavcodec_libfdk-aacenc.c) = b7c3301ea0e5270a7b8fe2273f1391b79a4b972b
 SHA1 (patch-libavcodec_x86_ac3dsp__init.c) = f8951b7a1b036addbc0e6a657418e08fcde9fb44
 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
 SHA1 (patch-libavutil_ppc_cpu.c) = be6ece342b061c3ef9b1836bf55ec4f2e0cdc81b

Index: pkgsrc/multimedia/ffplay2/Makefile
diff -u pkgsrc/multimedia/ffplay2/Makefile:1.38 pkgsrc/multimedia/ffplay2/Makefile:1.39
--- pkgsrc/multimedia/ffplay2/Makefile:1.38     Wed May 29 16:33:42 2024
+++ pkgsrc/multimedia/ffplay2/Makefile  Tue Sep 17 08:31:30 2024
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.38 2024/05/29 16:33:42 adam Exp $
+# $NetBSD: Makefile,v 1.39 2024/09/17 08:31:30 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay2/}
-PKGREVISION=   8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg
 
-DISTINFO_FILE=         ${.CURDIR}/../ffmpeg2/distinfo
+DISTINFO_FILE=         ${.CURDIR}/../../multimedia/ffmpeg2/distinfo
 
 CONFIGURE_ARGS+=       --disable-ffmpeg
 CONFIGURE_ARGS+=       --disable-ffprobe

Added files:

Index: pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_libfdk-aacenc.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_libfdk-aacenc.c:1.1
--- /dev/null   Tue Sep 17 08:31:30 2024
+++ pkgsrc/multimedia/ffmpeg2/patches/patch-libavcodec_libfdk-aacenc.c  Tue Sep 17 08:31:29 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-libavcodec_libfdk-aacenc.c,v 1.1 2024/09/17 08:31:29 adam Exp $
+
+Fix for never fdk-aac.
+
+--- libavcodec/libfdk-aacenc.c.orig    2024-09-17 08:17:41.956196571 +0000
++++ libavcodec/libfdk-aacenc.c
+@@ -26,6 +26,14 @@
+ #include "audio_frame_queue.h"
+ #include "internal.h"
+ 
++#ifdef AACENCODER_LIB_VL0
++#define FDKENC_VER_AT_LEAST(vl0, vl1) \
++    ((AACENCODER_LIB_VL0 > vl0) || \
++     (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1))
++#else
++#define FDKENC_VER_AT_LEAST(vl0, vl1) 0
++#endif 
++
+ typedef struct AACContext {
+     const AVClass *class;
+     HANDLE_AACENCODER handle;
+@@ -286,7 +294,11 @@ static av_cold int aac_encode_init(AVCod
+     }
+ 
+     avctx->frame_size = info.frameLength;
++#if FDKENC_VER_AT_LEAST(4, 0) // 4.0.0   
++    avctx->initial_padding = info.nDelay; 
++#else 
+     avctx->initial_padding = info.encoderDelay;
++#endif
+     ff_af_queue_init(avctx, &s->afq);
+ 
+     if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {