media-video/mpv: revbump to 0.17.0-r4 wrt bug 582384

Also the usual dose of memleak/crash/corruption fixes is included.
Move our already huge patchset to devspace kindly provided by wraeth.

Closes: https://github.com/gentoo/gentoo/pull/1446
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=582384
Package-Manager: portage-2.2.28

Signed-off-by: Ian Delaney <idella4@gentoo.org>

12 files changed, 29 insertions, 371 deletions

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index a3873c806add..d5fb1d07e4cb 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,3 +1,4 @@
+DIST mpv-0.17.0-patches-04.tar.gz 7862 SHA256 a6b259cfe3ed605ca5530981670051e38c712c906bbdd0ea7958932660cc6556 SHA512 74dc84ab5baadb950658d55ba5d89300fc169c67cf854ca33ea812e246a1fbbbe9f84d0f07ca6cc3ca5fb97710209974105785a8a3e593166a4aaa696266b1ea WHIRLPOOL 743c9c7443213499d2ec692955c447f29ec10c3305fa13c2e06ae52b10408473b35037772b4b3c4a2f69ff9318fe1a6dd8a7d5c4307928424b0a081447b9018e
 DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61
 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
 DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-avoid-deprecated-API-usage.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-avoid-deprecated-API-usage.patch
deleted file mode 100644
index 16a284552ac6..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-avoid-deprecated-API-usage.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 78346e9c9a8a70fa581989b2cc8b4e0933765330
-Author: wm4 <wm4@nowhere>
-Date:   Wed Apr 20 19:37:45 2016 +0200
-
-ad_spdif: take care of deprecated libavcodec API usage
----
-
-diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
-index eb2e2bb..56e4a81 100644
---- a/audio/decode/ad_spdif.c
-+++ b/audio/decode/ad_spdif.c
-@@ -116,9 +116,16 @@ static int determine_codec_profile(struct dec_audio *da, AVPacket *pkt)
-         goto done;
-     }
-
-+#if HAVE_AVCODEC_NEW_CODEC_API
-+    if (avcodec_send_packet(ctx, pkt) < 0)
-+        goto done;
-+    if (avcodec_receive_frame(ctx, frame) < 0)
-+        goto done;
-+#else
-     int got_frame = 0;
-     if (avcodec_decode_audio4(ctx, frame, &got_frame, pkt) < 1 || !got_frame)
-         goto done;
-+#endif
-
-     profile = ctx->profile;
-
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-early-audio-start.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-early-audio-start.patch
deleted file mode 100644
index f7685d886785..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-early-audio-start.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit cd9ee1a8533a3d5fb4c163802347e83c7db91923
-Author: wm4 <wm4@nowhere>
-Date:   Wed Apr 20 13:05:29 2016 +0200
-
-player: really start audio only once video is ready
-
-The check whether video is ready yet was done only in STATUS_FILLING.
-But it also switched to STATUS_READY, which means the next time
-fill_audio_out_buffers() was called, audio would actually be started
-before video.
-
-In most situations, this bug didn't show up, because it was only
-triggered if the demuxer didn't provide video packets quickly enough,
-but did for audio packets.
-
-Also log when audio is started.
-
-(I hate fill_audio_out_buffers(), why did I write it?)
----
-
-diff --git a/player/audio.c b/player/audio.c
-index 3a2c60b..2ce1669 100644
---- a/player/audio.c
-+++ b/player/audio.c
-@@ -886,13 +886,18 @@ void fill_audio_out_buffers(struct MPContext *mpctx)
-
-     assert(mpctx->audio_status >= STATUS_FILLING);
-
-+    // We already have as much data as the audio device wants, and can start
-+    // writing it any time.
-+    if (mpctx->audio_status == STATUS_FILLING)
-+        mpctx->audio_status = STATUS_READY;
-+
-     // Even if we're done decoding and syncing, let video start first - this is
-     // required, because sending audio to the AO already starts playback.
--    if (mpctx->audio_status == STATUS_FILLING && mpctx->vo_chain &&
--        !mpctx->vo_chain->is_coverart && mpctx->video_status <= STATUS_READY)
--    {
--        mpctx->audio_status = STATUS_READY;
--        return;
-+    if (mpctx->audio_status == STATUS_READY) {
-+        if (mpctx->vo_chain && !mpctx->vo_chain->is_coverart &&
-+            mpctx->video_status <= STATUS_READY)
-+            return;
-+        MP_VERBOSE(mpctx, "starting audio playback\n");
-     }
-
-     bool audio_eof = status == AD_EOF;
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-hwdec-fallback.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-hwdec-fallback.patch
deleted file mode 100644
index 725752569261..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-hwdec-fallback.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit b1a8e8dba66fb9c85e3a1d4e812d4f842db68fe6
-Author: wm4 <wm4@nowhere>
-Date:   Fri Apr 22 15:45:23 2016 +0200
-
-vd_lavc: fix hwdec fallback if hwdec pre-initialization fails
-
-Damn.
----
-
-diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
-index a444f88..0bbe84c 100644
---- a/video/decode/vd_lavc.c
-+++ b/video/decode/vd_lavc.c
-@@ -284,17 +284,14 @@ static void uninit(struct dec_video *vd)
-     talloc_free(vd->priv);
- }
-
--static bool force_fallback(struct dec_video *vd)
-+static void force_fallback(struct dec_video *vd)
- {
-     vd_ffmpeg_ctx *ctx = vd->priv;
--    if (!ctx->hwdec)
--        return false;
-
-     uninit_avctx(vd);
-     int lev = ctx->hwdec_notified ? MSGL_WARN : MSGL_V;
-     mp_msg(vd->log, lev, "Falling back to software decoding.\n");
-     init_avctx(vd, ctx->decoder, NULL);
--    return true;
- }
-
- static void reinit(struct dec_video *vd)
-@@ -332,7 +329,7 @@ static void reinit(struct dec_video *vd)
-     }
-
-     init_avctx(vd, decoder, hwdec);
--    if (!ctx->avctx)
-+    if (!ctx->avctx && hwdec)
-         force_fallback(vd);
- }
-
-@@ -767,7 +764,8 @@ static struct mp_image *decode_with_fallback(struct dec_video *vd,
-     decode(vd, packet, flags, &mpi);
-     if (ctx->hwdec_failed) {
-         // Failed hardware decoding? Try again in software.
--        if (force_fallback(vd) && ctx->avctx)
-+        force_fallback(vd);
-+        if (ctx->avctx)
-             decode(vd, packet, flags, &mpi);
-     }
-
-@@ -805,8 +803,10 @@ static int control(struct dec_video *vd, int cmd, void *arg)
-         return CONTROL_TRUE;
-     }
-     case VDCTRL_FORCE_HWDEC_FALLBACK:
--        if (force_fallback(vd))
-+        if (ctx->hwdec) {
-+            force_fallback(vd);
-             return ctx->avctx ? CONTROL_OK : CONTROL_ERROR;
-+        }
-         return CONTROL_FALSE;
-     case VDCTRL_REINIT:
-         reinit(vd);
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-parsing-multiple-input-command-prefixes.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-parsing-multiple-input-command-prefixes.patch
deleted file mode 100644
index b78db811cd60..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-parsing-multiple-input-command-prefixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 1f1117d0dd61e47d1c64f567be1ca80ac968bd22
-Author: Philip Sequeira <phsequei@gmail.com>
-Date:   Sun Apr 17 02:09:54 2016 -0400
-
-input: fix parsing multiple input command prefixes
----
-
-diff --git a/input/cmd_parse.c b/input/cmd_parse.c
-index c2c3270..01e4bb6 100644
---- a/input/cmd_parse.c
-+++ b/input/cmd_parse.c
-@@ -273,7 +273,6 @@ static struct mp_cmd *parse_cmd_str(struct mp_log *log, void *tmp,
-             break;
-         if (pctx_read_token(ctx, &cur_token) < 0)
-             goto error;
--        break;
-     }
-
-     if (!find_cmd(ctx->log, cmd, cur_token))
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-relative-seeking-with-coverart.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-relative-seeking-with-coverart.patch
deleted file mode 100644
index c50e45e55a84..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-relative-seeking-with-coverart.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-commit 786f37ae1c77b46b34ed66b4a73c42ff64bfc9b8
-Author: wm4 <wm4@nowhere>
-Date:   Sat Apr 23 17:16:54 2016 +0200
-
-player: cleaner determination of current playback PTS
-
-In particular, this won't overwrite the playback PTS in coverart mode,
-which actually fixes relative seeks.
----
-
-diff --git a/player/playloop.c b/player/playloop.c
-index 71ecd7e..6eadcbc 100644
---- a/player/playloop.c
-+++ b/player/playloop.c
-@@ -958,6 +958,17 @@ void run_playloop(struct MPContext *mpctx)
-     fill_audio_out_buffers(mpctx);
-     write_video(mpctx);
-
-+    if (mpctx->vo_chain && !mpctx->vo_chain->is_coverart &&
-+        mpctx->video_status >= STATUS_PLAYING &&
-+        mpctx->video_status < STATUS_EOF)
-+    {
-+        mpctx->playback_pts = mpctx->video_pts;
-+    } else if (mpctx->audio_status >= STATUS_PLAYING &&
-+               mpctx->audio_status < STATUS_EOF)
-+    {
-+        mpctx->playback_pts = playing_audio_pts(mpctx);
-+    }
-+
-     if (mpctx->lavfi) {
-         if (lavfi_process(mpctx->lavfi))
-             mpctx->sleeptime = 0;
-@@ -967,14 +978,6 @@ void run_playloop(struct MPContext *mpctx)
-
-     handle_playback_restart(mpctx);
-
--    // Use the audio timestamp if no video, or video is enabled, but has ended.
--    if (mpctx->video_status == STATUS_EOF &&
--        mpctx->audio_status >= STATUS_PLAYING &&
--        mpctx->audio_status < STATUS_EOF)
--    {
--        mpctx->playback_pts = playing_audio_pts(mpctx);
--    }
--
-     handle_dummy_ticks(mpctx);
-
-     update_osd_msg(mpctx);
-diff --git a/player/video.c b/player/video.c
-index 0af0b90..7610c12 100644
---- a/player/video.c
-+++ b/player/video.c
-@@ -1380,7 +1380,6 @@ void write_video(struct MPContext *mpctx)
-
-     mpctx->video_pts = mpctx->next_frames[0]->pts;
-     mpctx->last_vo_pts = mpctx->video_pts;
--    mpctx->playback_pts = mpctx->video_pts;
-
-     shift_frames(mpctx);
-
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-timestamp-resets.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-timestamp-resets.patch
deleted file mode 100644
index ecebb1f17619..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-timestamp-resets.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 5f97bd42234ecc6fca7e06b9831318d67e865c8b
-Author: wm4 <wm4@nowhere>
-Date:   Sun Apr 24 18:24:46 2016 +0200
-
-player: assume video forwards timestamps jumps only with some formats
-
-Another crappy fix for timestamp reset issues. This time, we try to fix
-files which have very weird but legitimate frame durations, such as
-cdgraphics. It can have many short frames, but once in a while there are
-potentially very long frames.
-
-Fixes #3027.
----
-
-diff --git a/player/video.c b/player/video.c
-index 7610c12..2714060 100644
---- a/player/video.c
-+++ b/player/video.c
-@@ -685,7 +685,7 @@ static void handle_new_frame(struct MPContext *mpctx)
-     double pts = mpctx->next_frames[0]->pts;
-     if (mpctx->video_pts != MP_NOPTS_VALUE) {
-         frame_time = pts - mpctx->video_pts;
--        double tolerance = 15;
-+        double tolerance = mpctx->demuxer->ts_resets_possible ? 5 : 1e4;
-         if (frame_time <= 0 || frame_time >= tolerance) {
-             // Assume a discontinuity.
-             MP_WARN(mpctx, "Invalid video timestamp: %f -> %f\n",
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-unselecting-video-track.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-unselecting-video-track.patch
deleted file mode 100644
index e394b827c255..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-unselecting-video-track.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 47e7676e7e1d39bf8bcd5fa623698f383a60712e
-Author: wm4 <wm4@nowhere>
-Date:   Sat Apr 23 17:24:03 2016 +0200
-
-player: force VO reconfig when unselecting video track
-
-Switches to a black window if --force-window is used while coverart
-"video" is playing.
----
-
-diff --git a/player/loadfile.c b/player/loadfile.c
-index 4890245..2b88ecf 100644
---- a/player/loadfile.c
-+++ b/player/loadfile.c
-@@ -452,7 +452,7 @@ void mp_switch_track_n(struct MPContext *mpctx, int order, enum stream_type type
-         if (type == STREAM_VIDEO) {
-             uninit_video_chain(mpctx);
-             if (!track)
--                handle_force_window(mpctx, false);
-+                handle_force_window(mpctx, true);
-         } else if (type == STREAM_AUDIO) {
-             clear_audio_output_buffers(mpctx);
-             uninit_audio_chain(mpctx);
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-use-after-free.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-use-after-free.patch
deleted file mode 100644
index 17b08a1ae3f5..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-use-after-free.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 4ebac1e936f761f08d455acf77be40c93048f6d5
-Author: wm4 <wm4@nowhere>
-Date:   Thu Apr 14 22:39:10 2016 +0200
-
-player: fix use-after-free with --screenshot-directory
-
-Probably fixes #3049.
----
-
-diff --git a/player/screenshot.c b/player/screenshot.c
-index 02cbb4a..33b972b 100644
---- a/player/screenshot.c
-+++ b/player/screenshot.c
-@@ -287,9 +287,10 @@ static char *gen_fname(screenshot_ctx *ctx, const char *file_ext)
-             void *t = fname;
-             dir = mp_get_user_path(t, ctx->mpctx->global, dir);
-             fname = mp_path_join(NULL, dir, fname);
--            talloc_free(t);
-
-             mp_mkdirp(dir);
-+
-+            talloc_free(t);
-         }
-
-         if (!mp_path_exists(fname))
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-video-frame-info-memleak.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-video-frame-info-memleak.patch
deleted file mode 100644
index eee65cc5705c..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-video-frame-info-memleak.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e232f1a731a9089a13d88def6c1f2c1a069a6353
-Author: trUSTssc <trUSTssc@users.noreply.github.com>
-Date:   Sun Apr 24 20:11:36 2016 +0200
-
-player: fix memleak when using video-frame-info
----
-
-diff --git a/player/command.c b/player/command.c
-index 7f65534..738865b 100644
---- a/player/command.c
-+++ b/player/command.c
-@@ -2581,6 +2581,7 @@ static int mp_property_video_frame_info(void *ctx, struct m_property *prop,
-         {0}
-     };
-
-+    talloc_free(f);
-     return m_property_read_sub(props, action, arg);
- }
-
diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-remove-unneeded-X11-include.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-remove-unneeded-X11-include.patch
deleted file mode 100644
index 7d2d1cc1a32d..000000000000
--- a/media-video/mpv/files/0.17.0/mpv-0.17.0-remove-unneeded-X11-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 8c02c92ab962107ee43c71854bd9712cc492046e
-Author: wm4 <wm4@nowhere>
-Date:   Fri Apr 15 09:45:15 2016 +0200
-
-vo_opengl: rpi: don't include x11 header file
-
-Copy & paste bug.
----
-
-diff --git a/video/out/opengl/context_rpi.c b/video/out/opengl/context_rpi.c
-index c01c173..c0ca733 100644
---- a/video/out/opengl/context_rpi.c
-+++ b/video/out/opengl/context_rpi.c
-@@ -19,7 +19,6 @@
- #include <assert.h>
-
- #include "common/common.h"
--#include "video/out/x11_common.h"
- #include "context.h"
-
- #include "context_rpi.h"
diff --git a/media-video/mpv/mpv-0.17.0-r3.ebuild b/media-video/mpv/mpv-0.17.0-r4.ebuild
index 247d418f3547..93907e610f31 100644
--- a/media-video/mpv/mpv-0.17.0-r3.ebuild
+++ b/media-video/mpv/mpv-0.17.0-r4.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE='threads(+)'
 
-WAF_PV='1.8.12'
+WAF_PV=1.8.12
 
 inherit fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
 
@@ -15,17 +15,20 @@ DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~wraeth/distfiles/${P}-patches-04.tar.gz
+	"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	EGIT_REPO_URI="git://github.com/mpv-player/mpv.git"
 	inherit git-r3
 fi
 SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md )
+DOCS+=( CONTRIBUTING.md README.md )
 
-# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
 LICENSE="GPL-2+ BSD ISC"
 SLOT="0"
 IUSE="aqua +alsa archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca
@@ -126,21 +129,6 @@ RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-mplayer )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PV}/${P}-fix-seeking-without-first-index-entry.patch"
-	"${FILESDIR}/${PV}/${P}-fix-use-after-free.patch"
-	"${FILESDIR}/${PV}/${P}-remove-unneeded-X11-include.patch"
-	"${FILESDIR}/${PV}/${P}-add-missing-math-include.patch"
-	"${FILESDIR}/${PV}/${P}-fix-parsing-multiple-input-command-prefixes.patch"
-	"${FILESDIR}/${PV}/${P}-fix-early-audio-start.patch"
-	"${FILESDIR}/${PV}/${P}-avoid-deprecated-API-usage.patch"
-	"${FILESDIR}/${PV}/${P}-fix-hwdec-fallback.patch"
-	"${FILESDIR}/${PV}/${P}-fix-relative-seeking-with-coverart.patch"
-	"${FILESDIR}/${PV}/${P}-fix-unselecting-video-track.patch"
-	"${FILESDIR}/${PV}/${P}-fix-timestamp-resets.patch"
-	"${FILESDIR}/${PV}/${P}-fix-video-frame-info-memleak.patch"
-)
-
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
 		die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
