CVS commit: pkgsrc/multimedia

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sat, 3 Aug 2024 06:52:01 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Aug  3 06:52:01 UTC 2024

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

Log Message:
ffmpeg6 ffplay6: updated to 6.1.2

version 6.1.2
 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
 swscale: [loongarch] Fix checkasm-sw_yuv2rgb failure.
 avcodec/pngenc: fix sBIT writing for indexed-color PNGs
 avcodec/pngdec: use 8-bit sBIT cap for indexed PNGs per spec
 avcodec/videotoolboxenc: Fix bitrate doesn't work as expected
 Changelog: update
 avdevice/dshow: Don't skip audio devices if no video device is present
 avcodec/hdrenc: Allocate more space
 avcodec/cfhdenc: Height of 16 is not supported
 avcodec/cfhdenc: Allocate more space
 avcodec/osq: fix integer overflow when applying factor
 avcodec/osq: avoid using too large numbers for shifts and integers in update_residue_parameter()
 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
 avfilter/vf_xfade: Check ff_inlink_consume_frame() for failure
 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/j2kenc: Merge dwt_norm into lambda
 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/osq: avoid signed overflow in downsample path
 avcodec/pixlet: Simplify pfx computation
 avcodec/motion_est: Fix score squaring overflow
 avcodec/mlpenc: Use 64 for ml, mr
 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/usmdec: Initialize value
 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_afir: Assert format
 avfilter/af_afftdn: Assert format
 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
 avfilter/avf_showcwt: Check av_parse_video_rate() for failure
 avformat/rdt: Check pkt_len
 avformat/mpeg: Check len in mpegps_probe()
 avformat/mxfenc: resurrects the error print
 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
 fftools/ffmpeg_enc: Initialize fd
 fftools/ffmpeg_enc: simplify opaque_ref check
 avformat/mov: Check edit list for overflow
 fftools/ffmpeg: Check read() for failure
 MAINTAINERS: Add Timo Rothenpieler to server admins
 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
 tools/target_dec_fuzzer: Adjust threshold for MV30
 tools/target_dec_fuzzer: Adjust threshold for jpeg2000
 avformat/mxfdec: Check container_ul->desc before use
 avcodec/libvpxenc: Cleanup on error
 MAINTAINERS: Update the entries for the release maintainer for FFmpeg
 configure: update copyright year
 doc/developer: Provide information about git send-email and gmail
 avfilter/vf_rotate: Check ff_draw_init2() return value
 avformat/mov: Use int64_t in intermediate for corrected_dts
 avformat/mov: Use 64bit in intermediate for current_dts
 avformat/matroskadec: Assert that num_levels is non negative
 avformat/libzmq: Check av_strstart()
 avformat/img2dec: Little JFIF / Exif cleanup
 avformat/img2dec: Move DQT after unrelated if()
 avformat/imfdec: Simplify get_next_track_with_minimum_timestamp()
 avdevice/xcbgrab: Check sscanf() return
 fftools/cmdutils: Add protective () to FLAGS
 avformat/sdp: Check before appending ","
 avcodec/ilbcdec: Remove dead code
 avcodec/vp8: Check cond init
 avcodec/vp8: Check mutex init
 avcodec/proresenc_anatoliy: Assert that AV_PROFILE_UNKNOWN is replaced
 avcodec/pcm-dvdenc: 64bit pkt-size
 avcodec/notchlc: Check init_get_bits8() for failure
 avcodec/tests/dct: Use 64bit in intermediate for error computation
 avcodec/scpr3: Check add_dec() for failure
 avcodec/rv34: assert that size is not 0 in rv34_gen_vlc_ext()
 avcodec/wavpackenc: Use unsigned for potential 31bit shift
 avcodec/tests/jpeg2000dwt: Use 64bit in comparission
 avcodec/tests/jpeg2000dwt: Use 64bit in err2 computation
 avformat/fwse: Remove always false expression
 avcodec/sga: Make it clear that the return is intentionally not checked
 avformat/asfdec_f: Use 64bit for preroll computation
 avformat/argo_asf: Use 64bit in offset intermediate
 avformat/ape: Use 64bit for final frame size
 avformat/ac4dec: Check remaining space in ac4_probe()
 avdevice/pulse_audio_enc: Use av_rescale() to avoid integer overflow
 avcodec/vlc: Cleanup on multi table alloc failure in ff_vlc_init_multi_from_lengths()
 avcodec/tiff: Assert init_get_bits8() success in unpack_gray()
 avcodec/tiff: Assert init_get_bits8() success in horizontal_fill()
 tools/decode_simple: Check avcodec_send_packet() for errors on flushing
 swscale/yuv2rgb: Use 64bit for brightness computation
 swscale/x86/swscale: use a clearer name for INPUT_PLANER_RGB_A_FUNC_CASE
 avutil/tests/opt: Check av_set_options_string() for failure
 avutil/tests/dict: Check av_dict_set() before get for failure
 avdevice/dshow: fix badly indented line
 avformat/demux: resurrect dead stores
 avcodec/tests/bitstream_template: Assert bits_init8() return
 tools/enc_recon_frame_test: Assert that av_image_get_linesize() succeeds
 fftools/ffmpeg: prefer real errors over EOF in err_merge()
 avcodec/png: more informative error message for invalid sBIT size
 avcodec/pngdec: avoid erroring with sBIT on indexed-color images
 avcodec/nvenc: fix segfault in intra-only mode
 aarch64: Add OpenBSD runtime detection of dotprod and i8mm using sysctl
 qsv: Initialize impl_value
 avutil/hwcontext_qsv: fix GCC 14.1 warnings
 lavc/vp9: reset segmentation fields when segmentation isn't enabled
 configure: enable ffnvcodec, nvenc, nvdec for FreeBSD
 avcodec/mscc & mwsc: Check loop counts before use
 avcodec/mpegvideo_enc: Fix potential overflow in RD
 avcodec/mpeg4videodec: assert impossible wrap points
 avcodec/mpeg12dec: Use 64bit in bit computation
 avcodec/vqcdec: Check init_get_bits8() for failure
 avcodec/vble: Check av_image_get_buffer_size() for failure
 avcodec/vp3: Replace check by assert
 avcodec/vp8: Forward return of ff_vpx_init_range_decoder()
 avcodec/jpeg2000dec: remove ST=3 case
 avcodec/qsvdec: Check av_image_get_buffer_size() for failure
 avcodec/exr: Fix preview overflow
 avcodec/decode: decode_simple_internal() only implements audio and video
 avcodec/fmvc: remove dead assignment
 avcodec/h2645_sei: Remove dead checks
 avcodec/h264_slice: Remove dead sps check
 avcodec/lpc: copy levenson coeffs only when they have been computed
 avutil/tests/base64: Check with too short output array
 libavutil/base64: Try not to write over the array end
 avcodec/cbs_av1: Avoid shift overflow
 fftools/ffplay: Check return of swr_alloc_set_opts2()
 tools/opt_common: Check for malloc failure
 doc/examples/demux_decode: Simplify loop
 avformat/concatdec: Check file
 avcodec/mpegvideo_enc: Fix 1 line and one column images
 avcodec/amrwbdec: assert mode to be valid in decode_fixed_vector()
 avcodec/wavarc: fix integer overflow in decode_5elp() block type 2
 swscale/output: Fix integer overflow in yuv2rgba64_full_1_c_template()
 swscale/output: Fix integer overflow in yuv2rgba64_1_c_template
 avcodec/av1dec: Change bit_depth to int
 avcodec/av1dec: bit_depth cannot be another values than 8,10,12
 avcodec/avs3_parser: assert the return value of init_get_bits()
 avcodec/avs2_parser: Assert init_get_bits8() success with const size 15
 avformat/mxfdec: Check body_offset
 avformat/kvag: Check sample_rate
 avcodec/atrac9dec: Check init_get_bits8() for failure
 avcodec/ac3_parser: Check init_get_bits8() for failure
 avcodec/pngdec: Check last AVFrame before deref
 avcodec/hevcdec: Check ref frame
 doc/examples/qsv_transcode: Initialize pointer before free
 doc/examples/qsv_transcode: Simplify str_to_dict() loop
 doc/examples/vaapi_transcode: Simplify loop
 doc/examples/qsv_transcode: Simplify loop
 avcodec/cbs_h2645: Check NAL space
 avfilter/vf_thumbnail_cuda: Set ret before checking it
 avfilter/signature_lookup: Dont copy uninitialized stuff around
 avfilter/signature_lookup: Fix 2 differences to the refernce SW
 avcodec/x86/vp3dsp_init: Set correct function pointer, fix crash
 avformat/mp3dec: change bogus error message if read_header encounters EOF
 avformat/mp3dec: simplify inner frame size check in mp3_read_header
 avformat/mp3dec: only call ffio_ensure_seekback once
 avutil/thread: fix pthread_setname_np parameters for NetBSD and Apple
 avutil/thread: add support for setting thread name on *bsd and solaris
 avutil/ppc/cpu: Also use the machdep.altivec sysctl on NetBSD
 lavd/v4l2: Use proper field type for second parameter of ioctl() with BSD's
 avfilter/avfilter: fix OOM case for default activate
 avfilter/buffersrc: switch to activate
 avcodec/mediacodecenc: set quality in cq mode
 Update for 6.1.2
 fate/subtitles: Ignore line endings for sub-scc test
 avformat/mxfdec: Check index_edit_rate
 swscale/utils: Fix xInc overflow
 avcodec/wavarc: fix signed integer overflow in block type 6/19
 doc/developer: (security) researchers should be credited
 avformat/isom: Uninit layout in ff_mp4_read_dec_config_descr()
 avcodec/exr: Dont use 64bits to hold 6bits
 avcodec/exr: Check for remaining bits in huf_unpack_enc_table()
 avcodec/apedec: Use NABS to avoid undefined negation
 avformat/mpegts: Reset local nb_prg on add_program() failure
 avformat/aiffdec: Check for previously set channels
 avformat/mxfdec: Make edit_unit_byte_count unsigned
 avformat/movenc: Check that cts fits in 32bit
 avformat/mxfdec: Check first case of offset_temp computation for overflow
 avcodec/jpeg2000htdec: warn about non zero roi shift
 avcodec/jpeg2000htdec: Check magp before using it in a shift
 avfilter/vf_signature: Dont crash on no frames
 avformat/westwood_vqa: Fix 2g packets
 avformat/matroskadec: Check timescale
 avformat/wavdec: satuarte next_tag_ofs, data_end
 avformat/wavdec: sanity check channels and bps before using them for block_align
 avformat/sbgdec: Check for negative duration
 avformat/rpl: Use 64bit for total_audio_size and check it
 avformat/timecode: use 64bit for intermediate for rounding in fps_from_frame_rate()
 avformat/mov: use 64bit for intermediate for rounding
 avformat/jacosubdec: Use 64bit for abs
 avformat/concatdec: Check user_duration sum
 avcodec/wavarc: avoid signed integer overflow in AC code
 avcodec/wavarc: Avoid signed integer overflow in sample
 avcodec/truemotion1: Height not being a multiple of 4 is unsupported
 avcodec/rtv1: fix undefined FFALIGN
 avcodec/hcadec: do not allow code to continue after failed init
 avcodec/hcadec: do not set hfr_group_count to invalid values
 avformat/concatdec: clip outpoint - inpoint overflow in get_best_effort_duration()
 avcodec/osq: avoid several signed integer overflows
 avformat/jacosubdec: clarify code
 avformat/cafdec: Check that data chunk end fits within 64bit
 avformat/iff: Saturate avio_tell() + 12
 avformat/dxa: Adjust order of operations around block align
 avformat/cafdec: dont seek beyond 64bit
 avformat/id3v2: read_uslt() check for the amount read
 avcodec/vmixdec: Check shift before use
 avformat/mov: Check sample_count and auxiliary_info_default_size to be 0
 avformat/wady: Check >0 samplerate and channels 1 || 2.
 avcodec/cbs_h266_syntax_template: Check tile_y
 avcodec/proresenc_kostya: Remove bug similarity text
 avcodec/vorbisdec: Check remaining data in vorbis_residue_decode_internal()
 avformat/concatdec: Check in and outpoints to be to produce a positive representable duration
 avcodec/8bps: Consider width in the minimal size check
 libswscale/utils: Fix bayer to yuvj
 swscale/swscale: Check srcSliceH for bayer
 swscale/utils: Allocate more dithererror
 avcodec/indeo3: Round dimensions up in allocate_frame_buffers()
 avutil/rational: Document what is to be expected from av_d2q() of doubles representing rational numbers
 avfilter/signature_lookup: Do not dereference NULL pointers after malloc failure
 avfilter/signature_lookup: dont leave uncleared pointers in sll_free()
 avcodec/mpegvideo_enc: Use ptrdiff_t for stride
 libavformat/hlsenc.c: Populate OTI using AAC profile in write_codec_attr.
 avformat/mov: Check if a key is longer than the atom containing it
 avcodec/nvenc: support SDK 12.2 bit depth API
 avcodec/nvenc: stop using long deprecated format specifiers
 avfilter/buffersrc: fix overriding unknown channel layouts with negotiated one
 avfilter/af_channelmap: disallow channel index 64
 avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
 avfilter/af_channelmap: fix error message if FL source channel was missing
 avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer
 avformat/mov: don't abort on duplicate Mastering Display Metadata boxes
 fftools/ffplay: use correct buffersink channel layout parameters
 avformat/mpegts: detect synchronous metadata KLV more reliably
 swresample/resample: fix rounding errors with filter_size=1 and phase_shift=0
 avformat/mxfdec: remove resolve_strong_ref usage with AnyType
 avfilter/vf_convolution: add float user_rdiv[4] to allow user options to apply correctly
 avformat/libsrt: use SRT_EPOLL_IN for waiting for an incoming connection
 avformat/mxfdec: do not use AnyType when resolving Descriptors and MultipleDescriptors
 avformat/mxfdec: move resolving Descriptors to the multi descriptor resolve function
 avutil/hwcontext_d3d11va: prefer DXGI 1.1 factory when available
 avcodec/libsvtav1: send the EOS signal without a one frame delay to allow for the library to operate in a low-delay mode
 avcodec/libsvtav1: add version guard for external param
 lavc/vvc: Read subpic ID when only one subpicture is present
 lavc/vvc: Correct sps_num_subpics_minus1 minimum
 avcodec/cbs_h2645: Avoid function pointer casts, fix UB
 avcodec/cbs_h266_syntax_template: Don't omit unused function parameter
 avcodec/cbs_h266_syntax_template: check aps_adaptation_parameter_set_id
 lavc/vvc: Add check to num_multi_layer_olss
 avcodec/cbs_h266: fix logic setting num_layers_in_ols when vps_ols_mode_idc is 2
 avcodec/av1dec: fix matrix coefficients exposed by codec context
 {avcodec,tests}: rename the bundled Mesa AV1 vulkan video headers
 avformat/mov_chan: never override number of channels based on chan atom
 avformat/mov_chan: do not assume channels are in native order
 avfft: avoid overreads with RDFT API users
 avcodec/nvdec: don't free NVDECContext->bitstream
 avcodec/mediacodecdec: fix return EAGAIN after EOF


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/ffmpeg6/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg6/Makefile.common \
    pkgsrc/multimedia/ffmpeg6/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg6/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg6/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/ffmpeg6/patches/patch-libavutil_ppc_cpu.c
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/ffplay6/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/ffmpeg6/Makefile
diff -u pkgsrc/multimedia/ffmpeg6/Makefile:1.15 pkgsrc/multimedia/ffmpeg6/Makefile:1.16
--- pkgsrc/multimedia/ffmpeg6/Makefile:1.15     Wed May 29 16:33:42 2024
+++ pkgsrc/multimedia/ffmpeg6/Makefile  Sat Aug  3 06:52:01 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2024/05/29 16:33:42 adam Exp $
+# $NetBSD: Makefile,v 1.16 2024/08/03 06:52:01 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg6/}
-PKGREVISION=   6
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v6.x)

