gentoo auto-resync : 07:11:2022 - 21:22:53

4 files changed, 112 insertions, 13 deletions

diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest
index 91aeef207dd9..a901796e2d51 100644
--- a/media-video/baka-mplayer/Manifest
+++ b/media-video/baka-mplayer/Manifest
@@ -1,8 +1,9 @@
 AUX baka-mplayer-2.0.4-gcc5.patch 1251 BLAKE2B 9f514f754499f5b44ae4a077c2025dfa0a9949a5594c00cb1cdb7bd2fb22e1a113ea864076e7d6846bbe07f75e86346bf65a518c4ebf195d83b59aed22e97962 SHA512 3d6b76227c465869a4497f51cd5b7759d038638a02aa821acd099edb7f4f0fe99dbee145687d286eb40cb7dfb840fdee40625c663476630064e9e88a7961fc79
+AUX baka-mplayer-2.0.4-libmpv-api2.patch 3290 BLAKE2B 5815614a010a8e8da66354514998cc74c6b38421b7dbc142312497bd7fbf7ca889e15784167162e4e0d5ac0cbda3e6993c829f598bc6595017fe07b6ced3fa60 SHA512 ea1608ff7b9d3bd730e7624b400401f1a6777fa1a0bcea4e00bb2defb64c6a628f8f35ccf6fdec5d8b73799a0fec709a6b4298be0d8716577e9c2be94f81fc61
 AUX baka-mplayer-2.0.4-mpv23.patch 782 BLAKE2B de90ac31fcbdd1cb9fb00eae1e282c6ff7e5ee14dd81bc2d8e07bd36250dcffa5de74dd83f2558bb15cae54ca83279c20f2776f315eea7f5b7a946e53a2e3f82 SHA512 9fda60f3569b88eb71d42562ef1650bfd125bf69f80b25ff1c123fb7efda524b7c14ae1f782d1786e9e68263f66db5af95a30c4e2e87468782da750eacbe456f
 AUX baka-mplayer-2.0.4-playlist-regression.patch 886 BLAKE2B b2c0edba4a2a0da89494dec05b78e7768a24af94f06fcda7fa4c4066800e673d551ed82f6b45d14f3f7f2d6d855d3e0be8535b5a6d3093fce90a9627e9f3c5c5 SHA512 3905ce72374c59edb09ed5a311ff257da3010386de9b076de516bd008c23d7e757d7c63151ac350bdc281a575b6387a96a44d1ac5e2229a1a325a3dfc5e6ace4
 DIST baka-mplayer-2.0.4.tar.gz 988060 BLAKE2B 4d73e6626bab90b2ac818fdc1b0d8ab7758a924805ca8356c6fa94d25df9acbfd53d7e997b58e5c85b68e033f83ce89d6e3b0c3e30ecc23d7d75b4bf74ae0911 SHA512 7898d65e87540bcb528d429dc70daefc7d4c0711b2983326cf6fa3a14e566c2742334378befdb710b8cc59452f960bc17b290058ba9e6878e830de6dbafce55a
 EBUILD baka-mplayer-2.0.4-r1.ebuild 1399 BLAKE2B 4e82b0bc35b7740e5891e27412e9156db667106ac2655a5ef6c7c5764893ab73bad86a7362c3dee1a811a95d7bbc319c96d05487ee495a0efcc563520289129a SHA512 e9af289d999d8c35caf425a2a4af7524f5a5031160a5029f683598925f68ef5e567f2a38f18d6218dd5ea47e80d5eaf202b956b86443197d0141f9cd9564c21d
