Date: Thu, 8 Apr 2021 23:34:10 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3d7938b00655 - main - multimedia/ffmpeg: update to 4.4 Message-ID: <202104082334.138NYAbx075480@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d7938b006553469ae85ef7fbfc9793a16880ebf commit 3d7938b006553469ae85ef7fbfc9793a16880ebf Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-03-20 04:20:33 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-04-08 23:33:31 +0000 multimedia/ffmpeg: update to 4.4 Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.4:/Changelog Reported by: Repology --- multimedia/ffmpeg/Makefile | 51 +++++++++++++++++++++----------- multimedia/ffmpeg/distinfo | 20 ++++++------- multimedia/ffmpeg/files/patch-glslang-11 | 24 --------------- multimedia/ffmpeg/pkg-plist | 17 ++++++----- 4 files changed, 51 insertions(+), 61 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 1b1a0fe811ec..2b3252627cac 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,7 @@ # Created by: Martin Matuska <mm@FreeBSD.org> PORTNAME= ffmpeg -PORTVERSION= 4.3.2 -PORTREVISION= 1 +PORTVERSION= 4.4 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ @@ -39,11 +38,11 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO CELT \ FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC \ JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBRSVG2 \ LIBXML2 LTO LV2 MFX MODPLUG MYSOFA OPENAL OPENCL OPENGL \ - OPENH264 OPENJPEG OPENMPT OPTIMIZED_CFLAGS OPUS POCKETSPHINX \ - PULSEAUDIO RAV1E RABBITMQ RTCPU RUBBERBAND SDL SMB SNAPPY \ + OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \ + PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SMB SNAPPY \ SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \ - TESSERACT THEORA TWOLAME V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \ - VMAF VO_AMRWBENC VORBIS VPX VULKAN WAVPACK WEBP X264 X265 \ + TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \ + VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \ XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \ @@ -60,6 +59,11 @@ OPTIONS_EXCLUDE+= ARIBB24 OPTIONS_EXCLUDE+= DAVS2 .endif +.if !exists(${.CURDIR:H:H}/multimedia/uavs3d) +# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c952db9d68d3 +OPTIONS_EXCLUDE+= UAVS3D +.endif + .if !exists(${.CURDIR:H:H}/multimedia/xavs2) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/85a921f4618 OPTIONS_EXCLUDE+= XAVS2 @@ -70,6 +74,11 @@ OPTIONS_EXCLUDE+= XAVS2 OPTIONS_EXCLUDE+= KLVANC .endif +.if !exists(${.CURDIR:H:H}/science/openvino) +# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ff37ebaf30e6 +OPTIONS_EXCLUDE+= OPENVINO +.endif + .if !exists(${.CURDIR:H:H}/net/srt) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/a2fc8dbae853 OPTIONS_EXCLUDE+= SRT @@ -111,9 +120,11 @@ MYSOFA_DESC= SOFAlizer binaural filter NONFREE_DESC= Allow use of nonfree code OPENMPT_DESC= Decoding tracked files via libopenmpt OPENH264_DESC= H.264 video codec support via OpenH264 +OPENVINO_DESC= OpenVINO as a DNN module backend for DNN based filters like dnn_processing POCKETSPHINX_DESC= Automatic Speech Recognition via PocketSphinx RAV1E_DESC= AV1 encoding via librav1e RABBITMQ_DESC= AMQP 0-9-1 protocol via RabbitMQ +RIST_DESC= Reliable Internet Stream Transport protocol via librist RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband RTCPU_DESC= Detect CPU capabilities at runtime RTMP_DESC= RTMP(T)E protocol support @@ -124,6 +135,7 @@ SVTVP9_DESC= VP9 encoding via SVT-VP9 LIBRTMP_DESC= ${RTMP_DESC} via librtmp TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr TESSERACT_DESC= Optical Character Recognition via Tesseract +UAVS3D_DESC= AVS3 decoding via libuavs3d VAPOURSYNTH_DESC= VapourSynth demuxer VIDSTAB_DESC= Video stabilization filter VMAF_DESC= VMAF filter via libvmaf @@ -377,6 +389,10 @@ OPENSSL_USES= ssl OPENSSL_CONFIGURE_ENABLE= ${"${SSL_DEFAULT:Mlibressl*}"!="":?libtls:openssl} OPENSSL_IMPLIES= NONFREE +# openvino +OPENVINO_LIB_DEPENDS= libinference_engine_c_api.so:science/openvino +OPENVINO_CONFIGURE_ENABLE= libopenvino + # optimizations OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations @@ -401,6 +417,10 @@ RAV1E_CONFIGURE_ENABLE= librav1e RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c RABBITMQ_CONFIGURE_ENABLE= librabbitmq +# rist +RIST_LIB_DEPENDS= librist.so:multimedia/librist +RIST_CONFIGURE_ENABLE= librist + # rubberband RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband RUBBERBAND_CONFIGURE_ENABLE= librubberband @@ -449,20 +469,15 @@ SRT_CONFIGURE_ENABLE= libsrt # svt-av1 SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 SVTAV1_CONFIGURE_ON= --enable-libsvtav1 -SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1 -SVTAV1_PATCHFILES= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) # https://github.com/OpenVisualCloud/SVT-AV1/issues/691 SVTAV1_LDFLAGS= -fuse-ld=lld .endif -.if make(makesum) -.MAKEFLAGS: WITH+=SVTAV1 -.endif # svt-hevc SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc SVTHEVC_CONFIGURE_ON= --enable-libsvthevc -SVTHEVC_PATCH_SITES= https://github.com/Intel/SVT-HEVC/raw/v1.5.0/ffmpeg_plugin/:svthevc +SVTHEVC_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.0-3-g86b58f77/ffmpeg_plugin/:svthevc SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ 0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) @@ -475,8 +490,8 @@ SVTHEVC_LDFLAGS= -fuse-ld=lld # svt-vp9 SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9 SVTVP9_CONFIGURE_ON= --enable-libsvtvp9 -SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0/ffmpeg_plugin/:svtvp9 -SVTVP9_PATCHFILES= n4.3.1-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 +SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-4-gabd5c59/ffmpeg_plugin/:svtvp9 +SVTVP9_PATCHFILES= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) SVTVP9_LDFLAGS= -fuse-ld=lld .endif @@ -500,6 +515,10 @@ THEORA_CONFIGURE_ENABLE= libtheora TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame TWOLAME_CONFIGURE_ENABLE= libtwolame +# uavs3d +UAVS3D_LIB_DEPENDS= libuavs3d.so:multimedia/uavs3d +UAVS3D_CONFIGURE_ENABLE= libuavs3d + # vaapi VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi @@ -541,10 +560,6 @@ VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CONFIGURE_ENABLE= vulkan VULKAN_IMPLIES= GLSLANG -# wavpack -WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack -WAVPACK_CONFIGURE_ENABLE= libwavpack - # webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_ENABLE= libwebp diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 0bae74757275..ba4751551a0f 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,11 +1,9 @@ -TIMESTAMP = 1594463970 -SHA256 (ffmpeg-4.3.2.tar.xz) = 46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb -SIZE (ffmpeg-4.3.2.tar.xz) = 9391100 -SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719 -SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 25023 -SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = b37d43d5d8692599347c6f1f316c13b9a9addc66d3ceb7e6e02341c494af7cdc -SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 24216 -SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0 -SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332 -SHA256 (n4.3.1-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96 -SIZE (n4.3.1-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33465 +TIMESTAMP = 1617917322 +SHA256 (ffmpeg-4.4.tar.xz) = 06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909 +SIZE (ffmpeg-4.4.tar.xz) = 9557868 +SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 376ea23e9d876390fbca936c80cb437bb9daa6232ff65df0ea91673e18b739ff +SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 24259 +SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = d16589efc4be2602a9f436e9938cfee0cc7b5ccd7a4a6b41c0c9a59ae0859fda +SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5336 +SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = b7d722dfce20b73e9d5c73d55ffe041bbdc92a3c4a5c5d766b6b3040671b4052 +SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33497 diff --git a/multimedia/ffmpeg/files/patch-glslang-11 b/multimedia/ffmpeg/files/patch-glslang-11 deleted file mode 100644 index ab73007023b1..000000000000 --- a/multimedia/ffmpeg/files/patch-glslang-11 +++ /dev/null @@ -1,24 +0,0 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/98ea1a662ee1 -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/4dab04622a6c - ---- configure.orig 2020-06-15 18:54:23 UTC -+++ configure -@@ -6347,7 +6347,7 @@ enabled fontconfig && enable libfontconfig - enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit - enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType - enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info --enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -+enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ - enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || - require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } - enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do ---- libavfilter/glslang.cpp.orig 2020-07-11 10:39:30 UTC -+++ libavfilter/glslang.cpp -@@ -24,7 +24,6 @@ extern "C" { - } - - #include <glslang/Include/ResourceLimits.h> --#include <glslang/Include/revision.h> - #include <glslang/Public/ShaderLang.h> - #include <glslang/SPIRV/GlslangToSpv.h> - diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist index 639b229780db..6f5f8c0b8db6 100644 --- a/multimedia/ffmpeg/pkg-plist +++ b/multimedia/ffmpeg/pkg-plist @@ -67,6 +67,7 @@ include/libavutil/eval.h include/libavutil/ffversion.h include/libavutil/fifo.h include/libavutil/file.h +include/libavutil/film_grain_params.h include/libavutil/frame.h include/libavutil/hash.h include/libavutil/hdr_dynamic_metadata.h @@ -130,31 +131,31 @@ include/libswscale/swscale.h include/libswscale/version.h lib/libavcodec.so lib/libavcodec.so.58 -lib/libavcodec.so.58.91.100 +lib/libavcodec.so.58.134.100 lib/libavdevice.so lib/libavdevice.so.58 -lib/libavdevice.so.58.10.100 +lib/libavdevice.so.58.13.100 lib/libavfilter.so lib/libavfilter.so.7 -lib/libavfilter.so.7.85.100 +lib/libavfilter.so.7.110.100 lib/libavformat.so lib/libavformat.so.58 -lib/libavformat.so.58.45.100 +lib/libavformat.so.58.76.100 lib/libavresample.so lib/libavresample.so.4 lib/libavresample.so.4.0.0 lib/libavutil.so lib/libavutil.so.56 -lib/libavutil.so.56.51.100 +lib/libavutil.so.56.70.100 lib/libpostproc.so lib/libpostproc.so.55 -lib/libpostproc.so.55.7.100 +lib/libpostproc.so.55.9.100 lib/libswresample.so lib/libswresample.so.3 -lib/libswresample.so.3.7.100 +lib/libswresample.so.3.9.100 lib/libswscale.so lib/libswscale.so.5 -lib/libswscale.so.5.7.100 +lib/libswscale.so.5.9.100 libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavdevice.pc libdata/pkgconfig/libavfilter.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104082334.138NYAbx075480>