| 1 |
commit: 54f292dd59cc6cceec9dc1cf24c0fa213a6e0b19 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 25 21:14:35 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 25 21:14:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f292dd |
| 7 |
|
| 8 |
media-sound/amarok: USE ffmpeg -> libav, needs slot ops if USE=ofa |
| 9 |
|
| 10 |
Small min versions cleanup. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
media-sound/amarok/amarok-9999.ebuild | 20 +++++++++++--------- |
| 16 |
1 file changed, 11 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild |
| 19 |
index 58fdd12eba..24231ebbd1 100644 |
| 20 |
--- a/media-sound/amarok/amarok-9999.ebuild |
| 21 |
+++ b/media-sound/amarok/amarok-9999.ebuild |
| 22 |
@@ -10,7 +10,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks" |
| 23 |
HOMEPAGE="https://amarok.kde.org/" |
| 24 |
|
| 25 |
LICENSE="GPL-2" |
| 26 |
-IUSE="ffmpeg ipod lastfm mtp ofa podcast wikipedia" |
| 27 |
+IUSE="ipod lastfm libav mtp ofa podcast wikipedia" |
| 28 |
|
| 29 |
# ipod requires gdk enabled and also gtk compiled in libgpod |
| 30 |
BDEPEND="virtual/pkgconfig" |
| 31 |
@@ -56,27 +56,29 @@ DEPEND=" |
| 32 |
app-crypt/qca:2[qt5(+)] |
| 33 |
dev-db/mysql-connector-c:= |
| 34 |
media-libs/phonon[qt5(+)] |
| 35 |
- >=media-libs/taglib-1.7[asf(+),mp4(+)] |
| 36 |
- >=media-libs/taglib-extras-1.0.1 |
| 37 |
+ media-libs/taglib |
| 38 |
+ media-libs/taglib-extras |
| 39 |
sci-libs/fftw:3.0 |
| 40 |
sys-libs/zlib |
| 41 |
virtual/opengl |
| 42 |
- ffmpeg? ( |
| 43 |
- virtual/ffmpeg |
| 44 |
- ofa? ( >=media-libs/libofa-0.9.0 ) |
| 45 |
+ ofa? ( |
| 46 |
+ media-libs/libofa |
| 47 |
+ !libav? ( media-video/ffmpeg:= ) |
| 48 |
+ libav? ( media-video/libav:= ) |
| 49 |
) |
| 50 |
ipod? ( |
| 51 |
dev-libs/glib:2 |
| 52 |
- >=media-libs/libgpod-0.7.0[gtk] |
| 53 |
+ media-libs/libgpod[gtk] |
| 54 |
) |
| 55 |
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) |
| 56 |
- mtp? ( >=media-libs/libmtp-1.0.0 ) |
| 57 |
- podcast? ( >=media-libs/libmygpo-qt-1.0.9[qt5(+)] ) |
| 58 |
+ mtp? ( media-libs/libmtp ) |
| 59 |
+ podcast? ( >=media-libs/libmygpo-qt-1.0.9_p20180307 ) |
| 60 |
wikipedia? ( $(add_qt_dep qtwebengine) ) |
| 61 |
" |
| 62 |
RDEPEND="${DEPEND} |
| 63 |
!media-sound/amarok:4 |
| 64 |
$(add_qt_dep qtquickcontrols2) |
| 65 |
+ !ofa? ( virtual/ffmpeg ) |
| 66 |
" |
| 67 |
|
| 68 |
PATCHES=( "${FILESDIR}"/${PN}-2.8.90-mysqld-rpath.patch ) |
Archives