Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/
Date: Tue, 26 Feb 2019 11:55:04
Message-Id: 1551182091.6527a3959ec314a76c09376c077ba7eeaebc05ee.asturm@gentoo
1 commit: 6527a3959ec314a76c09376c077ba7eeaebc05ee
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 26 11:54:28 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 26 11:54:51 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6527a395
7
8 media-sound/amarok: Drop obsolete use of ffmpeg in cmake args
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 media-sound/amarok/amarok-9999.ebuild | 9 ++++-----
14 1 file changed, 4 insertions(+), 5 deletions(-)
15
16 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
17 index 24231ebbd1..89c092f05d 100644
18 --- a/media-sound/amarok/amarok-9999.ebuild
19 +++ b/media-sound/amarok/amarok-9999.ebuild
20 @@ -61,15 +61,15 @@ DEPEND="
21 sci-libs/fftw:3.0
22 sys-libs/zlib
23 virtual/opengl
24 + ipod? (
25 + dev-libs/glib:2
26 + media-libs/libgpod[gtk]
27 + )
28 ofa? (
29 media-libs/libofa
30 !libav? ( media-video/ffmpeg:= )
31 libav? ( media-video/libav:= )
32 )
33 - ipod? (
34 - dev-libs/glib:2
35 - media-libs/libgpod[gtk]
36 - )
37 lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
38 mtp? ( media-libs/libmtp )
39 podcast? ( >=media-libs/libmygpo-qt-1.0.9_p20180307 )
40 @@ -90,7 +90,6 @@ src_configure() {
41 -DWITH_UTILITIES=ON
42 -DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
43 -DWITH_MYSQL_EMBEDDED=OFF
44 - $(cmake-utils_use_find_package ffmpeg FFmpeg)
45 -DWITH_IPOD=$(usex ipod)
46 $(cmake-utils_use_find_package lastfm LibLastFm)
47 $(cmake-utils_use_find_package mtp Mtp)