CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Sep 17 07:34:32 UTC 2024

Modified Files:
        pkgsrc/multimedia/ffmpeg5: Makefile Makefile.common buildlink3.mk
            distinfo
        pkgsrc/multimedia/ffmpeg5/patches: patch-configure
        pkgsrc/multimedia/ffplay5: Makefile
Removed Files:
        pkgsrc/multimedia/ffmpeg5/patches: patch-libavutil_ppc_cpu.c

Log Message:
ffmpeg5 ffplay5: updated to 5.1.6

version 5.1.6:
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
swsresample/swresample: error out on invalid layouts
Update for 5.1.6
avdevice/dshow: Don't skip audio devices if no video device is present
avcodec/cfhdenc: Height of 16 is not supported
avcodec/cfhdenc: Allocate more space
avcodec/vaapi_encode: Check hwctx
avcodec/proresdec: Consider negative bits left
avcodec/alsdec: Clear shift_value
avcodec/hevc/hevcdec: Do not allow slices to depend on failed slices
avutil/slicethread: Check pthread_*_init() for failure
avutil/frame: Check log2_crop_align
avutil/buffer: Check ff_mutex_init() for failure
avformat/xmv: Check this_packet_size
avformat/ty: rec_size seems to only need 32bit
avformat/tty: Check avio_size()
avformat/siff: Basic pkt_size check
avformat/sauce: Check avio_size() for failure
avformat/sapdec: Check ffurl_get_file_handle() for error
avformat/nsvdec: Check asize for PCM
avformat/mp3dec: Check header_filesize
avformat/mp3dec; Check for avio_size() failure
avformat/mov: Use 64bit for str_size
avformat/mm: Check length
avformat/hnm: Check *chunk_size
avformat/hlsenc: Check ret
avformat/bintext: Check avio_size() return
avformat/asfdec_o: Check size of index object
avfilter/vf_scale: Check ff_scale_adjust_dimensions() for failure
avfilter/scale_eval: Use 64bit, check values in ff_scale_adjust_dimensions()
avfilter/vf_lut3d: Check av_scanf()
avfilter/vf_elbg: Use unsigned for shifting into the top bit
avfilter/vf_deshake_opencl: Ensure that the first iteration initializes the best variables
swscale/output: Fix integer overflows in yuv2rgba64_X_c_template
avformat/mxfdec: Reorder elements of expression in bisect loop
avutil/timecode: Use a 64bit framenum internally
avcodec/pnmdec: Use 64bit for input size check
avcodec/mpeg12enc: Use av_rescale() in vbv_buffer_size computation
avcodec/utvideoenc: Use unsigned shift to build flags
avcodec/vc2enc: Fix overflows with storing large values
avcodec/mpegvideo_enc: Do not duplicate pictures on shifting
avdevice/dshow_capture: Fix error handling in ff_dshow_##prefix##_Create()
avcodec/tiff: Check value on positive signed targets
avfilter/vf_convolution_opencl: Assert that the filter name is one of the filters
avfilter/vf_bm3d: Dont round MSE2SSE to an integer
avdevice/dshow: Remove NULL check on pin
avdevice/dshow: check ff_dshow_pin_ConnectionMediaType() for failure
avdevice/dshow: Check device_filter_unique_name before use
avdevice/dshow: Cleanup also on av_log case
avdevice/dshow_filter: Use wcscpy_s()
avcodec/flac_parser: Assert that we do not overrun the link_penalty array
avcodec/pixlet: Simplify pfx computation
avcodec/motion_est: Fix score squaring overflow
avcodec/loco: Check loco_get_rice() for failure
avcodec/loco: check get_ur_golomb_jpegls() for failure
avcodec/imm4: check cbphi for error
avcodec/iff: Use signed count
avcodec/golomb: Assert that k is in the supported range for get_ur/sr_golomb()
avcodec/golomb: Document return for get_ur_golomb_jpegls() and get_sr_golomb_flac()
avcodec/dxv: Fix type in get_opcodes()
avcodec/cri: Check length
avcodec/xsubdec: Check parse_timecode()
avutil/imgutils: av_image_check_size2() ensure width and height fit in 32bit
doc/examples/mux: remove nop
avcodec/proresenc_kostya: use unsigned alpha for rotation
avformat/rtpenc_rfc4175: Use 64bit in computation if copy_offset
avformat/rtmppkt: Simplify and deobfuscate amf_tag_skip() slightly
avformat/rmdec: use 64bit for audio_framesize checks
avutil/wchar_filename: Correct sizeof
avutil/hwcontext_d3d11va: correct sizeof IDirect3DSurface9
avutil/hwcontext_d3d11va: Free AVD3D11FrameDescriptor on error
avutil/hwcontext_d3d11va: correct sizeof AVD3D11FrameDescriptor
doc/examples/vaapi_encode: Try to check fwrite() for failure
avformat/tls_schannel: Initialize ret
avformat/subfile: Assert that whence is a known case
avformat/subfile: Merge if into switch()
avformat/rtsp: Check that lower transport is handled in one of the if()
avformat/rtsp: initialize reply1
avformat/rtsp: use < 0 for error check
avformat/rtpenc_vc2hq: Check sizes
avfilter/af_aderivative: Free out on error
swscale/swscale: Use ptrdiff_t for linesize computations
avfilter/af_pan: check nb_output_channels before use
cbs_av1: Reject thirty-two zero bits in uvlc code
avfilter/af_mcompand: compute half frequency in double
avfilter/af_channelsplit: Assert that av_channel_layout_channel_from_index() succeeds
avfilter/af_aresample: Cleanup on av_channel_layout_copy() failure
tools/coverity: Phase 1 study of anti-halicogenic for coverity av_rescale()
avfilter/vf_avgblur: Check plane instead of AVFrame
avfilter/drawutils: Fix depthb computation
avformat/rdt: Check pkt_len
avformat/mpeg: Check len in mpegps_probe()
avdevice/dshow: Check ICaptureGraphBuilder2_SetFiltergraph() for failure
avcodec/mfenc: check IMFSample_ConvertToContiguousBuffer() for failure
avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter()
avformat/img2dec: assert no pipe on ts_from_file
avcodec/cbs_jpeg: Try to move the read entity to one side in a test
avformat/mov: Check edit list for overflow
fftools/ffmpeg: Check read() for failure
swscale/output: Avoid undefined overflow in yuv2rgb_write_full()
swscale/output: alpha can become negative after scaling, use multiply
avcodec/targaenc: Allocate space for the palette
avcodec/r210enc: Use av_rescale for bitrate
avcodec/jfdctint_template: Fewer integer anomalies
avcodec/snowenc: MV limits due to mv_penalty table size
avformat/mxfdec: Check container_ul->desc before use
MAINTAINERS: Update the entries for the release maintainer for FFmpeg


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/multimedia/ffmpeg5/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/ffmpeg5/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg5/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg5/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg5/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/ffmpeg5/patches/patch-libavutil_ppc_cpu.c
cvs rdiff -u -r1.25 -r1.26 pkgsrc/multimedia/ffplay5/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/ffmpeg5/Makefile
diff -u pkgsrc/multimedia/ffmpeg5/Makefile:1.37 pkgsrc/multimedia/ffmpeg5/Makefile:1.38
--- pkgsrc/multimedia/ffmpeg5/Makefile:1.37     Mon Sep 16 07:20:17 2024
+++ pkgsrc/multimedia/ffmpeg5/Makefile  Tue Sep 17 07:34:31 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2024/09/16 07:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.38 2024/09/17 07:34:31 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg5/}
-PKGREVISION=   8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v5.x)