@@ -150,24 +138,25 @@ pkg_pretend() {
 src_prepare() {
 	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
 	chmod +x "${S}"/waf || die
-	default
+	default_src_prepare
+	EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch "${WORKDIR}/${PV}"
 }
 
 src_configure() {
 	local mywafargs=(
-		--confdir="${EPREFIX}"/etc/${PN}
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 
 		--disable-gpl3			# Unclear license info. See Gentoo bug 571728.
 
 		$(usex cli '' '--disable-cplayer')
 		$(use_enable libmpv libmpv-shared)
 
-		# See deep down below for build-date
+		# See deep down below for build-date.
 		--disable-libmpv-static
 		--disable-static-build
-		--disable-optimize		# Do not add '-O2' to CFLAGS
-		--disable-debug-build	# Do not add '-g' to CFLAGS
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
 
 		$(use_enable doc html-build)
 		$(use_enable doc pdf-build)
@@ -191,17 +180,17 @@ src_configure() {
 		$(use_enable uchardet)
 		$(use_enable rubberband)
 		$(use_enable lcms lcms2)
-		--disable-vapoursynth	# Only available in overlays
+		--disable-vapoursynth	# Only available in overlays.
 		--disable-vapoursynth-lazy
 		$(use_enable archive libarchive)
 
 		--enable-libavdevice
 
-		# Audio outputs
-		$(use_enable sdl sdl2)	# Listed under audio, but also includes video
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
 		--disable-sdl1
 		$(use_enable oss oss-audio)
-		--disable-rsound		# Only available in overlays
+		--disable-rsound		# Only available in overlays.
 		$(use_enable pulseaudio pulse)
 		$(use_enable jack)
 		$(use_enable openal)
@@ -209,7 +198,7 @@ src_configure() {
 		$(use_enable alsa)
 		$(use_enable coreaudio)
 
-		# Video outputs
+		# Video outputs:
 		$(use_enable aqua cocoa)
 		$(use_enable drm)
 		$(use_enable gbm)
@@ -227,7 +216,7 @@ src_configure() {
 		$(use_enable wayland gl-wayland)
 		$(use_enable vdpau)
 		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
 		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
 		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
 		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
@@ -237,19 +226,19 @@ src_configure() {
 		$(use_enable raspberry-pi rpi)
 		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
 
-		# HWaccels
+		# HWaccels:
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
 		$(use_enable vaapi vaapi-hwaccel)
 		# Automagic VDPAU HW acceleration. See Gentoo bug 558870.
 
-		# TV features
+		# TV features:
 		$(use_enable v4l tv)
 		$(use_enable v4l tv-v4l2)
 		$(use_enable v4l libv4l2)
 		$(use_enable v4l audio-input)
 		$(use_enable dvb dvbin)
 
-		# Miscellaneous features
+		# Miscellaneous features:
 		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
 	)
 
@@ -260,7 +249,7 @@ src_configure() {
 		)
 	fi
 
-	# Create reproducible non-live builds
+	# Create reproducible non-live builds.
 	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
 
 	waf-utils_src_configure "${mywafargs[@]}"
@@ -270,7 +259,7 @@ src_install() {
 	waf-utils_src_install
 
 	if use cli && use luajit; then
-		pax-mark -m "${ED}usr/bin/${PN}"
+		pax-mark -m "${ED}"usr/bin/${PN}
 	fi
 }
 
@@ -287,13 +276,13 @@ pkg_postinst() {
 		! has_version 'app-shells/mpv-bash-completion'; then
 		elog "If you want to have command-line completion via bash-completion,"
 		elog "please install app-shells/mpv-bash-completion."
-	fi;
+	fi
 
 	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
 		has_version 'app-shells/mpv-bash-completion'; then
 		elog "If command-line completion doesn't work after mpv update,"
 		elog "please rebuild app-shells/mpv-bash-completion."
-	fi;
+	fi
 }
 
 pkg_postrm() {