-EBUILD baka-mplayer-2.0.4.ebuild 1135 BLAKE2B 22e814220d9493f077d266aee064a279e105d4ed4d35db3ffb8d3447b99580a9abe380042a1bd9a8fa9fe68138893f90bfff657c520168ff8d4cea1e73201431 SHA512 21bef7f1e283eb3a60cacb6502525ba46299aeaed11ae77da182755428adcfb526027452fbcdf80576854fa9d05d6eae5f720d9e10fe0e8ea5af649eb201a8f3
-EBUILD baka-mplayer-9999.ebuild 1187 BLAKE2B f2ce2028cc9c86799e1e676ccc4cf8fd2fd8dd663605deb74801ae812471295cf1f6537dea13a1960400abbc7f0694ed7015688ea2097575738227598fc8cf25 SHA512 c345059930ff6da0691eddd5e6c3a4c5c445af70bf4bb26b1492a65c337ad3c091455e2a22df67dc918774f7712971e727a9f3accd993adca0e6a3ce942cea46
+EBUILD baka-mplayer-2.0.4-r2.ebuild 1440 BLAKE2B 523350695ff4fa37ecbb515034e30fb257bc3db262cdee7e3a9b2015751f8f767d232c00231ac4b6dfe15d868901e9c3e8fcc1ec1b06680aecededc91870dc5d SHA512 b5e66cca00c3524df6de6a414ceef71fb0221f718c9af48dc3b6995f363f15ea5af5d2fb60baaa5c3c1fe3f7bb497a0f201fbadd078ddc528c78350c262e30b7
+EBUILD baka-mplayer-9999.ebuild 1189 BLAKE2B dc54a8dbb9a74fa208db31fd88afd8dae75db62875942e5e5509e63e5a31983c15240b81db5fefd0ebe46871867894db733427d1a125e89605d8b3a2a4566217 SHA512 255abc810d517ae7f1165c7a1989098c1315e3cb3b0384d78c8044c5064bb7163115d1ce04c5be39bf8d1d183a8ab31328d344bba140f63f26a09347c3bc08a7
 MISC metadata.xml 741 BLAKE2B 5fea8a8b3fd803742c6f71acc12e35fddee71fe7deddd35c87bfa0a5bef853833ee19864f69986c141a573cbc65cb2ac8b4aa191a8eeb6b28acd05592200956e SHA512 03f290ffac4d0aa5a978d9fe5e7e7a76e83de243c73e920c045a43b333bdc039a2e09f8f65c56dbc77ef7865b2360fc6bb34eaaf64f4a2df992d30dafafb8331
diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4-r2.ebuild
index 17edd2e0d77c..824dc5776b15 100644
--- a/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild
+++ b/media-video/baka-mplayer/baka-mplayer-2.0.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils
+inherit qmake-utils xdg-utils
 
 DESCRIPTION="Cross-platform libmpv-based multimedia player with uncluttered design"
 HOMEPAGE="http://bakamplayer.u8sand.net/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
@@ -25,20 +25,27 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-video/mpv[libmpv]
-	x11-libs/libX11"
+	media-video/mpv:=[libmpv]
+	x11-libs/libX11
+"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/Baka-MPlayer-${PV}"
 
