From 2de370e79035c6208836cf15fe013e5302197b59 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 5 Apr 2022 09:24:29 +0000 Subject: ffmpeg5 ffplay5: updated to 5.0.1 version 5.0.1: - avcodec/exr: Avoid signed overflow in displayWindow - avcodec/diracdec: avoid signed integer overflow in global mv - avcodec/takdsp: Fix integer overflow in decorrelate_sf() - avcodec/apedec: fix a integer overflow in long_filter_high_3800() - avdevice/dshow: fix regression - avfilter/vf_subtitles: pass storage size to libass - avcodec/vp9_superframe_split_bsf: Don't read inexistent data - avcodec/vp9_superframe_split_bsf: Discard invalid zero-sized frames - avcodec/vp9_superframe_bsf: Check for existence of data before reading it - avcodec/vp9_raw_reorder_bsf: Check for existence of data before reading it - avformat/imf: fix packet pts, dts and muxing - avformat/imf: open resources only when first needed - avformat/imf: cosmetics - avformat/imf_cpl: do not use filesize when reading XML file - avformat/imfdec: Use proper logcontext - avformat/imfdec: do not use filesize when reading XML file - doc/utils: add missing 22.2 layout entry - avcodec/av1: only set the private context pix_fmt field if get_pixel_format() succeeds - avformat/aqtitledec: Skip unrepresentable durations - avformat/cafdec: Do not store empty keys in read_info_chunk() - avformat/mxfdec: Do not clear array in mxf_read_strong_ref_array() before writing - avformat/mxfdec: Check for avio_read() failure in mxf_read_strong_ref_array() - avformat/mxfdec: Check count in mxf_read_strong_ref_array() - avformat/hls: Check target_duration - avcodec/pixlet: Avoid signed integer overflow in scaling in filterfn() - avformat/matroskadec: Check pre_ns - avcodec/sonic: Use unsigned for predictor_k to avoid undefined behavior - avcodec/libuavs3d: Check ff_set_dimensions() for failure - avcodec/speexdec: Align some comments - avcodec/speexdec: Use correct doxygen comments - avcodec/mjpegbdec: Set buf_size - avformat/matroskadec: Use rounded down duration in get_cue_desc() check - avcodec/argo: Check packet size - avcodec/g729_parser: Check channels - avformat/avidec: Check height - avformat/rmdec: Better duplicate tags check - avformat/mov: Disallow empty sidx - avformat/argo_cvg:: Fix order of operations in error check in argo_cvg_write_trailer() - avformat/argo_asf: Fix order of operations in error check in argo_asf_write_trailer() - avcodec/movtextdec: add () to CMP() macro to avoid unexpected behavior - avformat/matroskadec: Check duration - avformat/mov: Corner case encryption error cleanup in mov_read_senc() - avcodec/jpeglsdec: Fix if( code style - avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error - avcodec/motion_est: fix indention of ff_get_best_fcode() - avcodec/motion_est: Fix xy indexing on range violation in ff_get_best_fcode() - avformat/hls: Use unsigned for iv computation - avcodec/jpeglsdec: Increase range for N in ls_get_code_runterm() by using unsigned - avformat/matroskadec: Check desc_bytes - avformat/utils: Fix invalid NULL pointer operation in ff_parse_key_value() - avformat/matroskadec: Fix infinite loop with bz decompression - avformat/utils: keep chapter monotonicity on chapter updates - avformat/mov: Check size before subtraction - avcodec/cfhd: Avoid signed integer overflow in coeff - avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure - avcodec/h264_parser: don't alter decoder private data - configure: link to libatomic when it's present - fate/ffmpeg: add missing samples dependency to fate-shortest --- multimedia/ffmpeg5/Makefile | 3 +-- multimedia/ffmpeg5/Makefile.common | 11 +++++------ multimedia/ffmpeg5/distinfo | 10 +++++----- multimedia/ffmpeg5/patches/patch-configure | 23 ++++++++++++++++++++--- multimedia/ffplay5/Makefile | 3 +-- 5 files changed, 32 insertions(+), 18 deletions(-) (limited to 'multimedia') diff --git a/multimedia/ffmpeg5/Makefile b/multimedia/ffmpeg5/Makefile index 1c3952096a7..df92141e437 100644 --- a/multimedia/ffmpeg5/Makefile +++ b/multimedia/ffmpeg5/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2022/03/30 09:20:27 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2022/04/05 09:24:29 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg5/} -PKGREVISION= 2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://ffmpeg.org/ COMMENT= Decoding, encoding and streaming software (v5.x) diff --git a/multimedia/ffmpeg5/Makefile.common b/multimedia/ffmpeg5/Makefile.common index 3c58edf9e43..cafa9009ac3 100644 --- a/multimedia/ffmpeg5/Makefile.common +++ b/multimedia/ffmpeg5/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.1 2022/01/31 23:16:41 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.2 2022/04/05 09:24:29 adam Exp $ # used by multimedia/ffmpeg5/Makefile # used by multimedia/ffplay5/Makefile -DISTNAME= ffmpeg-5.0 +DISTNAME= ffmpeg-5.0.1 CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.xz @@ -24,8 +24,9 @@ CONFIGURE_ARGS+= --enable-pthreads CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --prefix=${PREFIX} - CONFIGURE_ARGS+= --progs-suffix=5 + +CONFIGURE_ARGS+= --enable-runtime-cpudetect CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg5 CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg5 CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg5 @@ -42,8 +43,6 @@ USE_TOOLS+= bash:build CONFIG_SHELL= ${TOOLS_PATH.bash} .endif -CONFIGURE_ARGS+= --enable-runtime-cpudetect - # Let's not put garbage into /tmp CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp @@ -74,7 +73,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} pre-configure: - mkdir ${WRKSRC}/tmp + ${MKDIR} ${WRKSRC}/tmp .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" diff --git a/multimedia/ffmpeg5/distinfo b/multimedia/ffmpeg5/distinfo index 0579175dee9..2065a17ba0c 100644 --- a/multimedia/ffmpeg5/distinfo +++ b/multimedia/ffmpeg5/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.1 2022/01/31 23:16:41 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2022/04/05 09:24:29 adam Exp $ -BLAKE2s (ffmpeg-5.0.tar.xz) = 978127fece2cd1765ee14902bf7d5abce715baeaa80b58acd00f8eff38acf6e6 -SHA512 (ffmpeg-5.0.tar.xz) = 112bdd566243927000c6f78dbb3a2ba045f66ec24150c691c993a73ef6da1ab3978b403af6f8149f95dbdcfd2d82b4e539b83ee39af89b0137638351c9f1bae7 -Size (ffmpeg-5.0.tar.xz) = 9811480 bytes +BLAKE2s (ffmpeg-5.0.1.tar.xz) = 9b694a2c12b1c5216e21c381e1d6389c29bff56ba39d4e6051b28c560e33646f +SHA512 (ffmpeg-5.0.1.tar.xz) = e5810c7379748a6bbe1a903bf36b4372b67cb3973179727b6af6f0118eef46f4c990155961cc37255e08a5bafdc4b4683503ad410ebb7afe7a35b891c01fa602 +Size (ffmpeg-5.0.1.tar.xz) = 9812524 bytes SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6 -SHA1 (patch-configure) = 9ec024b5b6df0b9a5111b5b47801c30f5ad911ea +SHA1 (patch-configure) = b4dea315f65ab019eb78cee7f58d938382024ae0 SHA1 (patch-doc_Makefile) = d45fc311f47e6cd8a8432659d7bd77e50b858e43 SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724 SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7 diff --git a/multimedia/ffmpeg5/patches/patch-configure b/multimedia/ffmpeg5/patches/patch-configure index 98a73bdcd1e..3e128de755a 100644 --- a/multimedia/ffmpeg5/patches/patch-configure +++ b/multimedia/ffmpeg5/patches/patch-configure @@ -1,14 +1,22 @@ -$NetBSD: patch-configure,v 1.1 2022/01/31 23:16:41 ryoon Exp $ +$NetBSD: patch-configure,v 1.2 2022/04/05 09:24:29 adam Exp $ Sun audio support. Enable PIC and section_data_rel_ro on NetBSD, even on i386, to avoid text relocations. +Fix install_name_dir on Darwin. + Do not use 'rsync'. ---- configure.orig 2022-01-14 18:45:39.000000000 +0000 +--- configure.orig 2022-04-04 14:40:22.000000000 +0000 +++ configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/dist/pkg/bin/mksh + # + # FFmpeg configure script + # @@ -2196,6 +2196,7 @@ HEADERS_LIST=" sys_resource_h sys_select_h @@ -43,6 +51,15 @@ Do not use 'rsync'. oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" enabled gcc || check_ldflags -Wl,-zmuldefs +@@ -5516,7 +5520,7 @@ case $target_os in + ;; + darwin) + enabled ppc && add_asflags -force_cpusubtype_ALL +- install_name_dir_default='$(SHLIBDIR)' ++ install_name_dir_default=$shlibdir + 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 check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")' @@ -68,7 +85,7 @@ Do not use 'rsync'. check_headers sys/param.h check_headers sys/resource.h check_headers sys/select.h -@@ -6776,7 +6784,6 @@ enabled makeinfo \ +@@ -6783,7 +6791,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 diff --git a/multimedia/ffplay5/Makefile b/multimedia/ffplay5/Makefile index 5aab7c7aeba..5ceb89ad204 100644 --- a/multimedia/ffplay5/Makefile +++ b/multimedia/ffplay5/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2022/03/28 10:45:23 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2022/04/05 09:24:29 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffplay5/} -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://ffmpeg.org/ COMMENT= Simple SDL frontend for FFmpeg -- cgit v1.2.3