svn commit: r539350 - in head/multimedia/ffmpeg: . files
Jan Beich
jbeich at FreeBSD.org
Tue Jun 16 12:56:45 UTC 2020
Author: jbeich
Date: Tue Jun 16 12:56:44 2020
New Revision: 539350
URL: https://svnweb.freebsd.org/changeset/ports/539350
Log:
multimedia/ffmpeg: update to 4.3
New defaults (using existing dependencies):
- Enable DRM for VAAPI-capable capture on KMS console, Wayland, X11
- Enable LIBXML2 by default for DASH demuxing support [1]
Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.3:/Changelog
ABI: https://abi-laboratory.pro/tracker/timeline/ffmpeg/
Requested by: Tal Al <tad at vif.com> (via private mail) [1]
Reported by: portscout
Added:
head/multimedia/ffmpeg/files/patch-libavcodec_libsvt__vp9.c (contents, props changed)
Deleted:
head/multimedia/ffmpeg/files/patch-libavcodec_allcodecs.c
head/multimedia/ffmpeg/files/patch-libswscale_ppc_swscale__altivec.c
head/multimedia/ffmpeg/files/patch-rav1e
head/multimedia/ffmpeg/files/patch-vdpau_vp9
Modified:
head/multimedia/ffmpeg/Makefile (contents, props changed)
head/multimedia/ffmpeg/distinfo (contents, props changed)
head/multimedia/ffmpeg/files/patch-configure (contents, props changed)
head/multimedia/ffmpeg/pkg-plist (contents, props changed)
Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile Tue Jun 16 12:55:33 2020 (r539349)
+++ head/multimedia/ffmpeg/Makefile Tue Jun 16 12:56:44 2020 (r539350)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ffmpeg
-PORTVERSION= 4.2.3
+PORTVERSION= 4.3
PORTEPOCH= 1
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/
@@ -39,17 +39,17 @@ PORTSCOUT= limit:^4\.
# Option CHROMAPRINT disabled, it cannot work and people are baffled.
OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASS BS2B CACA CDIO CELT \
CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \
- FONTCONFIG FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK \
+ 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 OPENCV OPENGL OPENH264 \
OPENJPEG OPENMPT OPTIMIZED_CFLAGS OPUS POCKETSPHINX PULSEAUDIO \
- RAV1E RTCPU RUBBERBAND SDL SMB SNAPPY SNDIO SOXR SPEEX SRT SSH \
+ RAV1E RABBITMQ 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 \
+ VAAPI VAPOURSYNTH VDPAU VIDSTAB VMAF VO_AMRWBENC VORBIS VPX VULKAN \
WAVPACK WEBP X264 X265 XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI
-OPTIONS_DEFAULT= AOM ASS DAV1D FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \
- OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI VDPAU \
+OPTIONS_DEFAULT= AOM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \
+ LIBXML2 OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI VDPAU \
VORBIS VPX X264 X265 XCB XVID
.if !exists(${.CURDIR:H:H}/multimedia/aribb24)
@@ -106,6 +106,7 @@ DC1394_DESC= IIDC-1394 grabbing using libdc1394
DRM_DESC= KMS grabbing using libdrm
FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
FLITE_DESC= Voice synthesis support via libflite
+GLSLANG_DESC= GLSL->SPIRV compilation via libglslang
GME_DESC= Game Music Emu demuxer
GPL3_DESC= Allow (L)GPL version 3 code(cs)
ILBC_DESC= Internet Low Bit Rate codec
@@ -122,6 +123,7 @@ OPENMPT_DESC= Decoding tracked files via libopenmpt
OPENH264_DESC= H.264 video codec support via OpenH264
POCKETSPHINX_DESC= Automatic Speech Recognition via PocketSphinx
RAV1E_DESC= AV1 encoding via librav1e
+RABBITMQ_DESC= AMQP 0-9-1 protocol via RabbitMQ
RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
RTCPU_DESC= Detect CPU capabilities at runtime
RTMP_DESC= RTMP(T)E protocol support
@@ -136,6 +138,7 @@ VAPOURSYNTH_DESC= VapourSynth demuxer
VFP_DESC= Vector Floating Point instructions
VIDSTAB_DESC= Video stabilization filter
VMAF_DESC= VMAF filter via libvmaf
+VULKAN_DESC= Vulkan filters
XAVS2_DESC= AVS2 encoding via libxavs2
XCB_DESC= X11 grabbing using XCB
ZIMG_DESC= "z" library video scaling filter
@@ -251,6 +254,12 @@ FRIBIDI_CONFIGURE_ENABLE= libfribidi
GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
GCRYPT_CONFIGURE_ENABLE= gcrypt
+# glslang
+GLSLANG_BUILD_DEPENDS= glslang>0:devel/glslang \
+ spirv-tools>0:devel/spirv-tools
+GLSLANG_CONFIGURE_ENABLE= libglslang
+GLSLANG_LDFLAGS= -lm
+
# gnutls
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_ENABLE= gnutls
@@ -403,6 +412,10 @@ PULSEAUDIO_CONFIGURE_ENABLE= libpulse
RAV1E_LIB_DEPENDS= librav1e.so:multimedia/librav1e
RAV1E_CONFIGURE_ENABLE= librav1e
+# rabbitmq
+RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c
+RABBITMQ_CONFIGURE_ENABLE= librabbitmq
+
# rubberband
RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband
RUBBERBAND_CONFIGURE_ENABLE= librubberband
@@ -455,7 +468,7 @@ SRT_CONFIGURE_ENABLE= libsrt
# svt-av1
SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1
SVTAV1_CONFIGURE_ENABLE= libsvtav1
-SVTAV1_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.3/ffmpeg_plugin/:svtav1
+SVTAV1_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.3-52-gc40ee2492/ffmpeg_plugin/:svtav1
SVTAV1_PATCHFILES_= 0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.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
@@ -476,7 +489,7 @@ SVTHEVC_LDFLAGS= -fuse-ld=lld
SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9
SVTVP9_CONFIGURE_ENABLE= libsvtvp9
SVTVP9_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-2-gefe9c5a/ffmpeg_plugin/:svtvp9
-SVTVP9_PATCHFILES_= n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch:-p1:svtvp9
+SVTVP9_PATCHFILES_= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch:-p1:svtvp9
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
SVTVP9_LDFLAGS= -fuse-ld=lld
.endif
@@ -538,6 +551,12 @@ VORBIS_CONFIGURE_ENABLE= libvorbis
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
VPX_CONFIGURE_ENABLE= libvpx
+# vulkan
+VULKAN_BUILD_DEPENDS= vulkan-headers>0:devel/vulkan-headers
+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
@@ -613,7 +632,8 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--enable-pic \
--enable-gpl \
--enable-avresample \
- --cc="${CC}"
+ --cc="${CC}" \
+ --cxx="${CXX}"
DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
README.md RELEASE_NOTES
Modified: head/multimedia/ffmpeg/distinfo
==============================================================================
--- head/multimedia/ffmpeg/distinfo Tue Jun 16 12:55:33 2020 (r539349)
+++ head/multimedia/ffmpeg/distinfo Tue Jun 16 12:56:44 2020 (r539350)
@@ -1,11 +1,11 @@
-TIMESTAMP = 1592065594
-SHA256 (ffmpeg-4.2.3.tar.xz) = 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31
-SIZE (ffmpeg-4.2.3.tar.xz) = 9101192
+TIMESTAMP = 1592247266
+SHA256 (ffmpeg-4.3.tar.xz) = 1d0ad06484f44bcb97eba5e93c40bcb893890f9f64aeb43e46cd9bb4cbd6795d
+SIZE (ffmpeg-4.3.tar.xz) = 9378360
SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22103
SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332
-SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = cbcf51f37b17355b228b62862cfde141b0701f260d8bc3502a922f0f91303f9e
-SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = 23636
-SHA256 (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 7edb8d617d96e7582b307a341419b283943ea07da42d78033c79d6e3b3052295
-SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 33904
+SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = 69e0456b56429a422977d24a914e7e167a38397b2ab40aec575eee332b0e739c
+SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = 23728
+SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 526f3eba71ff1a2d74e537d8ef777370d9b305a1458799121114b60f7e5a48df
+SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 34177
Modified: head/multimedia/ffmpeg/files/patch-configure
==============================================================================
--- head/multimedia/ffmpeg/files/patch-configure Tue Jun 16 12:55:33 2020 (r539349)
+++ head/multimedia/ffmpeg/files/patch-configure Tue Jun 16 12:56:44 2020 (r539350)
@@ -1,6 +1,6 @@
---- configure.orig 2018-04-20 10:02:55 UTC
+--- configure.orig 2020-06-15 18:54:23 UTC
+++ configure
-@@ -3516,13 +3516,7 @@ target_os_default=$(tolower $(uname -s))
+@@ -3744,13 +3744,7 @@ target_os_default=$(tolower $(uname -s))
host_os=$target_os_default
# machine
@@ -15,23 +15,3 @@
cpu="generic"
intrinsics="none"
-@@ -6122,6 +6117,7 @@
- die "ERROR: OpenMAX IL headers not found"; } && enable omx
- enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
- check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
-+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
- check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
- check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
- check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
-@@ -6234,8 +6229,10 @@ else
- EOF
- fi
-
--enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
-+if enabled alsa; then
-+ check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
- check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
-+fi
-
- enabled libjack &&
- require_pkg_config libjack jack jack/jack.h jack_port_get_latency_range
Added: head/multimedia/ffmpeg/files/patch-libavcodec_libsvt__vp9.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/ffmpeg/files/patch-libavcodec_libsvt__vp9.c Tue Jun 16 12:56:44 2020 (r539350)
@@ -0,0 +1,14 @@
+https://github.com/OpenVisualCloud/SVT-VP9/issues/116
+
+--- libavcodec/libsvt_vp9.c.orig 2020-06-15 18:54:23 UTC
++++ libavcodec/libsvt_vp9.c
+@@ -188,9 +188,6 @@ static int config_enc_params(EbSvtVp9EncConfiguration
+ param->min_qp_allowed = avctx->qmin;
+ }
+
+- param->intra_refresh_type =
+- !!(avctx->flags & AV_CODEC_FLAG_CLOSED_GOP) + 1;
+-
+ if (ten_bits) {
+ param->encoder_bit_depth = 10;
+ }
Modified: head/multimedia/ffmpeg/pkg-plist
==============================================================================
--- head/multimedia/ffmpeg/pkg-plist Tue Jun 16 12:55:33 2020 (r539349)
+++ head/multimedia/ffmpeg/pkg-plist Tue Jun 16 12:56:44 2020 (r539350)
@@ -6,12 +6,18 @@ include/libavcodec/adts_parser.h
include/libavcodec/avcodec.h
include/libavcodec/avdct.h
include/libavcodec/avfft.h
+include/libavcodec/bsf.h
+include/libavcodec/codec.h
+include/libavcodec/codec_desc.h
+include/libavcodec/codec_id.h
+include/libavcodec/codec_par.h
include/libavcodec/d3d11va.h
include/libavcodec/dirac.h
include/libavcodec/dv_profile.h
include/libavcodec/dxva2.h
include/libavcodec/jni.h
include/libavcodec/mediacodec.h
+include/libavcodec/packet.h
include/libavcodec/qsv.h
include/libavcodec/vaapi.h
include/libavcodec/vdpau.h
@@ -53,6 +59,7 @@ include/libavutil/crc.h
include/libavutil/des.h
include/libavutil/dict.h
include/libavutil/display.h
+include/libavutil/dovi_meta.h
include/libavutil/downmix_info.h
include/libavutil/encryption_info.h
include/libavutil/error.h
@@ -70,10 +77,12 @@ include/libavutil/hwcontext_d3d11va.h
include/libavutil/hwcontext_drm.h
include/libavutil/hwcontext_dxva2.h
include/libavutil/hwcontext_mediacodec.h
+include/libavutil/hwcontext_opencl.h
include/libavutil/hwcontext_qsv.h
include/libavutil/hwcontext_vaapi.h
include/libavutil/hwcontext_vdpau.h
include/libavutil/hwcontext_videotoolbox.h
+include/libavutil/hwcontext_vulkan.h
include/libavutil/imgutils.h
include/libavutil/intfloat.h
include/libavutil/intreadwrite.h
@@ -111,6 +120,7 @@ include/libavutil/tree.h
include/libavutil/twofish.h
include/libavutil/tx.h
include/libavutil/version.h
+include/libavutil/video_enc_params.h
include/libavutil/xtea.h
include/libpostproc/postprocess.h
include/libpostproc/version.h
@@ -121,19 +131,19 @@ include/libswscale/version.h
lib/libavcodec.a
lib/libavcodec.so
lib/libavcodec.so.58
-lib/libavcodec.so.58.54.100
+lib/libavcodec.so.58.91.100
lib/libavdevice.a
lib/libavdevice.so
lib/libavdevice.so.58
-lib/libavdevice.so.58.8.100
+lib/libavdevice.so.58.10.100
lib/libavfilter.a
lib/libavfilter.so
lib/libavfilter.so.7
-lib/libavfilter.so.7.57.100
+lib/libavfilter.so.7.85.100
lib/libavformat.a
lib/libavformat.so
lib/libavformat.so.58
-lib/libavformat.so.58.29.100
+lib/libavformat.so.58.45.100
lib/libavresample.a
lib/libavresample.so
lib/libavresample.so.4
@@ -141,19 +151,19 @@ lib/libavresample.so.4.0.0
lib/libavutil.a
lib/libavutil.so
lib/libavutil.so.56
-lib/libavutil.so.56.31.100
+lib/libavutil.so.56.51.100
lib/libpostproc.a
lib/libpostproc.so
lib/libpostproc.so.55
-lib/libpostproc.so.55.5.100
+lib/libpostproc.so.55.7.100
lib/libswresample.a
lib/libswresample.so
lib/libswresample.so.3
-lib/libswresample.so.3.5.100
+lib/libswresample.so.3.7.100
lib/libswscale.a
lib/libswscale.so
lib/libswscale.so.5
-lib/libswscale.so.5.5.100
+lib/libswscale.so.5.7.100
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavdevice.pc
libdata/pkgconfig/libavfilter.pc
@@ -187,7 +197,7 @@ man/man3/libswresample.3.gz
man/man3/libswscale.3.gz
%%DATADIR%%/examples/Makefile
%%DATADIR%%/examples/README
-%%DATADIR%%/examples/avio_dir_cmd.c
+%%DATADIR%%/examples/avio_list_dir.c
%%DATADIR%%/examples/avio_reading.c
%%DATADIR%%/examples/decode_audio.c
%%DATADIR%%/examples/decode_video.c
More information about the svn-ports-all
mailing list