CVS commit: pkgsrc/multimedia/ffmpeg6

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Dec 31 20:49:27 UTC 2023

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

Log Message:
ffmpeg6 ffplay6: updated to 6.1.1

version 6.1.1
- avcodec/mpegvideo_enc: Dont copy beyond the image
- avfilter/vf_minterpolate: Check pts before division
- avfilter/avf_showwaves: Check history_nb_samples
- avformat/flacdec: Avoid double AVERRORS
- avfilter/vf_vidstabdetect: Avoid double AVERRORS
- avcodec/vaapi_encode: Avoid double AVERRORS
- avfilter/vf_swaprect: round coordinates down
- avfilter/vf_swaprect: Use height for vertical variables
- avfilter/vf_swaprect: assert that rectangles are within memory
- avfilter/af_alimiter: Check nextpos before use
- avfilter/f_reverse: Apply PTS compensation only when pts is available
- avfilter/af_stereowiden: Check length
- avformat/mov: Fix MSAN issue with stsd_id
- avcodec/jpegxl_parser: Check get_vlc2()
- avfilter/vf_weave: Fix odd height handling
- avfilter/edge_template: Fix small inputs with gaussian_blur()
- avfilter/vf_gradfun: Do not overread last line
- avfilter/avf_showspectrum: fix off by 1 error
- avcodec/jpegxl_parser: Add padding to cs_buffer
- avformat/mov: do not set sign bit for chunk_offsets
- avcodec/jpeglsdec: Check Jpeg-LS LSE
- avcodec/osq: Implement flush()
- configure: Enable section_data_rel_ro for FreeBSD and NetBSD aarch64 / arm
- avcodec/cbs_h266: more restrictive check on pps_tile_idx_delta_val
- avcodec/jpeg2000htdec: check if block decoding will exceed internal precision
- tools/target_dec_fuzzer: Adjust threshold for VMIX
- avcodec/av1dec: Fix resolving zero divisor
- avformat/mov: Ignore duplicate ftyp
- avformat/mov: Fix integer overflow in mov_read_packet().
- lavc/qsvdec: return 0 if more data is required
- avcodec/jpegxl_parser: check ANS cluster alphabet size vs bundle size
- libavformat/vvc: Make probe more conservative
- hwcontext_vulkan: guard unistd.h include
- lavc/Makefile: build vulkan decode code if vulkan_av1 has been enabled
- lavc/dvdsubenc: only check canvas size when it is actually set
- avcodec/decode: validate hw_frames_ctx when AVHWAccel.free_frame_priv is used
- avcoded/fft: Fix memory leak if ctx2 is used
- avcodec/fft: Use av_mallocz to avoid invalid free/uninit


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg6/Makefile.common \
    pkgsrc/multimedia/ffmpeg6/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg6/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg6/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg6/Makefile.common:1.4 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.5
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.4       Mon Nov 13 15:46:54 2023
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Sun Dec 31 20:49:27 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2023/11/13 15:46:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2023/12/31 20:49:27 adam Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
-DISTNAME=      ffmpeg-6.1
+DISTNAME=      ffmpeg-6.1.1
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz
Index: pkgsrc/multimedia/ffmpeg6/distinfo
diff -u pkgsrc/multimedia/ffmpeg6/distinfo:1.4 pkgsrc/multimedia/ffmpeg6/distinfo:1.5
--- pkgsrc/multimedia/ffmpeg6/distinfo:1.4      Mon Nov 13 15:46:54 2023
+++ pkgsrc/multimedia/ffmpeg6/distinfo  Sun Dec 31 20:49:27 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2023/11/13 15:46:54 wiz Exp $
+$NetBSD: distinfo,v 1.5 2023/12/31 20:49:27 adam Exp $
 
-BLAKE2s (ffmpeg-6.1.tar.xz) = ba38f8fd83167fdca128dc36b2946e679e729fad804797b62276e1d4b234f54b
-SHA512 (ffmpeg-6.1.tar.xz) = 72f47924806b9b128672bd268aa2c8fc2c9b8491899a772b6f82421daa2b67de45a4bdd71f6071825814e599a73adb1e42682e202a12fc055e9a224c7d5baa4a
-Size (ffmpeg-6.1.tar.xz) = 10455956 bytes
+BLAKE2s (ffmpeg-6.1.1.tar.xz) = e07806b5adbb459584f35c6b5fa7d3e8e5184fe6cca9e818c7b494f6e8287d8c
+SHA512 (ffmpeg-6.1.1.tar.xz) = fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5
+Size (ffmpeg-6.1.1.tar.xz) = 10458600 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = 59195d37ae1a70b2eb4b6576e1680e0916e1e99f
+SHA1 (patch-configure) = f6e8208a113c6a20999cb671a5aff4f1aa6734a9
 SHA1 (patch-doc_Makefile) = c513af183e374bff4fa5945d374ddae472d51bad
 SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
 SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7

Index: pkgsrc/multimedia/ffmpeg6/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.1 pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.2
--- pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.1       Fri Jun  2 16:44:06 2023
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-configure   Sun Dec 31 20:49:27 2023
@@ -1,17 +1,16 @@
-$NetBSD: patch-configure,v 1.1 2023/06/02 16:44:06 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2023/12/31 20:49:27 adam Exp $
 
 Sun audio support.
 
-Enable PIC and section_data_rel_ro on NetBSD, even on i386,
-to avoid text relocations.
+Enable PIC on NetBSD, even on i386, to avoid text relocations.
 
 Fix install_name_dir on Darwin.
 
 Do not use 'rsync'.
 
---- configure.orig     2022-04-04 14:40:22.000000000 +0000
+--- configure.orig     2023-12-31 00:07:26.000000000 +0000
 +++ configure
-@@ -2196,6 +2196,7 @@ HEADERS_LIST="
+@@ -2231,6 +2231,7 @@ HEADERS_LIST="
      sys_resource_h
      sys_select_h
      sys_soundcard_h
@@ -19,7 +18,7 @@ Do not use 'rsync'.
      sys_time_h
      sys_un_h
      sys_videoio_h
-@@ -2337,7 +2338,6 @@ TOOLCHAIN_FEATURES="
+@@ -2374,7 +2375,6 @@ TOOLCHAIN_FEATURES="
      inline_asm_labels
      inline_asm_nonlocal_labels
      pragma_deprecated
@@ -27,7 +26,7 @@ Do not use 'rsync'.
      symver_asm_label
      symver_gnu_asm
      vfp_args
-@@ -3521,6 +3521,8 @@ opengl_outdev_deps="opengl"
+@@ -3598,6 +3598,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 +35,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
-         ;;
-     netbsd)
+@@ -5554,6 +5556,7 @@ case $target_os in
+     android)
          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
+         add_cflags -fPIE
+         add_ldexeflags -fPIE -pie
+         SLIB_INSTALL_NAME='$(SLIBNAME)'
+@@ -5612,7 +5615,7 @@ case $target_os in
          ;;
      darwin)
          enabled ppc && add_asflags -force_cpusubtype_ALL
@@ -54,7 +52,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
+@@ -5989,10 +5992,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 +69,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
+@@ -6460,6 +6466,7 @@ check_headers malloc.h
  check_headers mftransform.h
  check_headers net/udplite.h
  check_headers poll.h
@@ -79,7 +77,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 \
+@@ -6972,7 +6979,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