CVS commit: pkgsrc/multimedia

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 17 Sep 2024 08:15:06 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Sep 17 08:15:06 UTC 2024

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

Log Message:
ffmpeg3 ffplay3: updated to 3.4.13

version 3.4.13:
avcodec/noise_bsf: Check for wrapped frames
avcodec/pngdec: Do not pass AVFrame into global header decode
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/vorbisdec: Check codebook float values to be finite
avcodec/g2meet: Replace fake allocation avoidance for framebuf
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/j2kenc: fix 5/3 DWT identifer
avcodec/vp3: Check width to avoid assertion failure
avcodec/g729postfilter: Limit shift in long term filter
configure: update copyright year
avcodec/tests/snowenc: Fix 2nd test
avcodec/tests/snowenc: return a failure if DWT/IDWT mismatches
avcodec/snowenc: Fix visual weight calculation
avcodec/tests/snowenc: unbreak DWT tests
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/xpmdec: Check size before allocation to avoid truncation
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/eac3dec: avoid float noise in fixed mode addition to overflow
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/scpr: Test bx before use
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
swscale/output: Bias 16bps output calculations to improve non overflowing range
avcodec/speedhq: Check buf_size to be big enough for DC
avcodec/ffv1dec: Fail earlier if prior context is corrupted
swscale: aarch64: Fix yuv2rgb with negative strides


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/ffmpeg3/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/ffmpeg3/patches/patch-libavcodec_libfdk-aacenc.c
cvs rdiff -u -r1.43 -r1.44 pkgsrc/multimedia/ffplay3/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/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.101 pkgsrc/multimedia/ffmpeg3/Makefile:1.102
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.101    Mon Sep 16 07:20:17 2024
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Tue Sep 17 08:15:06 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2024/09/16 07:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.102 2024/09/17 08:15:06 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=   22
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v3.x)

Index: pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.43 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.44
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.43      Sat Jan 27 02:54:36 2024
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Tue Sep 17 08:15:06 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.43 2024/01/27 02:54:36 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.44 2024/09/17 08:15:06 adam Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
-DISTNAME=      ffmpeg-3.4.11
+DISTNAME=      ffmpeg-3.4.13
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -11,7 +11,8 @@ LICENSE=      gnu-lgpl-v2.1 AND gnu-gpl-v2
 
 PATCHDIR=      ${.CURDIR}/../../multimedia/ffmpeg3/patches
 
-USE_LANGUAGES=         c99
+USE_CC_FEATURES=       c99
+USE_LANGUAGES=         c
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pod2man perl pkg-config
 HAS_CONFIGURE=         yes
@@ -38,7 +39,7 @@ LDFLAGS+=             ${COMPILER_RPATH_FLAG}${PREFI
 CONFIGURE_ARGS+=       --enable-cross-compile
 CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}
 CONFIGURE_ARGS+=       --host-ld=${NATIVE_CC:Q}
-CONFIGURE_ARGS+=       --target-os=${LOWER_OPSYS:Q}
+CONFIGURE_ARGS+=       --target-os=${LOWER_OPSYS}
 .  include "../../mk/endian.mk"
 .  if ${MACHINE_ENDIAN} == "big"
 CONFIGURE_ENV+=                bigendian=yes
@@ -53,14 +54,14 @@ CONFIGURE_ENV+=             bigendian=yes
 # altivec -- and the compiler will quietly take advantage of this,
 # e.g. to zero-initialize objects on the stack.  This doesn't work too
 # well on powerpc CPUs without altivec, so nix the arguments.
-.if !empty(MACHINE_ARCH:Mpowerpc*)
+.if ${MACHINE_ARCH:Mpowerpc*}
 BUILDLINK_TRANSFORM+=  rm:-maltivec
 BUILDLINK_TRANSFORM+=  rm:-mabi=altivec
 .endif
 
 PLIST_VARS+=           opencl
 
-.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*)
+.if ${MACHINE_PLATFORM:MDarwin-1[2-9].*-*}
 CONFIGURE_ARGS+=       --enable-opencl
 PLIST.opencl=          yes
 .endif

Index: pkgsrc/multimedia/ffmpeg3/distinfo
diff -u pkgsrc/multimedia/ffmpeg3/distinfo:1.41 pkgsrc/multimedia/ffmpeg3/distinfo:1.42
--- pkgsrc/multimedia/ffmpeg3/distinfo:1.41     Sat Jan 27 02:52:37 2024
+++ pkgsrc/multimedia/ffmpeg3/distinfo  Tue Sep 17 08:15:06 2024
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.41 2024/01/27 02:52:37 riastradh Exp $
+$NetBSD: distinfo,v 1.42 2024/09/17 08:15:06 adam Exp $
 
-BLAKE2s (ffmpeg-3.4.11.tar.xz) = d23ee74f99cf5e2b8ee8358053b2978b967cf81f5d85b0c3d2a8de0a7ba128b1
-SHA512 (ffmpeg-3.4.11.tar.xz) = 61d62d5ad7bbde78d957ca40b5cf9fae5fe0125292b99d0caff9441fad3ecea165a4546a44b9049849f588024c881bba2c6bbd0255133db49188d4bf4693ff4e
-Size (ffmpeg-3.4.11.tar.xz) = 8517940 bytes
+BLAKE2s (ffmpeg-3.4.13.tar.xz) = d8924265509201d425ae437fe722af5fc176cfc0721457a2832754c59939ab64
+SHA512 (ffmpeg-3.4.13.tar.xz) = 50b0ee62059bdb4eaafe66a890bef05c8592852bbd4026b004dccbb8aa4c80ec0d1af997d3436426a4139ca73462bd99b4815aab2038cc145d2f6fe01f2be165
+Size (ffmpeg-3.4.13.tar.xz) = 8519300 bytes
 SHA1 (patch-Makefile) = 0c35f53878b0420aeea49d8ccb249279e705eb40
 SHA1 (patch-configure) = 1232f497896f36d23f72d43cdbf7d0de627bd85e
 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
+SHA1 (patch-libavcodec_libfdk-aacenc.c) = 92406d7370d784515177299395a9cc7d052db7b8
 SHA1 (patch-libavcodec_x86_mathops.h) = d70bbbfac56cf7d37ef8789ec4a7964ec82a2c7b
 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9
 SHA1 (patch-libavutil_ppc_cpu.c) = be6ece342b061c3ef9b1836bf55ec4f2e0cdc81b

Index: pkgsrc/multimedia/ffplay3/Makefile
diff -u pkgsrc/multimedia/ffplay3/Makefile:1.43 pkgsrc/multimedia/ffplay3/Makefile:1.44
--- pkgsrc/multimedia/ffplay3/Makefile:1.43     Wed May 29 16:33:42 2024
+++ pkgsrc/multimedia/ffplay3/Makefile  Tue Sep 17 08:15:06 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2024/05/29 16:33:42 adam Exp $
+# $NetBSD: Makefile,v 1.44 2024/09/17 08:15:06 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay3/}
-PKGREVISION=   13
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg

Added files:

Index: pkgsrc/multimedia/ffmpeg3/patches/patch-libavcodec_libfdk-aacenc.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg3/patches/patch-libavcodec_libfdk-aacenc.c:1.1
--- /dev/null   Tue Sep 17 08:15:06 2024
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-libavcodec_libfdk-aacenc.c  Tue Sep 17 08:15:06 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-libavcodec_libfdk-aacenc.c,v 1.1 2024/09/17 08:15:06 adam Exp $
+
+Fix for never fdk-aac.
+
+--- libavcodec/libfdk-aacenc.c.orig    2024-09-17 08:05:44.295195213 +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) {

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index