| 1 |
commit: bdcb223fad2a600ea42f49186a0c6377e8725173 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 6 16:18:46 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 7 19:27:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdcb223f |
| 7 |
|
| 8 |
media-video/baka-mplayer: use mpv subslot, backport api 2.0 fix |
| 9 |
|
| 10 |
libmpv.so.1 -> libmpv.so.2 |
| 11 |
|
| 12 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 13 |
|
| 14 |
...er-9999.ebuild => baka-mplayer-2.0.4-r2.ebuild} | 23 +++++-- |
| 15 |
media-video/baka-mplayer/baka-mplayer-9999.ebuild | 2 +- |
| 16 |
.../files/baka-mplayer-2.0.4-libmpv-api2.patch | 78 ++++++++++++++++++++++ |
| 17 |
3 files changed, 95 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/baka-mplayer/baka-mplayer-9999.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4-r2.ebuild |
| 20 |
similarity index 63% |
| 21 |
copy from media-video/baka-mplayer/baka-mplayer-9999.ebuild |
| 22 |
copy to media-video/baka-mplayer/baka-mplayer-2.0.4-r2.ebuild |
| 23 |
index 243a21f1b8af..824dc5776b15 100644 |
| 24 |
--- a/media-video/baka-mplayer/baka-mplayer-9999.ebuild |
| 25 |
+++ b/media-video/baka-mplayer/baka-mplayer-2.0.4-r2.ebuild |
| 26 |
@@ -1,17 +1,17 @@ |
| 27 |
-# Copyright 1999-2020 Gentoo Authors |
| 28 |
+# Copyright 1999-2022 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
|
| 33 |
-inherit qmake-utils git-r3 xdg-utils |
| 34 |
+inherit qmake-utils xdg-utils |
| 35 |
|
| 36 |
DESCRIPTION="Cross-platform libmpv-based multimedia player with uncluttered design" |
| 37 |
HOMEPAGE="http://bakamplayer.u8sand.net/" |
| 38 |
-EGIT_REPO_URI="https://github.com/u8sand/Baka-MPlayer.git" |
| 39 |
+SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 40 |
|
| 41 |
LICENSE="GPL-2" |
| 42 |
SLOT="0" |
| 43 |
-KEYWORDS="" |
| 44 |
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
| 45 |
IUSE="" |
| 46 |
|
| 47 |
BDEPEND=" |
| 48 |
@@ -25,17 +25,26 @@ RDEPEND=" |
| 49 |
dev-qt/qtsvg:5 |
| 50 |
dev-qt/qtwidgets:5 |
| 51 |
dev-qt/qtx11extras:5 |
| 52 |
- media-video/mpv[libmpv] |
| 53 |
+ media-video/mpv:=[libmpv] |
| 54 |
x11-libs/libX11 |
| 55 |
" |
| 56 |
DEPEND="${RDEPEND}" |
| 57 |
|
| 58 |
-S="${WORKDIR}/baka-mplayer-${PV}" |
| 59 |
+S="${WORKDIR}/Baka-MPlayer-${PV}" |
| 60 |
+ |
| 61 |
+PATCHES=( |
| 62 |
+ "${FILESDIR}/${P}-gcc5.patch" |
| 63 |
+ "${FILESDIR}/${P}-mpv23.patch" |
| 64 |
+ "${FILESDIR}/${P}-playlist-regression.patch" |
| 65 |
+ "${FILESDIR}/${P}-libmpv-api2.patch" |
| 66 |
+) |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
default |
| 70 |
# don't install license, man.gz, install the latter manually |
| 71 |
- sed -e "/^INSTALLS/s/\sman\slicense//" -i src/Baka-MPlayer.pro || die |
| 72 |
+ sed -e "/^INSTALLS/s:\sman\slicense::" \ |
| 73 |
+ -e '/^manual.path/s:'${PN}':'${PF}':' \ |
| 74 |
+ -i src/Baka-MPlayer.pro || die |
| 75 |
gunzip DOCS/baka-mplayer.1.gz || die |
| 76 |
} |
| 77 |
|
| 78 |
|
| 79 |
diff --git a/media-video/baka-mplayer/baka-mplayer-9999.ebuild b/media-video/baka-mplayer/baka-mplayer-9999.ebuild |
| 80 |
index 243a21f1b8af..8b7d359ed552 100644 |
| 81 |
--- a/media-video/baka-mplayer/baka-mplayer-9999.ebuild |
| 82 |
+++ b/media-video/baka-mplayer/baka-mplayer-9999.ebuild |
| 83 |
@@ -25,7 +25,7 @@ RDEPEND=" |
| 84 |
dev-qt/qtsvg:5 |
| 85 |
dev-qt/qtwidgets:5 |
| 86 |
dev-qt/qtx11extras:5 |
| 87 |
- media-video/mpv[libmpv] |
| 88 |
+ media-video/mpv:=[libmpv] |
| 89 |
x11-libs/libX11 |
| 90 |
" |
| 91 |
DEPEND="${RDEPEND}" |
| 92 |
|
| 93 |
diff --git a/media-video/baka-mplayer/files/baka-mplayer-2.0.4-libmpv-api2.patch b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-libmpv-api2.patch |
| 94 |
new file mode 100644 |
| 95 |
index 000000000000..9ae547b9291f |
| 96 |
--- /dev/null |
| 97 |
+++ b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-libmpv-api2.patch |
| 98 |
@@ -0,0 +1,78 @@ |
| 99 |
+https://github.com/u8sand/Baka-MPlayer/commit/7864f248c3f |
| 100 |
+From: Fushan Wen <qydwhotmail@×××××.com> |
| 101 |
+Date: Mon, 21 Feb 2022 18:50:46 +0800 |
| 102 |
+Subject: [PATCH] Port away from deprecated/removed APIs in mpv 2.0 |
| 103 |
+ |
| 104 |
+Register observers as MPV_EVENT_IDLE is deprecated and |
| 105 |
+MPV_EVENT_PAUSE/MPV_EVENT_UNPAUSE have been removed. |
| 106 |
+--- a/src/mpvhandler.cpp |
| 107 |
++++ b/src/mpvhandler.cpp |
| 108 |
+@@ -41,6 +41,8 @@ MpvHandler::MpvHandler(int64_t wid, QObject *parent): |
| 109 |
+ mpv_observe_property(mpv, 0, "sub-visibility", MPV_FORMAT_FLAG); |
| 110 |
+ mpv_observe_property(mpv, 0, "mute", MPV_FORMAT_FLAG); |
| 111 |
+ mpv_observe_property(mpv, 0, "core-idle", MPV_FORMAT_FLAG); |
| 112 |
++ mpv_observe_property(mpv, 0, "idle-active", MPV_FORMAT_FLAG); |
| 113 |
++ mpv_observe_property(mpv, 0, "pause", MPV_FORMAT_FLAG); |
| 114 |
+ mpv_observe_property(mpv, 0, "paused-for-cache", MPV_FORMAT_FLAG); |
| 115 |
+ |
| 116 |
+ // setup callback event handling |
| 117 |
+@@ -191,6 +193,31 @@ bool MpvHandler::event(QEvent *event) |
| 118 |
+ ShowText(QString(), 0); |
| 119 |
+ } |
| 120 |
+ } |
| 121 |
++ else if(QString(prop->name) == "idle-active") |
| 122 |
++ { |
| 123 |
++ if(prop->format == MPV_FORMAT_FLAG) |
| 124 |
++ { |
| 125 |
++ if((bool)*(unsigned*)prop->data) |
| 126 |
++ { |
| 127 |
++ fileInfo.length = 0; |
| 128 |
++ setTime(0); |
| 129 |
++ setPlayState(Mpv::Idle); |
| 130 |
++ } |
| 131 |
++ } |
| 132 |
++ } |
| 133 |
++ else if(QString(prop->name) == "pause") |
| 134 |
++ { |
| 135 |
++ if(prop->format == MPV_FORMAT_FLAG) |
| 136 |
++ { |
| 137 |
++ if((bool)*(unsigned*)prop->data) |
| 138 |
++ { |
| 139 |
++ setPlayState(Mpv::Paused); |
| 140 |
++ ShowText(QString(), 0); |
| 141 |
++ } |
| 142 |
++ else |
| 143 |
++ setPlayState(Mpv::Playing); |
| 144 |
++ } |
| 145 |
++ } |
| 146 |
+ else if(QString(prop->name) == "paused-for-cache") |
| 147 |
+ { |
| 148 |
+ if(prop->format == MPV_FORMAT_FLAG) |
| 149 |
+@@ -203,12 +230,7 @@ bool MpvHandler::event(QEvent *event) |
| 150 |
+ } |
| 151 |
+ break; |
| 152 |
+ } |
| 153 |
+- case MPV_EVENT_IDLE: |
| 154 |
+- fileInfo.length = 0; |
| 155 |
+- setTime(0); |
| 156 |
+- setPlayState(Mpv::Idle); |
| 157 |
+- break; |
| 158 |
+- // these two look like they're reversed but they aren't. the names are misleading. |
| 159 |
++ // these two look like they're reversed but they aren't. the names are misleading. |
| 160 |
+ case MPV_EVENT_START_FILE: |
| 161 |
+ setPlayState(Mpv::Loaded); |
| 162 |
+ break; |
| 163 |
+@@ -216,13 +238,6 @@ bool MpvHandler::event(QEvent *event) |
| 164 |
+ setPlayState(Mpv::Started); |
| 165 |
+ LoadFileInfo(); |
| 166 |
+ SetProperties(); |
| 167 |
+- case MPV_EVENT_UNPAUSE: |
| 168 |
+- setPlayState(Mpv::Playing); |
| 169 |
+- break; |
| 170 |
+- case MPV_EVENT_PAUSE: |
| 171 |
+- setPlayState(Mpv::Paused); |
| 172 |
+- ShowText(QString(), 0); |
| 173 |
+- break; |
| 174 |
+ case MPV_EVENT_END_FILE: |
| 175 |
+ if(playState == Mpv::Loaded) |
| 176 |
+ ShowText(tr("File couldn't be opened")); |
Archives