CVS commit: pkgsrc/multimedia/mpv

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 30 06:38:45 UTC 2018

Modified Files:
        pkgsrc/multimedia/mpv: Makefile distinfo
        pkgsrc/multimedia/mpv/patches: patch-player_main.c

Log Message:
mpv: update to 0.28.2.

0.28.2

This release contains an additional fix for CVE-2018-6360.

Fixes and Minor Enhancements

    ytdl_hook: whitelist subtitle URLs as well (#5456)

0.28.1

This release fixes CVE-2018-6360.

Fixes and Minor Enhancements

    ytdl_hook: whitelist protocols from urls retrieved from youtube-dl (#5456)

0.28.0

This release needs recent FFmpeg (newer than 3.4) due to major refactoring.
Required library versions:

    libavutil >= 56.6.100
    libavcodec >= 58.7.100
    libavformat >= 58.0.102
    libswscale >= 5.0.101
    libavfilter >= 7.0.101
    libswresample >= 3.0.100

The LGPL 2.1+ relicensing process is now mostly complete. The remaining GPL-only
code (see Copyright file) can be disabled at build time by using --enable-lgpl.

Features

Added

    Add DRM_PRIME Format Handling and Display for RockChip MPP decoders
    csputils: Add support for Display P3 primaries
    demux: support multiple seekable cached ranges, display cache ranges on OSC
    demux_playlist: support .url files (#5107)
    dvb: Add multiple frontends support (up to 8)
    dvb: implement parsing of modulation for VDR-style channels config
    hwdec: add mediacodec hardware decoder for IMGFMT_MEDIACODEC frames,
    rename mediacodec to mediacodec-copy
    lua: integrate stats.lua script (bound to i/I by default)
    vd_lavc: add support for nvdec hwaccel
    vo_gpu: add android opengl backend
    vo_gpu: initial d3d11 support
    vo_gpu: vulkan support

Removed

    af: remove deprecated audio filters (channels, equalizer, pan, volume;
    replacements in lavfi)
    vf: remove most GPL video filters (crop, dsize, expand, flip, gradfun, mirror,
    noformat, pullup, rotate, scale, stereo3d, yadif; replacements in lavfi)
    vf_buffer: remove this filter
    video: remove automatic stereo3d filter insertion
    vo_gpu: remove hwdec_vaglx interop
    vo_opengl: refactor into vo_gpu
    vo_wayland: remove

Options and Commands

Added

    demux: add option to create CC tracks eagerly (--sub-create-cc-track)
    options: add --start=none to reset previously set start time
    options: add --vlang switch

Changed

    cache: lower default size to 2*10MB
    demux: bump the demuxer cache readahead duration to 10 hours
    demux: use seekable cache for network by default, bump prefetch limit
    msg: make --msg-level affect --log-file too
    player/misc.c: allow both --length and --end to control play endpoint
    player: match subtitles with language tags with --sub-auto=exact
    rename --opengl-hwdec-interop to --gpu-hwdec-interop (now mostly useless)
    vd_lavc: prefer nvdec over vdpau with --hwdec=auto (better codec and surface
    format support)
    vd_lavc: rename --hwdec=rpi to --hwdec=mmal

Removed

    options: remove --heartbeat-cmd and --heartbeat-interval
    (incidentally fixes #4888)

Fixes and Minor Enhancements

    TOOLS/autoload.lua: add ogm, ogg and opus extensions
    Use /dev/tty instead of stdin for terminal input (#4190)
    audio: add audio softvol processing to AO (replaces previously GPL’d code)
    audio: fix channel conversion with NA channels (e.g. with ALSA)
    audio: fix missing volume update on init and reinit
    csputils: Fix DCI P3 primaries white point
    demux: don't allow subtitles to mess up buffered time display
    demux: fix .cue files with audio files that contain attached pictures
    demux: fix accounting for seekable ranges on track switches (fixes missing
    audio when cycling through audio tracks with e.g. EDL, --merge-files, ordered
    chapters and youtube-dl pseudo DASH)
    demux: fix crash with cue/ordered chapter files (#5027)
    demux: speed up cache seeking with a coarse index
    demux_lavf: always give libavformat the filename when probing
    (helps with mp3 files)
    demux_mkv: add V_SNOW tag to mkv_video_tags
    dvb: Fix long channel switching: next/prev channel
    dvb: fixes for ATSC tuning
    lavc_conv: clamp timestamps to positive (#5047)
    macOS: fix bundle on macOS High Sierra (10.13) (#4926, #4866)
    mp_image: always copy color attributes on hw download (#4804)
    mp_image: select an explicit fallback for chroma location (#4804)
    msg: bump log level of --log-file to -v -v
    msg: reinterpret a bunch of message levels
    osc: fix rare stack overflow when changing visibility mode
    osdep/io: add android-related bullshit to fix files >2 GiB
    player/playloop.c: respect playback start time when using --loop-file
    player: allow seeking in cached parts of unseekable streams
    player: make track language matching case insensitive (#5272)
    player: use start timestamp for ab-looping if --ab-loop-a is absent
    player: when loading external file, always add all track types (#5132)
    restore-old-bindings.conf: add old macOS/Wayland AXIS bindings
    screenshot: create directories from template
    scripting: report dlerror() output
    sd_ass: accept RFC8081 font media types
    sd_ass: accept otc as fallback OpenType collection file extension
    stream_libarchive: work around various types of locale braindeath
    (https://git.io/vbiFJ)
    subprocess-win: don't change the mouse cursor when creating processes
    video: add a hack to avoid missing subtitles with vf_sub (#5194)
    video: fix alpha handling (#4983)
    video: fix memory leaks (roughly 1 KB per decoded frame) with hwdec copy modes
    video: fix rotation and deinterlace auto filters
    video: properly pass through ICC data
    vo: add support for externally driven renderloop and make wayland use it
    (partially fixes display-sync under wayland; disables rendering when window
    is invisible)
    vo_gpu: change --tone-mapping-desaturate algorithm
    vo_gpu: enable 3DLUTs in dumb mode
    vo_gpu: fix gamma scale
    vo_gpu: fix mobius tone mapping compatibility to GLSL 120 (#5069)
    vo_gpu: fix video sometimes not being rerendered on equalizer change
    vo_gpu: kill off FBOTEX_FUZZY (#1814)
    vo_gpu: opengl: fix possible screenshot window crash (#4905)
    vo_gpu: opengl: use GLX_MESA_swap_control where available
    vo_gpu: reduce the --alpha=blend-tiles checkerboard intensity
    vo_gpu: win: remove exclusive-fullscreen detection hack
    vo_lavc: remove messy delayed subtitle rendering logic (#4689)
    wayland_common: implement output tracking, many cleanups and bugfixes
    Windows: skip window snapping if Windows handled it
    Windows: add more-POSIXy versions of open() and fstat() (#4711)
    ytdl_hook: don't prepend ytdl:// to non-youtube links in playlists (#5003)


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/mpv/patches/patch-player_main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.68 pkgsrc/multimedia/mpv/Makefile:1.69
--- pkgsrc/multimedia/mpv/Makefile:1.68 Mon Mar 12 11:17:14 2018
+++ pkgsrc/multimedia/mpv/Makefile      Mon Apr 30 06:38:45 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2018/03/12 11:17:14 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2018/04/30 06:38:45 wiz Exp $
 
-DISTNAME=      mpv-0.27.2
-PKGREVISION=   2
+DISTNAME=      mpv-0.28.2
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -68,8 +67,7 @@ post-install:
 .include "../../lang/python/application.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ffmpeg3+=        ffmpeg3>=3.2.2
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.40 pkgsrc/multimedia/mpv/distinfo:1.41
--- pkgsrc/multimedia/mpv/distinfo:1.40 Wed Feb 14 11:41:00 2018
+++ pkgsrc/multimedia/mpv/distinfo      Mon Apr 30 06:38:45 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2018/02/14 11:41:00 leot Exp $
+$NetBSD: distinfo,v 1.41 2018/04/30 06:38:45 wiz Exp $
 
-SHA1 (mpv-0.27.2.tar.gz) = 764e23136ccec9dc8743f2c63b3d5fbd8a1bf427
-RMD160 (mpv-0.27.2.tar.gz) = f2bc9cf541e0bb4e759f7c3117a4cf1979cf241f
-SHA512 (mpv-0.27.2.tar.gz) = bf74a150b3732b8c233362e0902c54f85fbea9ca1765a2a8f946a6eecd9b37a72ede36a36d0dd98a770539c4f81fe24c8ce26be9db7cd6eddd8514a8f82d9cda
-Size (mpv-0.27.2.tar.gz) = 2957191 bytes
+SHA1 (mpv-0.28.2.tar.gz) = 2dfc6a68ee5d99ff510e417d60ff939ddf9ec08f
+RMD160 (mpv-0.28.2.tar.gz) = 8ad00efb3ee42880ea390f518c69c474059c4bf0
+SHA512 (mpv-0.28.2.tar.gz) = e6206e8c65dca084e2cfa73ab09278b7113cdfd90b89877d1f75a1068c6379a093ea3955a023857357683edce1aba8c12ee441fd195d887af4d939fc7b66cef4
+Size (mpv-0.28.2.tar.gz) = 2982558 bytes
 SHA1 (patch-audio_out_ao__oss.c) = d7f3a75ab43efe396ce536fb54e6207a7ded3510
-SHA1 (patch-player_main.c) = 842432e448526a9d170e7efd2b01276e36072e16
+SHA1 (patch-player_main.c) = 4076e8757a2b0005a0995ef146ed7aa361ebb93f

Index: pkgsrc/multimedia/mpv/patches/patch-player_main.c
diff -u pkgsrc/multimedia/mpv/patches/patch-player_main.c:1.2 pkgsrc/multimedia/mpv/patches/patch-player_main.c:1.3
--- pkgsrc/multimedia/mpv/patches/patch-player_main.c:1.2       Fri Mar 10 15:55:33 2017
+++ pkgsrc/multimedia/mpv/patches/patch-player_main.c   Mon Apr 30 06:38:45 2018
@@ -1,13 +1,13 @@
-$NetBSD: patch-player_main.c,v 1.2 2017/03/10 15:55:33 nat Exp $
+$NetBSD: patch-player_main.c,v 1.3 2018/04/30 06:38:45 wiz Exp $
 
 Avoid to check mismatched built vs running libraries version.
 The use in pkgsrc can be considered a legitimate one.
 
---- player/main.c.orig 2017-02-12 01:31:16.000000000 +0000
+--- player/main.c.orig 2018-02-13 02:07:05.000000000 +0000
 +++ player/main.c
-@@ -438,18 +438,6 @@ int mp_initialize(struct MPContext *mpct
- 
-     handle_deprecated_options(mpctx);
+@@ -428,18 +428,6 @@ int mp_initialize(struct MPContext *mpct
+     if (handle_help_options(mpctx))
+         return -2;
  
 -    if (!print_libav_versions(mp_null_log, 0)) {
 -        // Using mismatched libraries can be legitimate, but even then it's