logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 944008233931aa5943c6c2655013ed5d45c601e5
parent bba4833013ba5eb2f1b9088c5baaba9e091b9902
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 22 Oct 2018 22:15:41 -0700

mpv: Update to 0.29.1

Diffstat:

Mpkg/mpv/config.h1+
Mpkg/mpv/mpv.1310++++++-------------------------------------------------------------------------
Mpkg/mpv/rev2+-
3 files changed, 23 insertions(+), 290 deletions(-)

diff --git a/pkg/mpv/config.h b/pkg/mpv/config.h @@ -28,6 +28,7 @@ #define HAVE_POSIX 1 #define HAVE_ANDROID 0 #define HAVE_POSIX_OR_MINGW 1 +#define HAVE_SWIFT 0 #define HAVE_UWP 0 #define HAVE_WIN32_DESKTOP 0 #define HAVE_WIN32_INTERNAL_PTHREADS 0 diff --git a/pkg/mpv/mpv.1 b/pkg/mpv/mpv.1 @@ -30,283 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.SS Table of Contents -.INDENT 0.0 -.IP \(bu 2 -\fI\%SYNOPSIS\fP -.IP \(bu 2 -\fI\%DESCRIPTION\fP -.IP \(bu 2 -\fI\%INTERACTIVE CONTROL\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Keyboard Control\fP -.IP \(bu 2 -\fI\%Mouse Control\fP -.UNINDENT -.IP \(bu 2 -\fI\%USAGE\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Legacy option syntax\fP -.IP \(bu 2 -\fI\%Escaping spaces and other special characters\fP -.IP \(bu 2 -\fI\%Paths\fP -.IP \(bu 2 -\fI\%Per\-File Options\fP -.IP \(bu 2 -\fI\%List Options\fP -.IP \(bu 2 -\fI\%Playing DVDs\fP -.UNINDENT -.IP \(bu 2 -\fI\%CONFIGURATION FILES\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Location and Syntax\fP -.IP \(bu 2 -\fI\%Escaping spaces and special characters\fP -.IP \(bu 2 -\fI\%Putting Command Line Options into the Configuration File\fP -.IP \(bu 2 -\fI\%File\-specific Configuration Files\fP -.IP \(bu 2 -\fI\%Profiles\fP -.IP \(bu 2 -\fI\%Auto profiles\fP -.UNINDENT -.IP \(bu 2 -\fI\%TAKING SCREENSHOTS\fP -.IP \(bu 2 -\fI\%TERMINAL STATUS LINE\fP -.IP \(bu 2 -\fI\%LOW LATENCY PLAYBACK\fP -.IP \(bu 2 -\fI\%PROTOCOLS\fP -.IP \(bu 2 -\fI\%PSEUDO GUI MODE\fP -.IP \(bu 2 -\fI\%OPTIONS\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Track Selection\fP -.IP \(bu 2 -\fI\%Playback Control\fP -.IP \(bu 2 -\fI\%Program Behavior\fP -.IP \(bu 2 -\fI\%Video\fP -.IP \(bu 2 -\fI\%Audio\fP -.IP \(bu 2 -\fI\%Subtitles\fP -.IP \(bu 2 -\fI\%Window\fP -.IP \(bu 2 -\fI\%Disc Devices\fP -.IP \(bu 2 -\fI\%Equalizer\fP -.IP \(bu 2 -\fI\%Demuxer\fP -.IP \(bu 2 -\fI\%Input\fP -.IP \(bu 2 -\fI\%OSD\fP -.IP \(bu 2 -\fI\%Screenshot\fP -.IP \(bu 2 -\fI\%Software Scaler\fP -.IP \(bu 2 -\fI\%Audio Resampler\fP -.IP \(bu 2 -\fI\%Terminal\fP -.IP \(bu 2 -\fI\%TV\fP -.IP \(bu 2 -\fI\%Cache\fP -.IP \(bu 2 -\fI\%Network\fP -.IP \(bu 2 -\fI\%DVB\fP -.IP \(bu 2 -\fI\%ALSA audio output options\fP -.IP \(bu 2 -\fI\%GPU renderer options\fP -.IP \(bu 2 -\fI\%Miscellaneous\fP -.UNINDENT -.IP \(bu 2 -\fI\%AUDIO OUTPUT DRIVERS\fP -.IP \(bu 2 -\fI\%VIDEO OUTPUT DRIVERS\fP -.IP \(bu 2 -\fI\%AUDIO FILTERS\fP -.IP \(bu 2 -\fI\%VIDEO FILTERS\fP -.IP \(bu 2 -\fI\%ENCODING\fP -.IP \(bu 2 -\fI\%COMMAND INTERFACE\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%input.conf\fP -.IP \(bu 2 -\fI\%General Input Command Syntax\fP -.IP \(bu 2 -\fI\%List of Input Commands\fP -.IP \(bu 2 -\fI\%Input Commands that are Possibly Subject to Change\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Hooks\fP -.IP \(bu 2 -\fI\%Legacy hook API\fP -.UNINDENT -.IP \(bu 2 -\fI\%Input Command Prefixes\fP -.IP \(bu 2 -\fI\%Input Sections\fP -.IP \(bu 2 -\fI\%Properties\fP -.IP \(bu 2 -\fI\%Property list\fP -.IP \(bu 2 -\fI\%Inconsistencies between options and properties\fP -.IP \(bu 2 -\fI\%Property Expansion\fP -.IP \(bu 2 -\fI\%Raw and Formatted Properties\fP -.UNINDENT -.IP \(bu 2 -\fI\%ON SCREEN CONTROLLER\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Using the OSC\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%The Interface\fP -.IP \(bu 2 -\fI\%Key Bindings\fP -.UNINDENT -.IP \(bu 2 -\fI\%Configuration\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Config Syntax\fP -.IP \(bu 2 -\fI\%Command\-line Syntax\fP -.IP \(bu 2 -\fI\%Configurable Options\fP -.IP \(bu 2 -\fI\%Script Commands\fP -.UNINDENT -.UNINDENT -.IP \(bu 2 -\fI\%STATS\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Usage\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Font\fP -.UNINDENT -.IP \(bu 2 -\fI\%Configuration\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Configurable Options\fP -.IP \(bu 2 -\fI\%Different key bindings\fP -.UNINDENT -.UNINDENT -.IP \(bu 2 -\fI\%LUA SCRIPTING\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Example\fP -.IP \(bu 2 -\fI\%Details on the script initialization and lifecycle\fP -.IP \(bu 2 -\fI\%mp functions\fP -.IP \(bu 2 -\fI\%Advanced mp functions\fP -.IP \(bu 2 -\fI\%mp.msg functions\fP -.IP \(bu 2 -\fI\%mp.options functions\fP -.IP \(bu 2 -\fI\%mp.utils functions\fP -.IP \(bu 2 -\fI\%Events\fP -.IP \(bu 2 -\fI\%List of events\fP -.IP \(bu 2 -\fI\%Extras\fP -.UNINDENT -.IP \(bu 2 -\fI\%JAVASCRIPT\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Example\fP -.IP \(bu 2 -\fI\%Similarities with Lua\fP -.IP \(bu 2 -\fI\%Differences from Lua\fP -.IP \(bu 2 -\fI\%Language features \- ECMAScript 5\fP -.IP \(bu 2 -\fI\%Unsupported Lua APIs and their JS alternatives\fP -.IP \(bu 2 -\fI\%Scripting APIs \- identical to Lua\fP -.IP \(bu 2 -\fI\%Additional utilities\fP -.IP \(bu 2 -\fI\%Timers (global)\fP -.IP \(bu 2 -\fI\%CommonJS modules and \fBrequire(id)\fP\fP -.IP \(bu 2 -\fI\%The event loop\fP -.UNINDENT -.IP \(bu 2 -\fI\%JSON IPC\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%Socat example\fP -.IP \(bu 2 -\fI\%Command Prompt example\fP -.IP \(bu 2 -\fI\%Protocol\fP -.IP \(bu 2 -\fI\%Commands\fP -.IP \(bu 2 -\fI\%UTF\-8\fP -.UNINDENT -.IP \(bu 2 -\fI\%CHANGELOG\fP -.IP \(bu 2 -\fI\%EMBEDDING INTO OTHER PROGRAMS (LIBMPV)\fP -.IP \(bu 2 -\fI\%C PLUGINS\fP -.INDENT 2.0 -.IP \(bu 2 -\fI\%C plugins location\fP -.IP \(bu 2 -\fI\%API\fP -.IP \(bu 2 -\fI\%Linkage to libmpv\fP -.IP \(bu 2 -\fI\%Examples\fP -.UNINDENT -.IP \(bu 2 -\fI\%ENVIRONMENT VARIABLES\fP -.IP \(bu 2 -\fI\%EXIT CODES\fP -.IP \(bu 2 -\fI\%FILES\fP -.IP \(bu 2 -\fI\%FILES ON WINDOWS\fP -.UNINDENT .SH SYNOPSIS .nf \fBmpv\fP [options] [file|URL|PLAYLIST|\-] @@ -503,11 +226,11 @@ Combining \fBAlt\fP with the \fB+\fP or \fB\-\fP keys changes video zoom. .B Alt+BACKSPACE Reset the pan/zoom settings. .TP -.B F9 +.B F8 Show the playlist and the current position in it (useful only if a UI window is used, broken on the terminal). .TP -.B F10 +.B F9 Show the list of audio and subtitle streams (useful only if a UI window is used, broken on the terminal). .UNINDENT @@ -2130,19 +1853,15 @@ version of youtube\-dl to be installed on the system. (Enabled by default.) .sp If the script can\(aqt do anything with an URL, it will do nothing. .sp -The \fItry_ytdl_first\fP script option accepts a boolean \(aqyes\(aq or \(aqno\(aq, and if +The \fBtry_ytdl_first\fP script option accepts a boolean \(aqyes\(aq or \(aqno\(aq, and if \(aqyes\(aq will try parsing the URL with youtube\-dl first, instead of the default where it\(aqs only after mpv failed to open it. This mostly depends on whether most of your URLs need youtube\-dl parsing. .sp -The \fIexclude\fP script option accepts a \fB|\fP\-separated list of URL patterns +The \fBexclude\fP script option accepts a \fB|\fP\-separated list of URL patterns which mpv should not use with youtube\-dl. The patterns are matched after the \fBhttp(s)://\fP part of the URL. .sp -The \fIuse_manifests\fP script option makes mpv use the master manifest URL for -formats like HLS and DASH, if available, allowing for video/audio selection -in runtime. It\(aqs disabled ("no") by default for performance reasons. -.sp \fB^\fP matches the beginning of the URL, \fB$\fP matches its end, and you should use \fB%\fP before any of the characters \fB^$()%|,.[]*+\-?\fP to match that character. @@ -2162,6 +1881,10 @@ will exclude any URL that ends with \fB\&.mkv\fP or \fB\&.mp4\fP\&. .UNINDENT .sp See more lua patterns here: \fI\%https://www.lua.org/manual/5.1/manual.html#5.4.1\fP +.sp +The \fBuse_manifests\fP script option makes mpv use the master manifest URL for +formats like HLS and DASH, if available, allowing for video/audio selection +in runtime. It\(aqs disabled ("no") by default for performance reasons. .TP .B \fB\-\-ytdl\-format=<best|worst|mp4|webm|...>\fP Video format/quality that is directly passed to youtube\-dl. The possible @@ -7137,6 +6860,15 @@ Deactivates the automatic graphics switching and forces the dedicated GPU. .sp OS X only. .TP +.B \fB\-\-cocoa\-cb\-sw\-renderer=<yes|no|auto>\fP +Use the Apple Software Renderer when using cocoa\-cb (default: auto). If set +to \fBno\fP the software renderer is never used and instead fails when a the +usual pixel format could not be created, \fByes\fP will always only use the +software renderer, and \fBauto\fP only falls back to the software renderer +when the usual pixel format couldn\(aqt be created. +.sp +OS X only. +.TP .B \fB\-\-macos\-title\-bar\-style=<dark|ultradark|light|mediumlight|auto>\fP Sets the styling of the title bar (default: dark). OS X and cocoa\-cb only @@ -7510,7 +7242,7 @@ better (slightly sigmoidal), at the cost of slightly darkening / desaturating everything. Developed by John Hable for use in video games. Use this when you care about detail preservation more than color/brightness accuracy. This is roughly equivalent to -\fB\-\-hdr\-tone\-mapping=reinhard \-\-tone\-mapping\-param=0.24\fP\&. If possible, +\fB\-\-tone\-mapping=reinhard \-\-tone\-mapping\-param=0.24\fP\&. If possible, you should also enable \fB\-\-hdr\-compute\-peak\fP for the best results. (Default) .TP @@ -8968,7 +8700,7 @@ This option only has effect when using the drm_prime renderer (which supports several layers) together with \fBvo=gpu\fP and \fBgpu\-context=drm\fP\&. (default: first overlay plane) .TP -.B \fB\-\-drm\-format=<xrgb8888,xrgb2101010>\fP +.B \fB\-\-drm\-format=<xrgb8888|xrgb2101010>\fP Select the DRM format to use (default: xrgb8888). This allows you to choose the bit depth of the DRM mode. xrgb8888 is your usual 24 bit per pixel/8 bits per channel packed RGB format with 8 bits of padding. @@ -9349,7 +9081,7 @@ Before the filter name, a label can be specified with \fB@name:\fP, where name is an arbitrary user\-given name, which identifies the filter. This is only needed if you want to toggle the filter at runtime. .sp -A \fB!\fP before the filter name means the filter is enabled by default. It +A \fB!\fP before the filter name means the filter is disabled by default. It will be skipped on filter creation. This is also useful for runtime filter toggling. .sp @@ -10682,7 +10414,7 @@ range. Print text to stdout. The string can contain properties (see \fI\%Property Expansion\fP). .TP -.B \fBshow\-text "<string>" [<duration>|\- [<level>]]\fP +.B \fBshow\-text "<string>" [<duration>|\-1 [<level>]]\fP Show text on the OSD. The string can contain properties, which are expanded as described in \fI\%Property Expansion\fP\&. This can be used to show playback time, filename, and so on. diff --git a/pkg/mpv/rev b/pkg/mpv/rev @@ -1 +1 @@ -15 +16