| 1 |
commit: 3f64f82d3252a8b5085361d8e4d82e0a1dede484 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 6 17:25:08 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 7 19:28:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f64f82d |
| 7 |
|
| 8 |
media-video/vidcutter: use mpv slot, backport api 2.0 fix |
| 9 |
|
| 10 |
libmpv.so.1 -> libmpv.so.2 |
| 11 |
|
| 12 |
opengl_cb been deprecated for ~3 years and is now gone, this |
| 13 |
backports a rough update to pympv (thus the large patch). |
| 14 |
*looks* fine but I don't use this to really know. |
| 15 |
|
| 16 |
Unlike other packages, this also breaks compatibility with |
| 17 |
stable libmpv at runtime (due to a version check). And upstream |
| 18 |
also seem to have went back & forth with this (broken again |
| 19 |
on current master). Thus the conditional patching for now. |
| 20 |
Since this changes nothing for stable, went straight-to. |
| 21 |
|
| 22 |
At same time also ${P} -> ${PF} for docdir as revisions are |
| 23 |
installing docs in the wrong place. |
| 24 |
|
| 25 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 26 |
|
| 27 |
media-video/vidcutter/Manifest | 1 + |
| 28 |
...r-6.0.5.1-r1.ebuild => vidcutter-6.0.5.1-r2.ebuild} | 18 +++++++++++++++--- |
| 29 |
media-video/vidcutter/vidcutter-9999.ebuild | 8 ++++---- |
| 30 |
3 files changed, 20 insertions(+), 7 deletions(-) |
| 31 |
|
| 32 |
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest |
| 33 |
index 4284977ada99..8c9575a6b569 100644 |
| 34 |
--- a/media-video/vidcutter/Manifest |
| 35 |
+++ b/media-video/vidcutter/Manifest |
| 36 |
@@ -1 +1,2 @@ |
| 37 |
+DIST vidcutter-6.0.5.1-libmpv-api2.patch 2327139 BLAKE2B c2665e2c501a19db86a25145da39e6990843fb11a7bdf3170ec7e268e23a23abb21cd8d4b459a4c862ffc27756106d81e7d9b5d58bf3417fd787c03528eba770 SHA512 063908bf939c03952d623cc0ae7ea301d4605660a548e3088f6c901f3d98cf13a5e49180414c8a1c05931d9c4ca2a251858951676632768ff30954a6df7a4e4a |
| 38 |
DIST vidcutter-6.0.5.1.tar.gz 9909274 BLAKE2B 063c20f6ae0565b0f3a160b5ee298aae05b2ee1876cd4c73d9f37578a9e86a872353c3e2b7b1b6302db3d5a876139bfb19d50bf7cb4dd18e6e1d1a1ca3587fbd SHA512 f2ea2a86d9eaa3c6593e785daad6869c151baa1add529c9edaf2282f7acad762fbb29804790aece5e4fcd89e9e9bc77f61d1f0b68a1b1f3ecf58951ee8f200e9 |
| 39 |
|
| 40 |
diff --git a/media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild b/media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild |
| 41 |
similarity index 60% |
| 42 |
rename from media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild |
| 43 |
rename to media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild |
| 44 |
index a94a18c5e7bf..87cdb433df76 100644 |
| 45 |
--- a/media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild |
| 46 |
+++ b/media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild |
| 47 |
@@ -3,7 +3,7 @@ |
| 48 |
|
| 49 |
EAPI=7 |
| 50 |
|
| 51 |
-PYTHON_COMPAT=( python3_{7..10} ) |
| 52 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 53 |
|
| 54 |
inherit distutils-r1 xdg |
| 55 |
|
| 56 |
@@ -15,6 +15,7 @@ if [[ ${PV} == 9999 ]];then |
| 57 |
EGIT_REPO_URI="https://github.com/ozmartian/vidcutter" |
| 58 |
else |
| 59 |
SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 60 |
+ SRC_URI+=" https://github.com/ozmartian/${PN}/commit/1d88825feb5a73a50d019914ba9d0008562a58ce.patch -> ${P}-libmpv-api2.patch" |
| 61 |
KEYWORDS="amd64 x86" |
| 62 |
fi |
| 63 |
|
| 64 |
@@ -23,7 +24,7 @@ SLOT="0" |
| 65 |
IUSE="" |
| 66 |
|
| 67 |
DEPEND=" |
| 68 |
- >=media-video/mpv-0.25[libmpv] |
| 69 |
+ >=media-video/mpv-0.25:=[libmpv] |
| 70 |
" |
| 71 |
RDEPEND="${DEPEND} |
| 72 |
>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] |
| 73 |
@@ -35,7 +36,18 @@ BDEPEND=" |
| 74 |
dev-python/setuptools[${PYTHON_USEDEP}]" |
| 75 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 76 |
|
| 77 |
+src_prepare() { |
| 78 |
+ # needed for mpv:0/2 but breaks stable mpv:0/0, do conditional patching |
| 79 |
+ # for now (we can do has_version given the := binding operator) |
| 80 |
+ # https://github.com/ozmartian/vidcutter/issues/345 |
| 81 |
+ if has_version -d 'media-video/mpv:0/2'; then |
| 82 |
+ eapply "${DISTDIR}"/${P}-libmpv-api2.patch |
| 83 |
+ fi |
| 84 |
+ |
| 85 |
+ distutils-r1_src_prepare |
| 86 |
+} |
| 87 |
+ |
| 88 |
src_install() { |
| 89 |
distutils-r1_src_install |
| 90 |
- mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" |
| 91 |
+ mv "${ED}"/usr/share/doc/{${PN},${PF}} || die |
| 92 |
} |
| 93 |
|
| 94 |
diff --git a/media-video/vidcutter/vidcutter-9999.ebuild b/media-video/vidcutter/vidcutter-9999.ebuild |
| 95 |
index 383061cd1bcc..cb619436f0cf 100644 |
| 96 |
--- a/media-video/vidcutter/vidcutter-9999.ebuild |
| 97 |
+++ b/media-video/vidcutter/vidcutter-9999.ebuild |
| 98 |
@@ -1,9 +1,9 @@ |
| 99 |
-# Copyright 1999-2021 Gentoo Authors |
| 100 |
+# Copyright 1999-2022 Gentoo Authors |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
|
| 103 |
EAPI=7 |
| 104 |
|
| 105 |
-PYTHON_COMPAT=( python3_{7..10} ) |
| 106 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 107 |
|
| 108 |
inherit distutils-r1 xdg |
| 109 |
|
| 110 |
@@ -23,7 +23,7 @@ SLOT="0" |
| 111 |
IUSE="" |
| 112 |
|
| 113 |
DEPEND=" |
| 114 |
- >=media-video/mpv-0.25[libmpv] |
| 115 |
+ >=media-video/mpv-0.25:=[libmpv] |
| 116 |
" |
| 117 |
RDEPEND="${DEPEND} |
| 118 |
>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] |
| 119 |
@@ -37,5 +37,5 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 120 |
|
| 121 |
src_install() { |
| 122 |
distutils-r1_src_install |
| 123 |
- mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" |
| 124 |
+ mv "${ED}"/usr/share/doc/{${PN},${PF}} || die |
| 125 |
} |
Archives