| 1 |
commit: e250332ae287a8b438d028ba2dcfcf4471186dc0 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 2 00:12:29 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 2 00:37:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e250332a |
| 7 |
|
| 8 |
media-libs/phonon-gstreamer: DEPEND on >=Qt-4.8.7, warn on <GCC-5 |
| 9 |
|
| 10 |
Sort DEPENDs, switch Qt default |
| 11 |
|
| 12 |
Gentoo-bug: 595618 |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
| 15 |
|
| 16 |
...999.ebuild => phonon-gstreamer-4.9.0-r1.ebuild} | 22 +++++++++++++--------- |
| 17 |
.../phonon-gstreamer/phonon-gstreamer-9999.ebuild | 20 ++++++++++++-------- |
| 18 |
2 files changed, 25 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild |
| 21 |
similarity index 79% |
| 22 |
copy from media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild |
| 23 |
copy to media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild |
| 24 |
index 2bcb89acddb..3caf47c96cd 100644 |
| 25 |
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild |
| 26 |
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 1999-2016 Gentoo Foundation |
| 29 |
+# Copyright 1999-2017 Gentoo Foundation |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
EAPI=6 |
| 33 |
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV} |
| 34 |
|
| 35 |
if [[ ${PV} != *9999* ]]; then |
| 36 |
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz" |
| 37 |
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" |
| 38 |
+ KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" |
| 39 |
else |
| 40 |
EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) |
| 41 |
inherit git-r3 |
| 42 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://phonon.kde.org/" |
| 43 |
|
| 44 |
LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" |
| 45 |
SLOT="0" |
| 46 |
-IUSE="alsa debug +network +qt4 qt5" |
| 47 |
+IUSE="alsa debug +network qt4 +qt5" |
| 48 |
|
| 49 |
REQUIRED_USE="|| ( qt4 qt5 )" |
| 50 |
|
| 51 |
@@ -30,12 +30,14 @@ RDEPEND=" |
| 52 |
dev-libs/libxml2:2 |
| 53 |
media-libs/gstreamer:1.0 |
| 54 |
media-libs/gst-plugins-base:1.0 |
| 55 |
- media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] |
| 56 |
>=media-libs/phonon-4.9.0[qt4?,qt5?] |
| 57 |
+ media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] |
| 58 |
+ virtual/opengl |
| 59 |
+ network? ( media-plugins/gst-plugins-soup:1.0 ) |
| 60 |
qt4? ( |
| 61 |
- dev-qt/qtcore:4[glib] |
| 62 |
- dev-qt/qtgui:4[glib] |
| 63 |
- dev-qt/qtopengl:4 |
| 64 |
+ >=dev-qt/qtcore-4.8.7-r2:4[glib] |
| 65 |
+ >=dev-qt/qtgui-4.8.7:4[glib] |
| 66 |
+ >=dev-qt/qtopengl-4.8.7:4 |
| 67 |
!<dev-qt/qtwebkit-4.10.4:4[gstreamer] |
| 68 |
) |
| 69 |
qt5? ( |
| 70 |
@@ -45,14 +47,16 @@ RDEPEND=" |
| 71 |
dev-qt/qtwidgets:5 |
| 72 |
dev-qt/qtx11extras:5 |
| 73 |
) |
| 74 |
- virtual/opengl |
| 75 |
- network? ( media-plugins/gst-plugins-soup:1.0 ) |
| 76 |
" |
| 77 |
DEPEND="${RDEPEND} |
| 78 |
virtual/pkgconfig |
| 79 |
" |
| 80 |
|
| 81 |
pkg_setup() { |
| 82 |
+ if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then |
| 83 |
+ ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" |
| 84 |
+ fi |
| 85 |
+ |
| 86 |
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
| 87 |
} |
| 88 |
|
| 89 |
|
| 90 |
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild |
| 91 |
index 2bcb89acddb..8a7cb1f9533 100644 |
| 92 |
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild |
| 93 |
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild |
| 94 |
@@ -1,4 +1,4 @@ |
| 95 |
-# Copyright 1999-2016 Gentoo Foundation |
| 96 |
+# Copyright 1999-2017 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
|
| 99 |
EAPI=6 |
| 100 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://phonon.kde.org/" |
| 101 |
|
| 102 |
LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" |
| 103 |
SLOT="0" |
| 104 |
-IUSE="alsa debug +network +qt4 qt5" |
| 105 |
+IUSE="alsa debug +network qt4 +qt5" |
| 106 |
|
| 107 |
REQUIRED_USE="|| ( qt4 qt5 )" |
| 108 |
|
| 109 |
@@ -30,12 +30,14 @@ RDEPEND=" |
| 110 |
dev-libs/libxml2:2 |
| 111 |
media-libs/gstreamer:1.0 |
| 112 |
media-libs/gst-plugins-base:1.0 |
| 113 |
- media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] |
| 114 |
>=media-libs/phonon-4.9.0[qt4?,qt5?] |
| 115 |
+ media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] |
| 116 |
+ virtual/opengl |
| 117 |
+ network? ( media-plugins/gst-plugins-soup:1.0 ) |
| 118 |
qt4? ( |
| 119 |
- dev-qt/qtcore:4[glib] |
| 120 |
- dev-qt/qtgui:4[glib] |
| 121 |
- dev-qt/qtopengl:4 |
| 122 |
+ >=dev-qt/qtcore-4.8.7-r2:4[glib] |
| 123 |
+ >=dev-qt/qtgui-4.8.7:4[glib] |
| 124 |
+ >=dev-qt/qtopengl-4.8.7:4 |
| 125 |
!<dev-qt/qtwebkit-4.10.4:4[gstreamer] |
| 126 |
) |
| 127 |
qt5? ( |
| 128 |
@@ -45,14 +47,16 @@ RDEPEND=" |
| 129 |
dev-qt/qtwidgets:5 |
| 130 |
dev-qt/qtx11extras:5 |
| 131 |
) |
| 132 |
- virtual/opengl |
| 133 |
- network? ( media-plugins/gst-plugins-soup:1.0 ) |
| 134 |
" |
| 135 |
DEPEND="${RDEPEND} |
| 136 |
virtual/pkgconfig |
| 137 |
" |
| 138 |
|
| 139 |
pkg_setup() { |
| 140 |
+ if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then |
| 141 |
+ ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" |
| 142 |
+ fi |
| 143 |
+ |
| 144 |
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
| 145 |
} |
Archives