-PATCHES=( "${FILESDIR}/${P}-gcc5.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc5.patch"
+	"${FILESDIR}/${P}-mpv23.patch"
+	"${FILESDIR}/${P}-playlist-regression.patch"
+	"${FILESDIR}/${P}-libmpv-api2.patch"
+)
 
 src_prepare() {
 	default
-	# no need to install license
-	sed -e '/^INSTALLS/s:license::' -i src/Baka-MPlayer.pro || die
-	# put manual in our docdir
-	sed -e '/^manual.path/s:'${PN}':'${PF}':' -i src/Baka-MPlayer.pro || die
+	# don't install license, man.gz, install the latter manually
+	sed -e "/^INSTALLS/s:\sman\slicense::" \
+		-e '/^manual.path/s:'${PN}':'${PF}':' \
+		-i src/Baka-MPlayer.pro || die
+	gunzip DOCS/baka-mplayer.1.gz || die
 }
 
 src_configure() {
@@ -49,3 +56,16 @@ src_configure() {
 		lupdate="$(qt5_get_bindir)"/lupdate \
 		src/Baka-MPlayer.pro
 }
+
+src_install() {
+	default
+	doman DOCS/baka-mplayer.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-video/baka-mplayer/baka-mplayer-9999.ebuild b/media-video/baka-mplayer/baka-mplayer-9999.ebuild
index 243a21f1b8af..8b7d359ed552 100644
--- a/media-video/baka-mplayer/baka-mplayer-9999.ebuild
+++ b/media-video/baka-mplayer/baka-mplayer-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-video/mpv[libmpv]
+	media-video/mpv:=[libmpv]
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..9ae547b9291f
--- /dev/null
+++ b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-libmpv-api2.patch
@@ -0,0 +1,78 @@
+https://github.com/u8sand/Baka-MPlayer/commit/7864f248c3f
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Mon, 21 Feb 2022 18:50:46 +0800
+Subject: [PATCH] Port away from deprecated/removed APIs in mpv 2.0
+
+Register observers as MPV_EVENT_IDLE is deprecated and
+MPV_EVENT_PAUSE/MPV_EVENT_UNPAUSE have been removed.
+--- a/src/mpvhandler.cpp
++++ b/src/mpvhandler.cpp
+@@ -41,6 +41,8 @@ MpvHandler::MpvHandler(int64_t wid, QObject *parent):
+     mpv_observe_property(mpv, 0, "sub-visibility", MPV_FORMAT_FLAG);
+     mpv_observe_property(mpv, 0, "mute", MPV_FORMAT_FLAG);
+     mpv_observe_property(mpv, 0, "core-idle", MPV_FORMAT_FLAG);
++    mpv_observe_property(mpv, 0, "idle-active", MPV_FORMAT_FLAG);
++    mpv_observe_property(mpv, 0, "pause", MPV_FORMAT_FLAG);
+     mpv_observe_property(mpv, 0, "paused-for-cache", MPV_FORMAT_FLAG);
+ 
+     // setup callback event handling
+@@ -191,6 +193,31 @@ bool MpvHandler::event(QEvent *event)
+                             ShowText(QString(), 0);
+                     }
+                 }
++                else if(QString(prop->name) == "idle-active")
++                {
++                    if(prop->format == MPV_FORMAT_FLAG)
++                    {
++                        if((bool)*(unsigned*)prop->data)
++                        {
++                            fileInfo.length = 0;
++                            setTime(0);
++                            setPlayState(Mpv::Idle);
++                        }
++                    }
++                }
++                else if(QString(prop->name) == "pause")
++                {
++                    if(prop->format == MPV_FORMAT_FLAG)
++                    {
++                        if((bool)*(unsigned*)prop->data)
++                        {
++                            setPlayState(Mpv::Paused);
++                            ShowText(QString(), 0);
++                        }
++                        else
++                            setPlayState(Mpv::Playing);
++                    }
++                }
+                 else if(QString(prop->name) == "paused-for-cache")
+                 {
+                     if(prop->format == MPV_FORMAT_FLAG)
+@@ -203,12 +230,7 @@ bool MpvHandler::event(QEvent *event)
+                 }
+                 break;
+             }
+-            case MPV_EVENT_IDLE:
+-                fileInfo.length = 0;
+-                setTime(0);
+-                setPlayState(Mpv::Idle);
+-                break;
+-                // these two look like they're reversed but they aren't. the names are misleading.
++            // these two look like they're reversed but they aren't. the names are misleading.
+             case MPV_EVENT_START_FILE:
+                 setPlayState(Mpv::Loaded);
+                 break;
+@@ -216,13 +238,6 @@ bool MpvHandler::event(QEvent *event)
+                 setPlayState(Mpv::Started);
+                 LoadFileInfo();
+                 SetProperties();
+-            case MPV_EVENT_UNPAUSE:
+-                setPlayState(Mpv::Playing);
+-                break;
+-            case MPV_EVENT_PAUSE:
+-                setPlayState(Mpv::Paused);
+-                ShowText(QString(), 0);
+-                break;
+             case MPV_EVENT_END_FILE:
+                 if(playState == Mpv::Loaded)
+                     ShowText(tr("File couldn't be opened"));