Index: pkgsrc/multimedia/ffmpeg5/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg5/Makefile.common:1.12 pkgsrc/multimedia/ffmpeg5/Makefile.common:1.13
--- pkgsrc/multimedia/ffmpeg5/Makefile.common:1.12      Sat Jan 27 02:54:36 2024
+++ pkgsrc/multimedia/ffmpeg5/Makefile.common   Tue Sep 17 07:34:31 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.12 2024/01/27 02:54:36 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.13 2024/09/17 07:34:31 adam Exp $
 # used by multimedia/ffmpeg5/Makefile
 # used by multimedia/ffplay5/Makefile
 
-DISTNAME=      ffmpeg-5.1.4
+DISTNAME=      ffmpeg-5.1.6
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -38,7 +38,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,12 +53,12 @@ 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
 
-.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)
+.if ${MACHINE_PLATFORM:MDarwin-1[2-9].*-*} || ${MACHINE_PLATFORM:MDarwin-2*}
 CONFIGURE_ARGS+=       --enable-opencl
 .endif
 

Index: pkgsrc/multimedia/ffmpeg5/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg5/buildlink3.mk:1.9 pkgsrc/multimedia/ffmpeg5/buildlink3.mk:1.10
--- pkgsrc/multimedia/ffmpeg5/buildlink3.mk:1.9 Mon Jan 22 13:17:01 2024
+++ pkgsrc/multimedia/ffmpeg5/buildlink3.mk     Tue Sep 17 07:34:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2024/01/22 13:17:01 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2024/09/17 07:34:31 adam Exp $
 
 BUILDLINK_TREE+=       ffmpeg5
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ffmpeg5
 FFMPEG5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ffmpeg5+=        ffmpeg5>=5.1