Index: pkgsrc/multimedia/ffmpeg6/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg6/Makefile.common:1.7 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.8
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.7       Sat Jan 27 02:54:36 2024
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Sat Aug  3 06:52:01 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2024/01/27 02:54:36 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.8 2024/08/03 06:52:01 adam Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
-DISTNAME=      ffmpeg-6.1.1
+DISTNAME=      ffmpeg-6.1.2
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -40,7 +40,7 @@ LDFLAGS.Darwin+=      -Wl,-ld_classic
 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
@@ -55,12 +55,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/ffmpeg6/distinfo
diff -u pkgsrc/multimedia/ffmpeg6/distinfo:1.7 pkgsrc/multimedia/ffmpeg6/distinfo:1.8
--- pkgsrc/multimedia/ffmpeg6/distinfo:1.7      Sat Jan 27 02:53:01 2024
+++ pkgsrc/multimedia/ffmpeg6/distinfo  Sat Aug  3 06:52:01 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2024/01/27 02:53:01 riastradh Exp $
+$NetBSD: distinfo,v 1.8 2024/08/03 06:52:01 adam Exp $
 
-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
+BLAKE2s (ffmpeg-6.1.2.tar.xz) = 065a525ea3258702bd7fe9668af6583f2a5cf5990a60800e246899d328b0c1fd
+SHA512 (ffmpeg-6.1.2.tar.xz) = 3a009184d971fc3168e1322d1d724aae787ed0e9c152d8d1813ea0b9099bda3b35c41fcabbd7b140560e7a8fa9fa1ffd7f0938432d5d498c43829fc6cc3d9e08
+Size (ffmpeg-6.1.2.tar.xz) = 10466152 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = 40afb0e226a0a1b5785ac8cf7a48c5859d326a4e
+SHA1 (patch-configure) = 11c446c3e17d9624bc0141e3d839517834434d53
 SHA1 (patch-doc_Makefile) = c513af183e374bff4fa5945d374ddae472d51bad
 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) = 162daff5075c436bfff6e9a33238ba273a0afea6
 SHA1 (patch-libavformat_mux__utils.c) = fb7be5deb316e2fa79ba8cf8f2f4e347b13b91f5
 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/ffmpeg6/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg6/buildlink3.mk:1.3 pkgsrc/multimedia/ffmpeg6/buildlink3.mk:1.4
