| 1 |
commit: 44142fc80056385353aab409cb9a2c56e131bff7 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 28 07:31:17 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 28 07:31:28 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44142fc8 |
| 7 |
|
| 8 |
media-sound/kradio: EAPI 6, add libav use flag |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
.../kradio/files/kradio-4.0.7-include.patch | 4 ++-- |
| 13 |
media-sound/kradio/kradio-4.0.8.ebuild | 23 +++++++++++----------- |
| 14 |
2 files changed, 14 insertions(+), 13 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-sound/kradio/files/kradio-4.0.7-include.patch b/media-sound/kradio/files/kradio-4.0.7-include.patch |
| 17 |
index f5c2917..4a0d6aa 100644 |
| 18 |
--- a/media-sound/kradio/files/kradio-4.0.7-include.patch |
| 19 |
+++ b/media-sound/kradio/files/kradio-4.0.7-include.patch |
| 20 |
@@ -2,8 +2,8 @@ KDE4_INCLUDES also contains Qt includes required by KDE. |
| 21 |
See FindKDE4Internal.cmake for more details. |
| 22 |
|
| 23 |
Fixes Gentoo bug #510500. |
| 24 |
---- CMakeLists.txt |
| 25 |
-+++ CMakeLists.txt |
| 26 |
+--- a/CMakeLists.txt |
| 27 |
++++ b/CMakeLists.txt |
| 28 |
@@ -55,7 +55,7 @@ |
| 29 |
) |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/media-sound/kradio/kradio-4.0.8.ebuild b/media-sound/kradio/kradio-4.0.8.ebuild |
| 33 |
index 6d4c7eb..acd742a 100644 |
| 34 |
--- a/media-sound/kradio/kradio-4.0.8.ebuild |
| 35 |
+++ b/media-sound/kradio/kradio-4.0.8.ebuild |
| 36 |
@@ -1,8 +1,8 @@ |
| 37 |
-# Copyright 1999-2015 Gentoo Foundation |
| 38 |
+# Copyright 1999-2016 Gentoo Foundation |
| 39 |
# Distributed under the terms of the GNU General Public License v2 |
| 40 |
# $Id$ |
| 41 |
|
| 42 |
-EAPI=5 |
| 43 |
+EAPI=6 |
| 44 |
|
| 45 |
KDE_LINGUAS_DIR=( po convert-presets/po ) |
| 46 |
PLUGINS=( |
| 47 |
@@ -22,14 +22,15 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" |
| 48 |
LICENSE="GPL-2" |
| 49 |
KEYWORDS="~amd64 ~x86" |
| 50 |
SLOT="4" |
| 51 |
-IUSE="alsa debug encode ffmpeg lirc +mp3 +vorbis v4l" |
| 52 |
+IUSE="alsa debug encode ffmpeg libav lirc +mp3 +vorbis v4l" |
| 53 |
|
| 54 |
DEPEND=" |
| 55 |
media-libs/libsndfile |
| 56 |
alsa? ( media-libs/alsa-lib ) |
| 57 |
ffmpeg? ( |
| 58 |
>=media-libs/libmms-0.4 |
| 59 |
- virtual/ffmpeg |
| 60 |
+ libav? ( media-video/libav:= ) |
| 61 |
+ !libav? ( media-video/ffmpeg:0= ) |
| 62 |
) |
| 63 |
lirc? ( app-misc/lirc ) |
| 64 |
mp3? ( media-sound/lame ) |
| 65 |
@@ -61,13 +62,13 @@ src_prepare() { |
| 66 |
} |
| 67 |
|
| 68 |
src_configure() { |
| 69 |
- mycmakeargs=( |
| 70 |
- $(cmake-utils_use_with alsa) |
| 71 |
- $(cmake-utils_use_with ffmpeg) |
| 72 |
- $(cmake-utils_use_with lirc) |
| 73 |
- $(cmake-utils_use_with mp3 LAME) |
| 74 |
- $(cmake-utils_use_with vorbis OGG_VORBIS) |
| 75 |
- $(cmake-utils_use_with v4l V4L2) |
| 76 |
+ local mycmakeargs=( |
| 77 |
+ -DWITH_ALSA=$(usex alsa) |
| 78 |
+ -DWITH_FFMPEG=$(usex ffmpeg) |
| 79 |
+ -DWITH_LIRC=$(usex lirc) |
| 80 |
+ -DWITH_LAME=$(usex mp3) |
| 81 |
+ -DWITH_OGG_VORBIS=$(usex vorbis) |
| 82 |
+ -DWITH_V4L2=$(usex v4l) |
| 83 |
) |
| 84 |
|
| 85 |
kde4-base_src_configure |
Archives