-BUILDLINK_ABI_DEPENDS.ffmpeg5?=        ffmpeg5>=5.1.4nb1
+BUILDLINK_ABI_DEPENDS.ffmpeg5+=        ffmpeg5>=5.1.4nb1
 BUILDLINK_PKGSRCDIR.ffmpeg5?=  ../../multimedia/ffmpeg5
 
 pkgbase := ffmpeg5

Index: pkgsrc/multimedia/ffmpeg5/distinfo
diff -u pkgsrc/multimedia/ffmpeg5/distinfo:1.11 pkgsrc/multimedia/ffmpeg5/distinfo:1.12
--- pkgsrc/multimedia/ffmpeg5/distinfo:1.11     Sat Jan 27 02:10:34 2024
+++ pkgsrc/multimedia/ffmpeg5/distinfo  Tue Sep 17 07:34:31 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2024/01/27 02:10:34 riastradh Exp $
+$NetBSD: distinfo,v 1.12 2024/09/17 07:34:31 adam Exp $
 
-BLAKE2s (ffmpeg-5.1.4.tar.xz) = 9645cbe4c30b4d566831e77520b9b10f3fd7df4fadc62dd211c67660fad65233
-SHA512 (ffmpeg-5.1.4.tar.xz) = 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795
-Size (ffmpeg-5.1.4.tar.xz) = 10009968 bytes
+BLAKE2s (ffmpeg-5.1.6.tar.xz) = f4888a3546d25a8ffd53f2e27c3d7a34be11f3f07075d3f0b4f01749fe6b8dc9
+SHA512 (ffmpeg-5.1.6.tar.xz) = bae42c4ff1e779da02f3ccc21b8361f6dbe7e0b6e4fdd4aa0253c47a14d44fa25e8a850b21e7e3c5a95712432e6c93ad430621c167134afb8dd98be1e78979bb
+Size (ffmpeg-5.1.6.tar.xz) = 10021428 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = 59195d37ae1a70b2eb4b6576e1680e0916e1e99f
+SHA1 (patch-configure) = c6b5aadb9a36a99ad3860011184467c1167cac64
 SHA1 (patch-doc_Makefile) = d45fc311f47e6cd8a8432659d7bd77e50b858e43
 SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
 SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7
@@ -18,6 +18,5 @@ SHA1 (patch-libavdevice_sunau__enc.c) = 
 SHA1 (patch-libavformat_avformat.h) = b7662e9b90b6f6ecebe02478ac2fc0ab3bd7bf70
 SHA1 (patch-libavformat_mux__utils.c) = 225d39530656b4e2267dcdf44098e1ac5a1728ba
 SHA1 (patch-libavutil_macros.h) = 7d9770f018a2207d2dcb1fe057564e30be51fd42
-SHA1 (patch-libavutil_ppc_cpu.c) = 0c77fecf2b92fa7b8f786987b216fe70a0d45904
 SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22
 SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487