--- pkgsrc/multimedia/ffmpeg6/buildlink3.mk:1.3 Mon Jan 22 13:17:01 2024
+++ pkgsrc/multimedia/ffmpeg6/buildlink3.mk     Sat Aug  3 06:52:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2024/01/22 13:17:01 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2024/08/03 06:52:01 adam Exp $
 
 BUILDLINK_TREE+=       ffmpeg6
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ffmpeg6
 FFMPEG6_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ffmpeg6+=        ffmpeg6>=6.0
-BUILDLINK_ABI_DEPENDS.ffmpeg6?=        ffmpeg6>=6.1.1nb1
+BUILDLINK_ABI_DEPENDS.ffmpeg6+=        ffmpeg6>=6.1.1nb1
 BUILDLINK_PKGSRCDIR.ffmpeg6?=  ../../multimedia/ffmpeg6
 
 pkgbase := ffmpeg6

Index: pkgsrc/multimedia/ffmpeg6/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.3 pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.4
--- pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.3       Mon Jan  1 09:06:25 2024
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-configure   Sat Aug  3 06:52:01 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2024/01/01 09:06:25 adam Exp $
+$NetBSD: patch-configure,v 1.4 2024/08/03 06:52:01 adam Exp $
 
 Sun audio support.
 
@@ -8,9 +8,9 @@ Fix install_name_dir on Darwin.
 
 Do not use 'rsync'.
 
