| 1 |
commit: 71d1668774c2d0752b6b54bf9eda5a7604d812fe |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 25 21:42:16 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 25 22:45:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d16687 |
| 7 |
|
| 8 |
media-sound/qmmp: USE: kde->dbus; add gnome,libav,sid,qtmedia; drop mpris |
| 9 |
|
| 10 |
virtual/ffmpeg -> ffmpeg/libav |
| 11 |
Consolidate USE kde, mpris into one dbus flag |
| 12 |
Add USE=gnome to get full control over optional dev-qt/qtdbus DEPEND |
| 13 |
Add USE=qtmedia to control missing dev-qt/qtmultimedia DEPEND |
| 14 |
Add missing DEPENDs: dev-libs/libcdio, x11-libs/libX11 |
| 15 |
Sort IUSE, DEPENDs |
| 16 |
CMAKE_IN_SOURCE_BUILD seems not necessary anymore. |
| 17 |
metadata.xml: Indentation |
| 18 |
|
| 19 |
Gentoo-bug: 610838 |
| 20 |
|
| 21 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 22 |
|
| 23 |
media-sound/qmmp/metadata.xml | 60 ++++++++++++++++--------------- |
| 24 |
media-sound/qmmp/qmmp-9999.ebuild | 76 ++++++++++++++++++++++++--------------- |
| 25 |
2 files changed, 79 insertions(+), 57 deletions(-) |
| 26 |
|
| 27 |
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml |
| 28 |
index 81b6c44ec5..9e4d00ae58 100644 |
| 29 |
--- a/media-sound/qmmp/metadata.xml |
| 30 |
+++ b/media-sound/qmmp/metadata.xml |
| 31 |
@@ -1,33 +1,37 @@ |
| 32 |
<?xml version="1.0" encoding="UTF-8"?> |
| 33 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 34 |
<pkgmetadata> |
| 35 |
- <maintainer type="person"> |
| 36 |
- <email>hwoarang@g.o</email> |
| 37 |
- <name>Markos Chandras</name> |
| 38 |
+ <maintainer type="person"> |
| 39 |
+ <email>hwoarang@g.o</email> |
| 40 |
+ <name>Markos Chandras</name> |
| 41 |
+ </maintainer> |
| 42 |
+ <maintainer type="project"> |
| 43 |
+ <email>sound@g.o</email> |
| 44 |
+ <name>Gentoo Sound project</name> |
| 45 |
</maintainer> |
| 46 |
- <maintainer type="project"> |
| 47 |
- <email>sound@g.o</email> |
| 48 |
- <name>Gentoo Sound project</name> |
| 49 |
- </maintainer> |
| 50 |
- <use> |
| 51 |
- <flag name="analyzer">Enable visual analyzer</flag> |
| 52 |
- <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag> |
| 53 |
- <flag name="crossfade">Enable crossfade effect when switching tracks</flag> |
| 54 |
- <flag name="cover">Enable album cover support</flag> |
| 55 |
- <flag name="cue">enable CUE sheet parsing</flag> |
| 56 |
- <flag name="enca">Detects the character encoding automatically</flag> |
| 57 |
- <flag name="game">Enable Game music support</flag> |
| 58 |
- <flag name="lyrics">Fetch track lyrics from the web</flag> |
| 59 |
- <flag name="midi">Enable midi support using wildmidi library</flag> |
| 60 |
- <flag name="mpris">Enable MPRIS support</flag> |
| 61 |
- <flag name="notifier">Enable qmmps' notifier system</flag> |
| 62 |
- <flag name="opus">Enable the opus plugin</flag> |
| 63 |
- <flag name="qsui">Enable QMMP simple UI</flag> |
| 64 |
- <flag name="stereo">Enable stereo effect</flag> |
| 65 |
- <flag name="tray">Build tray icon</flag> |
| 66 |
- <flag name="kde">Use kde4 notifier system</flag> |
| 67 |
- <flag name="projectm">Enable projectm music visualization plugin</flag> |
| 68 |
- <flag name="scrobbler">Enable audioscrobbler/last.fm support</flag> |
| 69 |
- <flag name="soxr">Use the SoX resampling library</flag> |
| 70 |
- </use> |
| 71 |
+ <use> |
| 72 |
+ <flag name="analyzer">Enable visual analyzer</flag> |
| 73 |
+ <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag> |
| 74 |
+ <flag name="cover">Enable album cover support</flag> |
| 75 |
+ <flag name="crossfade">Enable crossfade effect when switching tracks</flag> |
| 76 |
+ <flag name="cue">enable CUE sheet parsing</flag> |
| 77 |
+ <flag name="dbus">Enable DBus notifiications and MPRIS support</flag> |
| 78 |
+ <flag name="enca">Detects the character encoding automatically</flag> |
| 79 |
+ <flag name="game">Enable Game music support</flag> |
| 80 |
+ <flag name="gnome">Enable Gnome hotkey support (requires Qt5DBus)</flag> |
| 81 |
+ <flag name="kde">Use kde4 notifier system</flag> |
| 82 |
+ <flag name="lyrics">Fetch track lyrics from the web</flag> |
| 83 |
+ <flag name="midi">Enable midi support using wildmidi library</flag> |
| 84 |
+ <flag name="mpris">Enable MPRIS support</flag> |
| 85 |
+ <flag name="notifier">Enable qmmps' notifier system</flag> |
| 86 |
+ <flag name="opus">Enable the opus plugin</flag> |
| 87 |
+ <flag name="projectm">Enable projectm music visualization plugin</flag> |
| 88 |
+ <flag name="qsui">Enable QMMP simple UI</flag> |
| 89 |
+ <flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag> |
| 90 |
+ <flag name="scrobbler">Enable audioscrobbler/last.fm support</flag> |
| 91 |
+ <flag name="sid">Build with SID (Commodore 64 Audio) support</flag> |
| 92 |
+ <flag name="soxr">Use the SoX resampling library</flag> |
| 93 |
+ <flag name="stereo">Enable stereo effect</flag> |
| 94 |
+ <flag name="tray">Build tray icon</flag> |
| 95 |
+ </use> |
| 96 |
</pkgmetadata> |
| 97 |
|
| 98 |
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild |
| 99 |
index 488c726cc4..be65bb4516 100644 |
| 100 |
--- a/media-sound/qmmp/qmmp-9999.ebuild |
| 101 |
+++ b/media-sound/qmmp/qmmp-9999.ebuild |
| 102 |
@@ -1,76 +1,91 @@ |
| 103 |
-# Copyright 1999-2016 Gentoo Foundation |
| 104 |
+# Copyright 1999-2017 Gentoo Foundation |
| 105 |
# Distributed under the terms of the GNU General Public License v2 |
| 106 |
# $Id$ |
| 107 |
|
| 108 |
EAPI=6 |
| 109 |
|
| 110 |
inherit cmake-utils |
| 111 |
-[ "$PV" == "9999" ] && inherit subversion |
| 112 |
+[[ ${PV} = 9999 ]] && inherit subversion |
| 113 |
|
| 114 |
DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" |
| 115 |
HOMEPAGE="http://qmmp.ylsoftware.com" |
| 116 |
-if [ "$PV" != "9999" ]; then |
| 117 |
+if [[ ${PV} != 9999 ]]; then |
| 118 |
SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2" |
| 119 |
KEYWORDS="~amd64 ~x86" |
| 120 |
else |
| 121 |
QMMP_DEV_BRANCH="1.1" |
| 122 |
- SRC_URI="" |
| 123 |
ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}" |
| 124 |
- KEYWORDS="" |
| 125 |
fi |
| 126 |
|
| 127 |
LICENSE="GPL-2" |
| 128 |
SLOT="0" |
| 129 |
# KEYWORDS further up |
| 130 |
-IUSE="analyzer aac +alsa bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa |
| 131 |
-lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm |
| 132 |
-pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack" |
| 133 |
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome |
| 134 |
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm |
| 135 |
+pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack" |
| 136 |
|
| 137 |
-RDEPEND="media-libs/taglib |
| 138 |
+RDEPEND=" |
| 139 |
dev-qt/qtcore:5 |
| 140 |
- dev-qt/qtdbus:5 |
| 141 |
dev-qt/qtgui:5 |
| 142 |
dev-qt/qtnetwork:5 |
| 143 |
dev-qt/qtwidgets:5 |
| 144 |
dev-qt/qtx11extras:5 |
| 145 |
+ media-libs/taglib |
| 146 |
+ x11-libs/libX11 |
| 147 |
+ aac? ( media-libs/faad2 ) |
| 148 |
alsa? ( media-libs/alsa-lib ) |
| 149 |
bs2b? ( media-libs/libbs2b ) |
| 150 |
- cdda? ( dev-libs/libcdio-paranoia ) |
| 151 |
+ cdda? ( |
| 152 |
+ dev-libs/libcdio |
| 153 |
+ dev-libs/libcdio-paranoia |
| 154 |
+ ) |
| 155 |
cue? ( media-libs/libcue ) |
| 156 |
curl? ( net-misc/curl ) |
| 157 |
- aac? ( media-libs/faad2 ) |
| 158 |
+ dbus? ( dev-qt/qtdbus:5 ) |
| 159 |
enca? ( app-i18n/enca ) |
| 160 |
+ ffmpeg? ( |
| 161 |
+ !libav? ( media-video/ffmpeg:= ) |
| 162 |
+ libav? ( media-video/libav:= ) |
| 163 |
+ ) |
| 164 |
flac? ( media-libs/flac ) |
| 165 |
game? ( media-libs/game-music-emu ) |
| 166 |
+ jack? ( |
| 167 |
+ media-libs/libsamplerate |
| 168 |
+ media-sound/jack-audio-connection-kit |
| 169 |
+ ) |
| 170 |
ladspa? ( media-libs/ladspa-cmt ) |
| 171 |
mad? ( media-libs/libmad ) |
| 172 |
midi? ( media-sound/wildmidi ) |
| 173 |
mms? ( media-libs/libmms ) |
| 174 |
+ modplug? ( >=media-libs/libmodplug-0.8.4 ) |
| 175 |
mplayer? ( media-video/mplayer ) |
| 176 |
- mpris? ( dev-qt/qtdbus:5 ) |
| 177 |
musepack? ( >=media-sound/musepack-tools-444 ) |
| 178 |
- modplug? ( >=media-libs/libmodplug-0.8.4 ) |
| 179 |
- vorbis? ( media-libs/libvorbis |
| 180 |
- media-libs/libogg ) |
| 181 |
- jack? ( media-sound/jack-audio-connection-kit |
| 182 |
- media-libs/libsamplerate ) |
| 183 |
- ffmpeg? ( virtual/ffmpeg ) |
| 184 |
opus? ( media-libs/opusfile ) |
| 185 |
- projectm? ( media-libs/libprojectm |
| 186 |
+ projectm? ( |
| 187 |
+ dev-qt/qtgui:5[-gles2] |
| 188 |
dev-qt/qtopengl:5 |
| 189 |
- dev-qt/qtgui:5[-gles2] ) |
| 190 |
+ media-libs/libprojectm |
| 191 |
+ ) |
| 192 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) |
| 193 |
- wavpack? ( media-sound/wavpack ) |
| 194 |
+ qtmedia? ( dev-qt/qtmultimedia:5 ) |
| 195 |
scrobbler? ( net-misc/curl ) |
| 196 |
sndfile? ( media-libs/libsndfile ) |
| 197 |
+ sid? ( >=media-libs/libsidplayfp-1.1.0 ) |
| 198 |
soxr? ( media-libs/soxr ) |
| 199 |
- udisks? ( sys-fs/udisks:2 )" |
| 200 |
+ udisks? ( sys-fs/udisks:2 ) |
| 201 |
+ vorbis? ( |
| 202 |
+ media-libs/libogg |
| 203 |
+ media-libs/libvorbis |
| 204 |
+ ) |
| 205 |
+ wavpack? ( media-sound/wavpack ) |
| 206 |
+" |
| 207 |
DEPEND="${RDEPEND} |
| 208 |
- dev-qt/linguist-tools:5" |
| 209 |
+ dev-qt/linguist-tools:5 |
| 210 |
+" |
| 211 |
|
| 212 |
-DOCS="AUTHORS ChangeLog README" |
| 213 |
+DOCS=( AUTHORS ChangeLog README ) |
| 214 |
|
| 215 |
-CMAKE_IN_SOURCE_BUILD="1" |
| 216 |
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )" |
| 217 |
|
| 218 |
src_prepare() { |
| 219 |
if has_version dev-libs/libcdio-paranoia; then |
| 220 |
@@ -83,7 +98,7 @@ src_prepare() { |
| 221 |
} |
| 222 |
|
| 223 |
src_configure() { |
| 224 |
- mycmakeargs=( |
| 225 |
+ local mycmakeargs=( |
| 226 |
-DUSE_ALSA="$(usex alsa)" |
| 227 |
-DUSE_AAC="$(usex aac)" |
| 228 |
-DUSE_ANALYZER="$(usex analyzer)" |
| 229 |
@@ -97,9 +112,10 @@ src_configure() { |
| 230 |
-DUSE_FFMPEG="$(usex ffmpeg)" |
| 231 |
-DUSE_FLAC="$(usex flac)" |
| 232 |
-DUSE_GME="$(usex game)" |
| 233 |
+ -DUSE_GNOMEHOTKEY="$(usex gnome)" |
| 234 |
-DUSE_HAL=OFF |
| 235 |
-DUSE_JACK="$(usex jack)" |
| 236 |
- -DUSE_KDENOTIFY="$(usex kde)" |
| 237 |
+ -DUSE_KDENOTIFY="$(usex dbus)" |
| 238 |
-DUSE_LADSPA="$(usex ladspa)" |
| 239 |
-DUSE_LYRICS="$(usex lyrics)" |
| 240 |
-DUSE_MAD="$(usex mad)" |
| 241 |
@@ -107,7 +123,7 @@ src_configure() { |
| 242 |
-DUSE_MPLAYER="$(usex mplayer)" |
| 243 |
-DUSE_MMS="$(usex mms)" |
| 244 |
-DUSE_MODPLUG="$(usex modplug)" |
| 245 |
- -DUSE_MPRIS="$(usex mpris)" |
| 246 |
+ -DUSE_MPRIS="$(usex dbus)" |
| 247 |
-DUSE_MPC="$(usex musepack)" |
| 248 |
-DUSE_NOTIFIER="$(usex notifier)" |
| 249 |
-DUSE_OPUS="$(usex opus)" |
| 250 |
@@ -115,7 +131,9 @@ src_configure() { |
| 251 |
-DUSE_PROJECTM="$(usex projectm)" |
| 252 |
-DUSE_PULSE="$(usex pulseaudio)" |
| 253 |
-DUSE_QSUI="$(usex qsui)" |
| 254 |
+ -DUSE_QTMULTIMEDIA="$(usex qtmedia)" |
| 255 |
-DUSE_SCROBBLER="$(usex scrobbler)" |
| 256 |
+ -DUSE_SID="$(usex sid)" |
| 257 |
-DUSE_SNDFILE="$(usex sndfile)" |
| 258 |
-DUSE_SOXR="$(usex soxr)" |
| 259 |
-DUSE_STEREO="$(usex stereo)" |
Archives