Index: pkgsrc/multimedia/ffmpeg5/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg5/patches/patch-configure:1.3 pkgsrc/multimedia/ffmpeg5/patches/patch-configure:1.4
--- pkgsrc/multimedia/ffmpeg5/patches/patch-configure:1.3       Fri Jun  2 16:14:11 2023
+++ pkgsrc/multimedia/ffmpeg5/patches/patch-configure   Tue Sep 17 07:34:31 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2023/06/02 16:14:11 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2024/09/17 07:34:31 adam Exp $
 
 Sun audio support.
 
@@ -9,9 +9,9 @@ Fix install_name_dir on Darwin.
 
 Do not use 'rsync'.
 
---- configure.orig     2022-04-04 14:40:22.000000000 +0000
+--- configure.orig     2024-08-04 23:23:18.000000000 +0000
 +++ configure
-@@ -2196,6 +2196,7 @@ HEADERS_LIST="
+@@ -2200,6 +2200,7 @@ HEADERS_LIST="
      sys_resource_h
      sys_select_h
      sys_soundcard_h
@@ -19,7 +19,7 @@ Do not use 'rsync'.
      sys_time_h
      sys_un_h
      sys_videoio_h
-@@ -2337,7 +2338,6 @@ TOOLCHAIN_FEATURES="
+@@ -2343,7 +2344,6 @@ TOOLCHAIN_FEATURES="
      inline_asm_labels
      inline_asm_nonlocal_labels
      pragma_deprecated
@@ -27,7 +27,7 @@ Do not use 'rsync'.
      symver_asm_label
      symver_gnu_asm
      vfp_args
-@@ -3521,6 +3521,8 @@ opengl_outdev_deps="opengl"
+@@ -3532,6 +3532,8 @@ opengl_outdev_deps="opengl"
  opengl_outdev_suggest="sdl2"
  oss_indev_deps_any="sys_soundcard_h"
  oss_outdev_deps_any="sys_soundcard_h"
@@ -36,16 +36,15 @@ Do not use 'rsync'.
  pulse_indev_deps="libpulse"
  pulse_outdev_deps="libpulse"
  sdl2_outdev_deps="sdl2"
-@@ -5491,6 +5493,8 @@ case $target_os in
-         ;;
+@@ -5496,6 +5498,7 @@ case $target_os in
      netbsd)
          disable symver
-+        enable section_data_rel_ro
+         enable section_data_rel_ro
 +        enable pic
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5516,7 +5520,7 @@ case $target_os in
+@@ -5522,7 +5525,7 @@ case $target_os in
          ;;
      darwin)
          enabled ppc && add_asflags -force_cpusubtype_ALL
@@ -54,7 +53,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"
-@@ -5889,10 +5893,13 @@ done
+@@ -5895,10 +5898,13 @@ done
  check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
  
  # The global variable ensures the bits appear unchanged in the object file.
@@ -71,7 +70,7 @@ Do not use 'rsync'.
  
  check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }"
  
-@@ -6305,6 +6312,7 @@ check_headers malloc.h
+@@ -6313,6 +6319,7 @@ check_headers malloc.h
  check_headers mftransform.h
  check_headers net/udplite.h
  check_headers poll.h
@@ -79,7 +78,7 @@ Do not use 'rsync'.
  check_headers sys/param.h
  check_headers sys/resource.h
  check_headers sys/select.h
-@@ -6783,7 +6791,6 @@ enabled makeinfo \
+@@ -6799,7 +6806,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/ffplay5/Makefile
diff -u pkgsrc/multimedia/ffplay5/Makefile:1.25 pkgsrc/multimedia/ffplay5/Makefile:1.26
--- pkgsrc/multimedia/ffplay5/Makefile:1.25     Wed May 29 16:33:43 2024
+++ pkgsrc/multimedia/ffplay5/Makefile  Tue Sep 17 07:34:32 2024
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.25 2024/05/29 16:33:43 adam Exp $
+# $NetBSD: Makefile,v 1.26 2024/09/17 07:34:32 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay5/}
-PKGREVISION=   6
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg
 
 DISTINFO_FILE=         ${.CURDIR}/../ffmpeg5/distinfo
 
-USE_LANGUAGES= c99
+USE_CC_FEATURES=       c99
+USE_LANGUAGES=         c
 
 CONFIGURE_ARGS+=       --disable-ffmpeg
 CONFIGURE_ARGS+=       --disable-ffprobe