commit: 3f64f82d3252a8b5085361d8e4d82e0a1dede484
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 17:25:08 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 19:28:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f64f82d
media-video/vidcutter: use mpv slot, backport api 2.0 fix
libmpv.so.1 -> libmpv.so.2
opengl_cb been deprecated for ~3 years and is now gone, this
backports a rough update to pympv (thus the large patch).
*looks* fine but I don't use this to really know.
Unlike other packages, this also breaks compatibility with
stable libmpv at runtime (due to a version check). And upstream
also seem to have went back & forth with this (broken again
on current master). Thus the conditional patching for now.
Since this changes nothing for stable, went straight-to.
At same time also ${P} -> ${PF} for docdir as revisions are
installing docs in the wrong place.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-video/vidcutter/Manifest | 1 +
...r-6.0.5.1-r1.ebuild => vidcutter-6.0.5.1-r2.ebuild} | 18 +++++++++++++++---
media-video/vidcutter/vidcutter-9999.ebuild | 8 ++++----
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
index 4284977ada99..8c9575a6b569 100644
--- a/media-video/vidcutter/Manifest
+++ b/media-video/vidcutter/Manifest
@@ -1 +1,2 @@
+DIST vidcutter-6.0.5.1-libmpv-api2.patch 2327139 BLAKE2B
c2665e2c501a19db86a25145da39e6990843fb11a7bdf3170ec7e268e23a23abb21cd8d4b459a4c862ffc27756106d81e7d9b5d58bf3417fd787c03528eba770
SHA512
063908bf939c03952d623cc0ae7ea301d4605660a548e3088f6c901f3d98cf13a5e49180414c8a1c05931d9c4ca2a251858951676632768ff30954a6df7a4e4a
DIST vidcutter-6.0.5.1.tar.gz 9909274 BLAKE2B
063c20f6ae0565b0f3a160b5ee298aae05b2ee1876cd4c73d9f37578a9e86a872353c3e2b7b1b6302db3d5a876139bfb19d50bf7cb4dd18e6e1d1a1ca3587fbd
SHA512
f2ea2a86d9eaa3c6593e785daad6869c151baa1add529c9edaf2282f7acad762fbb29804790aece5e4fcd89e9e9bc77f61d1f0b68a1b1f3ecf58951ee8f200e9
diff --git a/media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild
b/media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild
similarity index 60%
rename from media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild
rename to media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild
index a94a18c5e7bf..87cdb433df76 100644
--- a/media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild
+++ b/media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 xdg
@@ -15,6 +15,7 @@ if [[ ${PV} == 9999 ]];then
EGIT_REPO_URI="https://github.com/ozmartian/vidcutter";
else
SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ SRC_URI+="
https://github.com/ozmartian/${PN}/commit/1d88825feb5a73a50d019914ba9d0008562a58ce.patch
-> ${P}-libmpv-api2.patch"
KEYWORDS="amd64 x86"
fi
@@ -23,7 +24,7 @@ SLOT="0"
IUSE=""
DEPEND="
- >=media-video/mpv-0.25[libmpv]
+ >=media-video/mpv-0.25:=[libmpv]
"
RDEPEND="${DEPEND}
>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}]
@@ -35,7 +36,18 @@ BDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+src_prepare() {
+ # needed for mpv:0/2 but breaks stable mpv:0/0, do conditional patching
+ # for now (we can do has_version given the := binding operator)
+ # https://github.com/ozmartian/vidcutter/issues/345
+ if has_version -d 'media-video/mpv:0/2'; then
+ eapply "${DISTDIR}"/${P}-libmpv-api2.patch
+ fi
+
+ distutils-r1_src_prepare
+}
+
src_install() {
distutils-r1_src_install
- mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+ mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
}
diff --git a/media-video/vidcutter/vidcutter-9999.ebuild
b/media-video/vidcutter/vidcutter-9999.ebuild
index 383061cd1bcc..cb619436f0cf 100644
--- a/media-video/vidcutter/vidcutter-9999.ebuild
+++ b/media-video/vidcutter/vidcutter-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 xdg
@@ -23,7 +23,7 @@ SLOT="0"
IUSE=""
DEPEND="
- >=media-video/mpv-0.25[libmpv]
+ >=media-video/mpv-0.25:=[libmpv]
"
RDEPEND="${DEPEND}
>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}]
@@ -37,5 +37,5 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
src_install() {
distutils-r1_src_install
- mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+ mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
}