---- configure.orig     2023-12-31 00:07:26.000000000 +0000
+--- configure.orig     2024-08-01 23:22:54.000000000 +0000
 +++ configure
-@@ -2231,6 +2231,7 @@ HEADERS_LIST="
+@@ -2232,6 +2232,7 @@ HEADERS_LIST="
      sys_resource_h
      sys_select_h
      sys_soundcard_h
@@ -18,7 +18,7 @@ Do not use 'rsync'.
      sys_time_h
      sys_un_h
      sys_videoio_h
-@@ -2374,7 +2375,6 @@ TOOLCHAIN_FEATURES="
+@@ -2377,7 +2378,6 @@ TOOLCHAIN_FEATURES="
      inline_asm_labels
      inline_asm_nonlocal_labels
      pragma_deprecated
@@ -26,7 +26,7 @@ Do not use 'rsync'.
      symver_asm_label
      symver_gnu_asm
      vfp_args
-@@ -3598,6 +3598,8 @@ opengl_outdev_deps="opengl"
+@@ -3601,6 +3601,8 @@ opengl_outdev_deps="opengl"
  opengl_outdev_suggest="sdl2"
  oss_indev_deps_any="sys_soundcard_h"
  oss_outdev_deps_any="sys_soundcard_h"
@@ -35,7 +35,7 @@ Do not use 'rsync'.
  pulse_indev_deps="libpulse"
  pulse_outdev_deps="libpulse"
  sdl2_outdev_deps="sdl2"
