Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1532528356130470"
MIME-Version: 1.0
Date: Wed, 25 Jul 2018 14:19:16 +0000
From: "Leonardo Taccari" <leot@netbsd.org>
Subject: CVS commit: pkgsrc/multimedia/mpv
To: pkgsrc-changes@NetBSD.org
Reply-To: leot@netbsd.org
Message-Id: <20180725141916.69622FBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1532528356130470
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	leot
Date:		Wed Jul 25 14:19:16 UTC 2018

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

Log Message:
mpv: Update multimedia/mpv to 0.29.0

pkgsrc changes:
 - Drop sdl option, SDL1 is no longer supported by mpv (was used only for
   audio)

Changes:
0.29.0
======
This release requires FFmpeg 4.0 or newer.

Features
--------
Added
~~~~~
- ao/openal: Add better sample format and channel layout selection
- ao/openal: Add support for direct channels output
- cocoa-cb: initial implementation via opengl-cb API
- context_drm_egl: Introduce 30bpp support (requires Mesa 18.0.0_rc4 or later)
- osx: add some more menu bar items as suggested by Apples's HIG
- vo_gpu: make screenshots use the GL renderer (#5498, #5240)
- x11: support Shift+TAB as an input key bind (#5849)
- ytdl_hook: support native dash demuxer, if present

Changed
~~~~~~~
- ao_alsa, ao_pulse: reduce requested buffer size
- audio: change format negotiation, remove channel remix fudging
- client API: deprecate opengl-cb API and introduce a replacement API
- demux: lower demuxer cache default sizes from 400MB/400MB to 50MB/150MB
- osx: always deactivate the early opengl flush on macOS
- scripting: change when/how player waits for scripts being loaded
- vo_gpu: various improvements to HDR peak detection
- vo_gpu: various improvements to HDR tone mapping
- wayland_common: update to stable xdg-shell
- ytdl_hook: parse youtube playlist urls to set start index if `--ytdl-raw-option=yes-playlist=` is specified

Deprecated
~~~~~~~~~~
- af_lavrresample: deprecate this filter

Removed
~~~~~~~
- build: drop support for SDL1 (only applied to ao_sdl)

Options and Commands
--------------------
Added
~~~~~
- add a number of --audio-resample-* options, which should from now on be used instead of --af-defaults=lavrresample:
- ao/openal: --openal-direct-channels
- command: add --osd-on-seek option defaulting to bar
- command: add a change-list command (#5435)
- options: add --http-proxy
- options: add a builtin low-latency profile
- vaapi: add option to select a non-default device path with --vaapi-device (#4320)
- video: add option to reduce latency by 1 or 2 frames
- vo_gpu: introduce --target-peak (#5521)

Changed
~~~~~~~
- command: change cycle-value command behavior (#5772)
- config: replace config dir lua-settings/ with dir script-opts/
- options: --lavfi-complex now requires uniquely named filter pads.
- options: --ytdl is now always enabled, even for libmpv
- options: make --deinterlace=yes always deinterlace (#5219)
- options: slightly improve filter help output for lavfi bridge
- vo: rename --vo=opengl-cb to --vo=libmpv

Deprecated
~~~~~~~~~~
- encoding: deprecate a bunch of obscure options (--ovoffset, --oaoffset, --ovfirst, --oafirst)
- options: deprecate --vf-defaults and --af-defaults
- osx: --gpu-context=cocoa with --gpu-api=opengl is now deprecated in favour of --vo=libmpv

Removed
~~~~~~~
- command: remove an old compatibility hack that allowed CLI aliases to be set as property, deprecated in 0.26.0
- input: remove legacy command handling for MPlayer commands that were deprecated in 2013
- options: drop --opensles-sample-rate, as --audio-samplerate should be used if desired
- options: drop deprecated --videotoolbox-format, --ff-aid, --ff-vid, --ff-sid, --ad-spdif-dtshd, --softvol options
- options: remove --video-stereo-mode
- options: remove deprecated ao/vo auto profiles
- options: remove the following encoding options: --ocopyts (now the default, old timestamp handling is gone), --oneverdrop (now default), --oharddup (you need to use --vf=fps=VALUE), --ofps, --oautofps, --omaxfps

Fixes and Minor Enhancements
----------------------------
- HIDRemote: fix volume buttons on macOS 10.13 (#5721)
- TOOLS/autoload: Fix broken "disabled" option
- TOOLS/autoload: be more robust with slow directory listings (#5618)
- ao_sdl: fix default buffer size
- build: add static libraries to libmpv.pc
- build: bump waf to 2.0.9 (fixes Python 3.7 compatibility)
- build: manually add standard library search paths for linking (#5791)
- common: round all integer times to milliseconds
- demux, player: fix playback of sparse video streams (w/ still images)
- demux: support for some kinds of timed metadata (e.g. ICY)
- demux_mkv: add V_AV1 identifier for AV1
- demux_mkv: support Meridian Lossless Packing in Matroska (#5923)
- display additional metadata tags during video playback
- drm_atomic: Fix memory leaks in drm_atomic_create
- enable cache for FUSE filesystems on OpenBSD and FreeBSD
- gpu: prefer 16bit floating point FBO formats to 16bit integer ones
- hwdec_vaegl: Fix VAAPI EGL interop used with gpu-context=drm
- input.conf: use exact value for [ binding, which does the inverse of ]
- input: add a keybinding to toggle hardware decoding
- input: minor additions to default key bindings (#973)
- osc: fix accidentally skipping files when seeking with slider
- player: fix strange behavior on edition switching
- player: fix track autoselection of external files yet again
- terminal-unix: stop trying to read when terminal disappears (#5842)
- video: actually wait for last frame being rendered on EOF
- video: fix --video-rotate in some cases
- video: fix crash with vdpau when reinitializing rendering (#5447)
- vo_gpu: fix anamorphic screenshots (#5619)
- vo_vdpau: fix resizing and rotation problems


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/mpv/options.mk
cvs rdiff -u -r1.3 -r1.4 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.


--_----------=_1532528356130470
Content-Disposition: inline
Content-Length: 5161
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.70 pkgsrc/multimedia/mpv/Makefile:1.71
--- pkgsrc/multimedia/mpv/Makefile:1.70	Fri Jul  6 15:06:48 2018
+++ pkgsrc/multimedia/mpv/Makefile	Wed Jul 25 14:19:16 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2018/07/06 15:06:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.71 2018/07/25 14:19:16 leot Exp $
 
-DISTNAME=	mpv-0.28.2
-PKGREVISION=	1
+DISTNAME=	mpv-0.29.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -18,7 +17,7 @@ NOT_PAX_MPROTECT_SAFE+=	bin/mpv
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 # ${WRKSRC}/bootstrap.py mentions needed version
-BUILD_DEPENDS+=	waf>=1.8.12:../../devel/waf
+BUILD_DEPENDS+=	waf>=2.0.9:../../devel/waf
 
 WAF_CONFIGURE_ARGS+=	--bindir=${PREFIX}/bin
 WAF_CONFIGURE_ARGS+=	--enable-dvdnav

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.41 pkgsrc/multimedia/mpv/distinfo:1.42
--- pkgsrc/multimedia/mpv/distinfo:1.41	Mon Apr 30 06:38:45 2018
+++ pkgsrc/multimedia/mpv/distinfo	Wed Jul 25 14:19:16 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.41 2018/04/30 06:38:45 wiz Exp $
+$NetBSD: distinfo,v 1.42 2018/07/25 14:19:16 leot Exp $
 
-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 (mpv-0.29.0.tar.gz) = b890b726a39a67ef8d7c278f28531be375eaf7e8
+RMD160 (mpv-0.29.0.tar.gz) = 6d09e4d9696864d6bf0cbfd76674a15e1b17c537
+SHA512 (mpv-0.29.0.tar.gz) = 77204218bd217ae1da4812b09e0509965a3ef102d3de5cd4360f007ccf3779e4cbde5cfd6adae9629ea39062bd365e847429bdf7f9a1ddebd0a67d267492b221
+Size (mpv-0.29.0.tar.gz) = 3057997 bytes
 SHA1 (patch-audio_out_ao__oss.c) = d7f3a75ab43efe396ce536fb54e6207a7ded3510
-SHA1 (patch-player_main.c) = 4076e8757a2b0005a0995ef146ed7aa361ebb93f
+SHA1 (patch-player_main.c) = e794199990059cc95050032194bca70557c381d7

Index: pkgsrc/multimedia/mpv/options.mk
diff -u pkgsrc/multimedia/mpv/options.mk:1.14 pkgsrc/multimedia/mpv/options.mk:1.15
--- pkgsrc/multimedia/mpv/options.mk:1.14	Sun Jul 16 12:06:25 2017
+++ pkgsrc/multimedia/mpv/options.mk	Wed Jul 25 14:19:16 2018
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.14 2017/07/16 12:06:25 leot Exp $
+# $NetBSD: options.mk,v 1.15 2018/07/25 14:19:16 leot Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mpv
 
 .include "../../multimedia/libva/available.mk"
 .include "../../multimedia/libvdpau/available.mk"
 
-PKG_SUPPORTED_OPTIONS=	ass caca lua pulseaudio rpi sdl sdl2 v4l2
+PKG_SUPPORTED_OPTIONS=	ass caca lua pulseaudio rpi sdl2 v4l2
 PKG_SUGGESTED_OPTIONS=	ass lua pulseaudio
 
 .if ${VAAPI_AVAILABLE} == "yes"
@@ -62,16 +62,6 @@ WAF_CONFIGURE_ARGS+=	--disable-sdl2
 .endif
 
 ###
-### SDL support (audio output)
-###
-.if !empty(PKG_OPTIONS:Msdl)
-WAF_CONFIGURE_ARGS+=	--enable-sdl1
-.include "../../devel/SDL/buildlink3.mk"
-.else
-WAF_CONFIGURE_ARGS+=	--disable-sdl1
-.endif
-
-###
 ### libASS support
 ###
 .if !empty(PKG_OPTIONS:Mass)

Index: pkgsrc/multimedia/mpv/patches/patch-player_main.c
diff -u pkgsrc/multimedia/mpv/patches/patch-player_main.c:1.3 pkgsrc/multimedia/mpv/patches/patch-player_main.c:1.4
--- pkgsrc/multimedia/mpv/patches/patch-player_main.c:1.3	Mon Apr 30 06:38:45 2018
+++ pkgsrc/multimedia/mpv/patches/patch-player_main.c	Wed Jul 25 14:19:16 2018
@@ -1,17 +1,20 @@
-$NetBSD: patch-player_main.c,v 1.3 2018/04/30 06:38:45 wiz Exp $
+$NetBSD: patch-player_main.c,v 1.4 2018/07/25 14:19:16 leot Exp $
 
 Avoid to check mismatched built vs running libraries version.
 The use in pkgsrc can be considered a legitimate one.
 
---- player/main.c.orig	2018-02-13 02:07:05.000000000 +0000
+--- player/main.c.orig	2018-07-22 16:46:25.000000000 +0000
 +++ player/main.c
-@@ -428,18 +428,6 @@ int mp_initialize(struct MPContext *mpct
+@@ -381,21 +381,6 @@ int mp_initialize(struct MPContext *mpct
      if (handle_help_options(mpctx))
-         return -2;
+         return 1; // help
  
 -    if (!print_libav_versions(mp_null_log, 0)) {
 -        // Using mismatched libraries can be legitimate, but even then it's
 -        // a bad idea. We don't acknowledge its usefulness and stability.
+-        // Distro maintainers who patch this out should be aware that mpv
+-        // intentionally ignores ABI in some places where it's not possible to
+-        // get by without violating it.
 -        print_libav_versions(mpctx->log, MSGL_FATAL);
 -        MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
 -                 "FFmpeg/Libav than the shared\nlibrary it is linked against. "
@@ -21,6 +24,6 @@ The use in pkgsrc can be considered a le
 -        return -1;
 -    }
 -
-     if (!mpctx->playlist->first && !opts->player_idle_mode)
-         return -3;
- 
+     if (!mpctx->playlist->first && !opts->player_idle_mode) {
+         // nothing to play
+         mp_print_version(mpctx->log, true);


--_----------=_1532528356130470--