Received: by mail.netbsd.org (Postfix, from userid 605) id D47EB84D96; Tue, 16 Jun 2020 16:54:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5E8C084D91 for ; Tue, 16 Jun 2020 16:54:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id hM9yZoJBbLVA for ; Tue, 16 Jun 2020 16:54:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id ACCA184D78 for ; Tue, 16 Jun 2020 16:54:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A9E83FB28; Tue, 16 Jun 2020 16:54:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1592326485227940" MIME-Version: 1.0 Date: Tue, 16 Jun 2020 16:54:45 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/multimedia To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20200616165445.A9E83FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1592326485227940 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue Jun 16 16:54:45 UTC 2020 Modified Files: pkgsrc/multimedia/ffmpeg4: Makefile Makefile.common PLIST distinfo pkgsrc/multimedia/ffmpeg4/patches: patch-configure pkgsrc/multimedia/ffplay4: Makefile Log Message: ffmpeg: updated to 4.3 version 4.3: - v360 filter - Intel QSV-accelerated MJPEG decoding - Intel QSV-accelerated VP9 decoding - Support for TrueHD in mp4 - Support AMD AMF encoder on Linux (via Vulkan) - IMM5 video decoder - ZeroMQ protocol - support Sipro ACELP.KELVIN decoding - streamhash muxer - sierpinski video source - scroll video filter - photosensitivity filter - anlms filter - arnndn filter - bilateral filter - maskedmin and maskedmax filters - VDPAU VP9 hwaccel - median filter - QSV-accelerated VP9 encoding - AV1 encoding support via librav1e - AV1 frame merge bitstream filter - AV1 Annex B demuxer - axcorrelate filter - mvdv decoder - mvha decoder - MPEG-H 3D Audio support in mp4 - thistogram filter - freezeframes filter - Argonaut Games ADPCM decoder - Argonaut Games ASF demuxer - xfade video filter - xfade_opencl filter - afirsrc audio filter source - pad_opencl filter - Simon & Schuster Interactive ADPCM decoder - Real War KVAG demuxer - CDToons video decoder - siren audio decoder - Rayman 2 ADPCM decoder - Rayman 2 APM demuxer - cas video filter - High Voltage Software ADPCM decoder - LEGO Racers ALP (.tun & .pcm) demuxer - AMQP 0-9-1 protocol (RabbitMQ) - Vulkan support - avgblur_vulkan, overlay_vulkan, scale_vulkan and chromaber_vulkan filters - ADPCM IMA MTF decoder - FWSE demuxer - DERF DPCM decoder - DERF demuxer - CRI HCA decoder - CRI HCA demuxer - overlay_cuda filter - switch from AvxSynth to AviSynth+ on Linux - mv30 decoder - Expanded styling support for 3GPP Timed Text Subtitles (movtext) - WebP parser - tmedian filter - maskedthreshold filter - Support for muxing pcm and pgs in m2ts - Cunning Developments ADPCM decoder - asubboost filter - Pro Pinball Series Soundbank demuxer - pcm_rechunk bitstream filter - scdet filter - NotchLC decoder - gradients source video filter - MediaFoundation encoder wrapper - untile filter - Simon & Schuster Interactive ADPCM encoder - PFM decoder - dblur video filter - Real War KVAG muxer To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg4/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/multimedia/ffmpeg4/Makefile.common cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg4/PLIST cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/ffmpeg4/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg4/patches/patch-configure cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ffplay4/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1592326485227940 Content-Disposition: inline Content-Length: 11260 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/ffmpeg4/Makefile diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.30 pkgsrc/multimedia/ffmpeg4/Makefile:1.31 --- pkgsrc/multimedia/ffmpeg4/Makefile:1.30 Fri Jun 5 12:49:12 2020 +++ pkgsrc/multimedia/ffmpeg4/Makefile Tue Jun 16 16:54:45 2020 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.30 2020/06/05 12:49:12 jperkin Exp $ +# $NetBSD: Makefile,v 1.31 2020/06/16 16:54:45 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/} -PKGREVISION= 2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://ffmpeg.org/ COMMENT= Decoding, encoding and streaming software (v4.x) Index: pkgsrc/multimedia/ffmpeg4/Makefile.common diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.19 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.20 --- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.19 Sun May 31 07:42:13 2020 +++ pkgsrc/multimedia/ffmpeg4/Makefile.common Tue Jun 16 16:54:45 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.19 2020/05/31 07:42:13 rillig Exp $ +# $NetBSD: Makefile.common,v 1.20 2020/06/16 16:54:45 adam Exp $ # used by multimedia/ffmpeg4/Makefile # used by multimedia/ffplay4/Makefile -DISTNAME= ffmpeg-4.2.3 +DISTNAME= ffmpeg-4.3 CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/multimedia/ffmpeg4/PLIST diff -u pkgsrc/multimedia/ffmpeg4/PLIST:1.5 pkgsrc/multimedia/ffmpeg4/PLIST:1.6 --- pkgsrc/multimedia/ffmpeg4/PLIST:1.5 Sat Mar 21 18:47:33 2020 +++ pkgsrc/multimedia/ffmpeg4/PLIST Tue Jun 16 16:54:45 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2020/03/21 18:47:33 gutteridge Exp $ +@comment $NetBSD: PLIST,v 1.6 2020/06/16 16:54:45 adam Exp $ bin/ffmpeg4 bin/ffprobe4 include/ffmpeg4/libavcodec/ac3_parser.h @@ -6,12 +6,18 @@ include/ffmpeg4/libavcodec/adts_parser.h include/ffmpeg4/libavcodec/avcodec.h include/ffmpeg4/libavcodec/avdct.h include/ffmpeg4/libavcodec/avfft.h +include/ffmpeg4/libavcodec/bsf.h +include/ffmpeg4/libavcodec/codec.h +include/ffmpeg4/libavcodec/codec_desc.h +include/ffmpeg4/libavcodec/codec_id.h +include/ffmpeg4/libavcodec/codec_par.h include/ffmpeg4/libavcodec/d3d11va.h include/ffmpeg4/libavcodec/dirac.h include/ffmpeg4/libavcodec/dv_profile.h include/ffmpeg4/libavcodec/dxva2.h include/ffmpeg4/libavcodec/jni.h include/ffmpeg4/libavcodec/mediacodec.h +include/ffmpeg4/libavcodec/packet.h include/ffmpeg4/libavcodec/qsv.h include/ffmpeg4/libavcodec/vaapi.h include/ffmpeg4/libavcodec/vdpau.h @@ -53,6 +59,7 @@ include/ffmpeg4/libavutil/crc.h include/ffmpeg4/libavutil/des.h include/ffmpeg4/libavutil/dict.h include/ffmpeg4/libavutil/display.h +include/ffmpeg4/libavutil/dovi_meta.h include/ffmpeg4/libavutil/downmix_info.h include/ffmpeg4/libavutil/encryption_info.h include/ffmpeg4/libavutil/error.h @@ -70,10 +77,12 @@ include/ffmpeg4/libavutil/hwcontext_d3d1 include/ffmpeg4/libavutil/hwcontext_drm.h include/ffmpeg4/libavutil/hwcontext_dxva2.h include/ffmpeg4/libavutil/hwcontext_mediacodec.h +include/ffmpeg4/libavutil/hwcontext_opencl.h include/ffmpeg4/libavutil/hwcontext_qsv.h include/ffmpeg4/libavutil/hwcontext_vaapi.h include/ffmpeg4/libavutil/hwcontext_vdpau.h include/ffmpeg4/libavutil/hwcontext_videotoolbox.h +include/ffmpeg4/libavutil/hwcontext_vulkan.h include/ffmpeg4/libavutil/imgutils.h include/ffmpeg4/libavutil/intfloat.h include/ffmpeg4/libavutil/intreadwrite.h @@ -111,6 +120,7 @@ include/ffmpeg4/libavutil/tree.h include/ffmpeg4/libavutil/twofish.h include/ffmpeg4/libavutil/tx.h include/ffmpeg4/libavutil/version.h +include/ffmpeg4/libavutil/video_enc_params.h include/ffmpeg4/libavutil/xtea.h include/ffmpeg4/libpostproc/postprocess.h include/ffmpeg4/libpostproc/version.h @@ -121,19 +131,19 @@ include/ffmpeg4/libswscale/version.h lib/ffmpeg4/libavcodec.a lib/ffmpeg4/libavcodec.so lib/ffmpeg4/libavcodec.so.58 -lib/ffmpeg4/libavcodec.so.58.54.100 +lib/ffmpeg4/libavcodec.so.58.91.100 lib/ffmpeg4/libavdevice.a lib/ffmpeg4/libavdevice.so lib/ffmpeg4/libavdevice.so.58 -lib/ffmpeg4/libavdevice.so.58.8.100 +lib/ffmpeg4/libavdevice.so.58.10.100 lib/ffmpeg4/libavfilter.a lib/ffmpeg4/libavfilter.so lib/ffmpeg4/libavfilter.so.7 -lib/ffmpeg4/libavfilter.so.7.57.100 +lib/ffmpeg4/libavfilter.so.7.85.100 lib/ffmpeg4/libavformat.a lib/ffmpeg4/libavformat.so lib/ffmpeg4/libavformat.so.58 -lib/ffmpeg4/libavformat.so.58.29.100 +lib/ffmpeg4/libavformat.so.58.45.100 lib/ffmpeg4/libavresample.a lib/ffmpeg4/libavresample.so lib/ffmpeg4/libavresample.so.4 @@ -141,19 +151,19 @@ lib/ffmpeg4/libavresample.so.4.0.0 lib/ffmpeg4/libavutil.a lib/ffmpeg4/libavutil.so lib/ffmpeg4/libavutil.so.56 -lib/ffmpeg4/libavutil.so.56.31.100 +lib/ffmpeg4/libavutil.so.56.51.100 lib/ffmpeg4/libpostproc.a lib/ffmpeg4/libpostproc.so lib/ffmpeg4/libpostproc.so.55 -lib/ffmpeg4/libpostproc.so.55.5.100 +lib/ffmpeg4/libpostproc.so.55.7.100 lib/ffmpeg4/libswresample.a lib/ffmpeg4/libswresample.so lib/ffmpeg4/libswresample.so.3 -lib/ffmpeg4/libswresample.so.3.5.100 +lib/ffmpeg4/libswresample.so.3.7.100 lib/ffmpeg4/libswscale.a lib/ffmpeg4/libswscale.so lib/ffmpeg4/libswscale.so.5 -lib/ffmpeg4/libswscale.so.5.5.100 +lib/ffmpeg4/libswscale.so.5.7.100 lib/ffmpeg4/pkgconfig/libavcodec.pc lib/ffmpeg4/pkgconfig/libavdevice.pc lib/ffmpeg4/pkgconfig/libavfilter.pc @@ -229,7 +239,7 @@ share/doc/ffmpeg4/undefined.txt share/doc/ffmpeg4/writing_filters.txt share/ffmpeg4/examples/Makefile share/ffmpeg4/examples/README -share/ffmpeg4/examples/avio_dir_cmd.c +share/ffmpeg4/examples/avio_list_dir.c share/ffmpeg4/examples/avio_reading.c share/ffmpeg4/examples/decode_audio.c share/ffmpeg4/examples/decode_video.c Index: pkgsrc/multimedia/ffmpeg4/distinfo diff -u pkgsrc/multimedia/ffmpeg4/distinfo:1.15 pkgsrc/multimedia/ffmpeg4/distinfo:1.16 --- pkgsrc/multimedia/ffmpeg4/distinfo:1.15 Fri May 22 07:59:29 2020 +++ pkgsrc/multimedia/ffmpeg4/distinfo Tue Jun 16 16:54:45 2020 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.15 2020/05/22 07:59:29 adam Exp $ +$NetBSD: distinfo,v 1.16 2020/06/16 16:54:45 adam Exp $ -SHA1 (ffmpeg-4.2.3.tar.xz) = 22b6bdad5a641a9269beaf77173f9e278afba699 -RMD160 (ffmpeg-4.2.3.tar.xz) = a59b9f88a0b3c2e3a343c1d3a821c7bd41970f28 -SHA512 (ffmpeg-4.2.3.tar.xz) = a9bad00e452ec706a0dd955e30babaf964d13160a478da0ce5b330cd0660bd8caec3d17fd28ea2b9b05711096e950e45f90f316249c7a00cd09b1d9004992a1e -Size (ffmpeg-4.2.3.tar.xz) = 9101192 bytes +SHA1 (ffmpeg-4.3.tar.xz) = dd618212469347feb5deb8934023ef6e1ae5f533 +RMD160 (ffmpeg-4.3.tar.xz) = 8e5d102b55e2f8b1c4da585eb9d003ab03e5e30e +SHA512 (ffmpeg-4.3.tar.xz) = f031eb6c4423887af323ab7d1f431234d4e30993a52db45dccf427b41eb442a3bd020dcbc13e83cbf813fad0f36c849cb651203570148387c864507aa19f313a +Size (ffmpeg-4.3.tar.xz) = 9378360 bytes SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6 -SHA1 (patch-configure) = 4c4290dacc0fb19b6001f1a5778580bb76dd0e60 +SHA1 (patch-configure) = a19bf381ed6e559c74714e48fdb5592b1420b1cc SHA1 (patch-doc_Makefile) = 3b86307323fa565f9ad19c5bcb6ea71d323062fc SHA1 (patch-doc_general.texi) = 4fd158cb76a6a9fec24d3dae5edb32c0531153a2 SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c Index: pkgsrc/multimedia/ffmpeg4/patches/patch-configure diff -u pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.4 pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.5 --- pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.4 Fri Mar 20 21:19:54 2020 +++ pkgsrc/multimedia/ffmpeg4/patches/patch-configure Tue Jun 16 16:54:45 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.4 2020/03/20 21:19:54 nia Exp $ +$NetBSD: patch-configure,v 1.5 2020/06/16 16:54:45 adam Exp $ Sun audio support. @@ -7,9 +7,9 @@ Do not use 'rsync'. Portability fixes. ---- configure.orig 2020-03-20 20:53:47.977808652 +0000 +--- configure.orig 2020-06-15 18:54:23.000000000 +0000 +++ configure -@@ -2119,6 +2119,7 @@ HEADERS_LIST=" +@@ -2131,6 +2131,7 @@ HEADERS_LIST=" sys_resource_h sys_select_h sys_soundcard_h @@ -17,7 +17,7 @@ Portability fixes. sys_time_h sys_un_h sys_videoio_h -@@ -2257,7 +2258,6 @@ TOOLCHAIN_FEATURES=" +@@ -2272,7 +2273,6 @@ TOOLCHAIN_FEATURES=" inline_asm_labels inline_asm_nonlocal_labels pragma_deprecated @@ -25,7 +25,7 @@ Portability fixes. symver_asm_label symver_gnu_asm vfp_args -@@ -3336,6 +3336,8 @@ opengl_outdev_deps="opengl" +@@ -3394,6 +3394,8 @@ opengl_outdev_deps="opengl" opengl_outdev_suggest="sdl2" oss_indev_deps_any="sys_soundcard_h" oss_outdev_deps_any="sys_soundcard_h" @@ -34,7 +34,7 @@ Portability fixes. pulse_indev_deps="libpulse" pulse_outdev_deps="libpulse" sdl2_outdev_deps="sdl2" -@@ -4950,9 +4952,9 @@ elif enabled mips; then +@@ -5033,9 +5035,9 @@ elif enabled mips; then disable mipsdsp disable mipsdspr2 # When gcc version less than 5.3.0, add -fno-expensive-optimizations flag. @@ -46,7 +46,7 @@ Portability fixes. expensive_optimization_flag="" else expensive_optimization_flag="-fno-expensive-optimizations" -@@ -5247,6 +5249,7 @@ case $target_os in +@@ -5330,6 +5332,7 @@ case $target_os in ;; netbsd) disable symver @@ -54,7 +54,7 @@ Portability fixes. oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" enabled gcc || check_ldflags -Wl,-zmuldefs -@@ -5639,10 +5642,13 @@ done +@@ -5728,10 +5731,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,19 +71,19 @@ Portability fixes. check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }" -@@ -6021,6 +6027,7 @@ check_headers libcrystalhd/libcrystalhd_ - check_headers malloc.h +@@ -6114,6 +6120,7 @@ check_headers malloc.h + check_headers mftransform.h check_headers net/udplite.h check_headers poll.h +check_headers sys/audioio.h check_headers sys/param.h check_headers sys/resource.h check_headers sys/select.h -@@ -6427,7 +6434,6 @@ enabled makeinfo \ +@@ -6537,7 +6544,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 -rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout # check V4L2 codecs available in the API - check_headers linux/fb.h + if enabled v4l2_m2m; then Index: pkgsrc/multimedia/ffplay4/Makefile diff -u pkgsrc/multimedia/ffplay4/Makefile:1.10 pkgsrc/multimedia/ffplay4/Makefile:1.11 --- pkgsrc/multimedia/ffplay4/Makefile:1.10 Tue Jun 2 08:24:24 2020 +++ pkgsrc/multimedia/ffplay4/Makefile Tue Jun 16 16:54:45 2020 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2020/06/02 08:24:24 adam Exp $ +# $NetBSD: Makefile,v 1.11 2020/06/16 16:54:45 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffplay4/} -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://ffmpeg.org/ COMMENT= Simple SDL frontend for FFmpeg --_----------=_1592326485227940--