-@@ -5586,6 +5588,7 @@ case $target_os in
+@@ -5589,6 +5591,7 @@ case $target_os in
      netbsd)
          disable symver
          enable section_data_rel_ro
@@ -43,7 +43,7 @@ Do not use 'rsync'.
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5612,7 +5615,7 @@ case $target_os in
+@@ -5615,7 +5618,7 @@ case $target_os in
          ;;
      darwin)
          enabled ppc && add_asflags -force_cpusubtype_ALL
@@ -52,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"
-@@ -5989,10 +5992,13 @@ done
+@@ -5992,10 +5995,13 @@ done
  check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
  
  # The global variable ensures the bits appear unchanged in the object file.
@@ -69,15 +69,15 @@ Do not use 'rsync'.
  
  check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }"
  
-@@ -6460,6 +6466,7 @@ check_headers malloc.h
- check_headers mftransform.h
+@@ -6464,6 +6470,7 @@ check_headers mftransform.h
  check_headers net/udplite.h
  check_headers poll.h
+ check_headers pthread_np.h
 +check_headers sys/audioio.h
  check_headers sys/param.h
  check_headers sys/resource.h
  check_headers sys/select.h
-@@ -6972,7 +6979,6 @@ enabled makeinfo \
+@@ -6982,7 +6989,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/ffplay6/Makefile
diff -u pkgsrc/multimedia/ffplay6/Makefile:1.9 pkgsrc/multimedia/ffplay6/Makefile:1.10
--- pkgsrc/multimedia/ffplay6/Makefile:1.9      Wed May 29 16:33:43 2024
+++ pkgsrc/multimedia/ffplay6/Makefile  Sat Aug  3 06:52:01 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2024/05/29 16:33:43 adam Exp $
+# $NetBSD: Makefile,v 1.10 2024/08/03 06:52:01 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay6/}
-PKGREVISION=   5
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg

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

Home | Main Index | Thread Index | Old Index