| 1 |
commit: 94cb7fe744cdc35d399b1390be9a3c6202e5821b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 4 22:37:09 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 4 22:37:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94cb7fe7 |
| 7 |
|
| 8 |
media-sound/clementine: Patch upstreamed |
| 9 |
|
| 10 |
Upstream commit 4ff370ce1ef41a8dc9b95a367c23eef43a918ad9 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
media-sound/clementine/clementine-9999.ebuild | 13 +++++++------ |
| 16 |
1 file changed, 7 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild |
| 19 |
index 78421f8b116..8fcba65622c 100644 |
| 20 |
--- a/media-sound/clementine/clementine-9999.ebuild |
| 21 |
+++ b/media-sound/clementine/clementine-9999.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Authors |
| 24 |
+# Copyright 1999-2019 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
@@ -11,9 +11,10 @@ if [[ ${PV} == *9999* ]]; then |
| 29 |
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
| 30 |
GIT_ECLASS="git-r3" |
| 31 |
else |
| 32 |
- SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz" |
| 33 |
+ COMMIT= |
| 34 |
+ SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
- S="${WORKDIR}/${MY_P^}" |
| 37 |
+ S="${WORKDIR}/${PN^}-${COMMIT}" |
| 38 |
fi |
| 39 |
inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} |
| 40 |
unset GIT_ECLASS |
| 41 |
@@ -50,7 +51,6 @@ COMMON_DEPEND=" |
| 42 |
>=media-libs/taglib-1.11.1_p20181028 |
| 43 |
sys-libs/zlib |
| 44 |
virtual/glu |
| 45 |
- virtual/opengl |
| 46 |
x11-libs/libX11 |
| 47 |
cdda? ( dev-libs/libcdio:= ) |
| 48 |
dbus? ( dev-qt/qtdbus:5 ) |
| 49 |
@@ -61,6 +61,7 @@ COMMON_DEPEND=" |
| 50 |
projectm? ( |
| 51 |
media-libs/glew:= |
| 52 |
>=media-libs/libprojectm-1.2.0 |
| 53 |
+ virtual/opengl |
| 54 |
) |
| 55 |
" |
| 56 |
# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; |
| 57 |
@@ -81,7 +82,6 @@ DEPEND="${COMMON_DEPEND} |
| 58 |
>=dev-cpp/gtest-1.8.0 |
| 59 |
dev-libs/boost |
| 60 |
dev-qt/linguist-tools:5 |
| 61 |
- dev-qt/qtopengl:5 |
| 62 |
dev-qt/qtx11extras:5 |
| 63 |
dev-qt/qtxml:5 |
| 64 |
sys-devel/gettext |
| 65 |
@@ -89,6 +89,7 @@ DEPEND="${COMMON_DEPEND} |
| 66 |
box? ( dev-cpp/sparsehash ) |
| 67 |
dropbox? ( dev-cpp/sparsehash ) |
| 68 |
googledrive? ( dev-cpp/sparsehash ) |
| 69 |
+ projectm? ( dev-qt/qtopengl:5 ) |
| 70 |
pulseaudio? ( media-sound/pulseaudio ) |
| 71 |
seafile? ( dev-cpp/sparsehash ) |
| 72 |
skydrive? ( dev-cpp/sparsehash ) |
| 73 |
@@ -136,7 +137,7 @@ src_configure() { |
| 74 |
-DLINGUAS="$(l10n_get_locales)" |
| 75 |
-DENABLE_BOX="$(usex box)" |
| 76 |
-DENABLE_AUDIOCD="$(usex cdda)" |
| 77 |
- -DENABLE_DBUS="$(usex dbus)" |
| 78 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus) |
| 79 |
-DENABLE_DROPBOX="$(usex dropbox)" |
| 80 |
-DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
| 81 |
-DENABLE_LIBGPOD="$(usex ipod)" |
Archives