commit: e31d80a419120a0af70f62b1ee7cbf6b75a38213
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Jul 23 15:46:05 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 08:53:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31d80a4
media-video/mpv: rebase latest ffmpeg patch on top of 0.29.0
Package-Manager: Portage-2.3.43, Repoman-2.3.10
...l.patch => mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch} | 6 +++---
media-video/mpv/mpv-9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
similarity index 88%
rename from
media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
rename to
media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
index 1594617fba9..1a4975a4e30 100644
--- a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
+++ b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
@@ -3,10 +3,10 @@ player: make ffmpeg/libav version check non-fatal
We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
diff --git a/player/main.c b/player/main.c
-index 5a3fe4c1b7..8cfbb09c56 100644
+index f56191a297..4e51aebd66 100644
--- a/player/main.c
+++ b/player/main.c
-@@ -429,13 +429,12 @@ int mp_initialize(struct MPContext *mpctx, char
**options)
+@@ -387,13 +387,12 @@ int mp_initialize(struct MPContext *mpctx, char
**options)
// 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.
@@ -25,4 +25,4 @@ index 5a3fe4c1b7..8cfbb09c56 100644
+ "Please rebuild mpv in case of any problems.\n");
}
- if (!mpctx->playlist->first && !opts->player_idle_mode)
+ if (!mpctx->playlist->first && !opts->player_idle_mode) {
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index eae5391d95d..ba554e7956f 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -137,7 +137,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch"
+ "${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch"
)
src_prepare() {
