commit: 1fb075db6d8cae32e04c87d06f12092f424460f9
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 4 19:49:16 2016 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 19:51:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb075db
media-sound/qmmp: Capitalize cmake options
Gentoo-Bug: 576592, 601526
Package-Manager: portage-2.3.2
.../{qmmp-1.0.10.ebuild => qmmp-1.0.10-r1.ebuild} | 60 +++++++++---------
media-sound/qmmp/qmmp-9999.ebuild | 74 ++++++++++------------
2 files changed, 65 insertions(+), 69 deletions(-)
diff --git a/media-sound/qmmp/qmmp-1.0.10.ebuild
b/media-sound/qmmp/qmmp-1.0.10-r1.ebuild
similarity index 75%
rename from media-sound/qmmp/qmmp-1.0.10.ebuild
rename to media-sound/qmmp/qmmp-1.0.10-r1.ebuild
index 0713ab9..902fb39 100644
--- a/media-sound/qmmp/qmmp-1.0.10.ebuild
+++ b/media-sound/qmmp/qmmp-1.0.10-r1.ebuild
@@ -87,46 +87,46 @@ src_prepare() {
src_configure() {
mycmakeargs=(
- -DUSE_alsa="$(usex alsa)"
- -DUSE_aac="$(usex aac)"
- -DUSE_analyzer="$(usex analyzer)"
- -DUSE_bs2b="$(usex bs2b)"
+ -DUSE_ALSA="$(usex alsa)"
+ -DUSE_AAC="$(usex aac)"
+ -DUSE_ANALYZER="$(usex analyzer)"
+ -DUSE_BS2B="$(usex bs2b)"
-DUSE_CDA="$(usex cdda)"
- -DUSE_crossfade="$(usex crossfade)"
- -DUSE_cover="$(usex cover)"
- -DUSE_cue="$(usex cue)"
- -DUSE_curl="$(usex curl)"
- -DUSE_dbus="$(usex dbus)"
- -DUSE_enca="$(usex enca)"
- -DUSE_ffmpeg="$(usex ffmpeg)"
- -DUSE_flac="$(usex flac)"
+ -DUSE_CROSSFADE="$(usex crossfade)"
+ -DUSE_COVER="$(usex cover)"
+ -DUSE_CUE="$(usex cue)"
+ -DUSE_CURL="$(usex curl)"
+ -DUSE_DBUS="$(usex dbus)"
+ -DUSE_ENCA="$(usex enca)"
+ -DUSE_FFMPEG="$(usex ffmpeg)"
+ -DUSE_FLAC="$(usex flac)"
-DUSE_GME="$(usex game)"
-DUSE_HAL=OFF
- -DUSE_jack="$(usex jack)"
+ -DUSE_JACK="$(usex jack)"
-DUSE_KDENOTIFY="$(usex kde)"
- -DUSE_ladspa="$(usex ladspa)"
- -DUSE_lyrics="$(usex lyrics)"
- -DUSE_mad="$(usex mad)"
+ -DUSE_LADSPA="$(usex ladspa)"
+ -DUSE_LYRICS="$(usex lyrics)"
+ -DUSE_MAD="$(usex mad)"
-DUSE_MIDI_WILDMIDI="$(usex midi)"
- -DUSE_mplayer="$(usex mplayer)"
- -DUSE_mms="$(usex mms)"
- -DUSE_modplug="$(usex modplug)"
- -DUSE_mpris="$(usex mpris)"
+ -DUSE_MPLAYER="$(usex mplayer)"
+ -DUSE_MMS="$(usex mms)"
+ -DUSE_MODPLUG="$(usex modplug)"
+ -DUSE_MPRIS="$(usex mpris)"
-DUSE_MPC="$(usex musepack)"
- -DUSE_notifier="$(usex notifier)"
- -DUSE_opus="$(usex opus)"
- -DUSE_oss="$(usex oss)"
- -DUSE_projectm="$(usex projectm)"
+ -DUSE_NOTIFIER="$(usex notifier)"
+ -DUSE_OPUS="$(usex opus)"
+ -DUSE_OSS="$(usex oss)"
+ -DUSE_PROJECTM="$(usex projectm)"
-DUSE_PULSE="$(usex pulseaudio)"
- -DUSE_qsui="$(usex qsui)"
- -DUSE_scrobbler="$(usex scrobbler)"
- -DUSE_sndfile="$(usex sndfile)"
- -DUSE_stereo="$(usex stereo)"
+ -DUSE_QSUI="$(usex qsui)"
+ -DUSE_SCROBBLER="$(usex scrobbler)"
+ -DUSE_SNDFILE="$(usex sndfile)"
+ -DUSE_STEREO="$(usex stereo)"
-DUSE_STATICON="$(usex tray)"
-DUSE_UDISKS2="$(usex udisks)"
-DUSE_SRC="$(usex libsamplerate)"
- -DUSE_vorbis="$(usex vorbis)"
- -DUSE_wavpack="$(usex wavpack)"
+ -DUSE_VORBIS="$(usex vorbis)"
+ -DUSE_WAVPACK="$(usex wavpack)"
)
cmake-utils_src_configure
diff --git a/media-sound/qmmp/qmmp-9999.ebuild
b/media-sound/qmmp/qmmp-9999.ebuild
index 0713ab9..488c726 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -22,9 +22,9 @@ fi
LICENSE="GPL-2"
SLOT="0"
# KEYWORDS further up
-IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg
flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier
opus oss
-projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+IUSE="analyzer aac +alsa bs2b cdda cover crossfade cue curl enca ffmpeg flac
jack game kde ladspa
+lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm
+pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack"
RDEPEND="media-libs/taglib
dev-qt/qtcore:5
@@ -38,13 +38,11 @@ RDEPEND="media-libs/taglib
cdda? ( dev-libs/libcdio-paranoia )
cue? ( media-libs/libcue )
curl? ( net-misc/curl )
- dbus? ( sys-apps/dbus )
aac? ( media-libs/faad2 )
enca? ( app-i18n/enca )
flac? ( media-libs/flac )
game? ( media-libs/game-music-emu )
ladspa? ( media-libs/ladspa-cmt )
- libsamplerate? ( media-libs/libsamplerate )
mad? ( media-libs/libmad )
midi? ( media-sound/wildmidi )
mms? ( media-libs/libmms )
@@ -65,6 +63,7 @@ RDEPEND="media-libs/taglib
wavpack? ( media-sound/wavpack )
scrobbler? ( net-misc/curl )
sndfile? ( media-libs/libsndfile )
+ soxr? ( media-libs/soxr )
udisks? ( sys-fs/udisks:2 )"
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5"
@@ -73,8 +72,6 @@ DOCS="AUTHORS ChangeLog README"
CMAKE_IN_SOURCE_BUILD="1"
-REQUIRED_USE="kde? ( dbus ) "
-
src_prepare() {
if has_version dev-libs/libcdio-paranoia; then
sed -i \
@@ -87,46 +84,45 @@ src_prepare() {
src_configure() {
mycmakeargs=(
- -DUSE_alsa="$(usex alsa)"
- -DUSE_aac="$(usex aac)"
- -DUSE_analyzer="$(usex analyzer)"
- -DUSE_bs2b="$(usex bs2b)"
+ -DUSE_ALSA="$(usex alsa)"
+ -DUSE_AAC="$(usex aac)"
+ -DUSE_ANALYZER="$(usex analyzer)"
+ -DUSE_BS2B="$(usex bs2b)"
-DUSE_CDA="$(usex cdda)"
- -DUSE_crossfade="$(usex crossfade)"
- -DUSE_cover="$(usex cover)"
- -DUSE_cue="$(usex cue)"
- -DUSE_curl="$(usex curl)"
- -DUSE_dbus="$(usex dbus)"
- -DUSE_enca="$(usex enca)"
- -DUSE_ffmpeg="$(usex ffmpeg)"
- -DUSE_flac="$(usex flac)"
+ -DUSE_CROSSFADE="$(usex crossfade)"
+ -DUSE_COVER="$(usex cover)"
+ -DUSE_CUE="$(usex cue)"
+ -DUSE_CURL="$(usex curl)"
+ -DUSE_ENCA="$(usex enca)"
+ -DUSE_FFMPEG="$(usex ffmpeg)"
+ -DUSE_FLAC="$(usex flac)"
-DUSE_GME="$(usex game)"
-DUSE_HAL=OFF
- -DUSE_jack="$(usex jack)"
+ -DUSE_JACK="$(usex jack)"
-DUSE_KDENOTIFY="$(usex kde)"
- -DUSE_ladspa="$(usex ladspa)"
- -DUSE_lyrics="$(usex lyrics)"
- -DUSE_mad="$(usex mad)"
- -DUSE_MIDI_WILDMIDI="$(usex midi)"
- -DUSE_mplayer="$(usex mplayer)"
- -DUSE_mms="$(usex mms)"
- -DUSE_modplug="$(usex modplug)"
- -DUSE_mpris="$(usex mpris)"
+ -DUSE_LADSPA="$(usex ladspa)"
+ -DUSE_LYRICS="$(usex lyrics)"
+ -DUSE_MAD="$(usex mad)"
+ -DUSE_MIDI="$(usex midi)"
+ -DUSE_MPLAYER="$(usex mplayer)"
+ -DUSE_MMS="$(usex mms)"
+ -DUSE_MODPLUG="$(usex modplug)"
+ -DUSE_MPRIS="$(usex mpris)"
-DUSE_MPC="$(usex musepack)"
- -DUSE_notifier="$(usex notifier)"
- -DUSE_opus="$(usex opus)"
- -DUSE_oss="$(usex oss)"
- -DUSE_projectm="$(usex projectm)"
+ -DUSE_NOTIFIER="$(usex notifier)"
+ -DUSE_OPUS="$(usex opus)"
+ -DUSE_OSS="$(usex oss)"
+ -DUSE_PROJECTM="$(usex projectm)"
-DUSE_PULSE="$(usex pulseaudio)"
- -DUSE_qsui="$(usex qsui)"
- -DUSE_scrobbler="$(usex scrobbler)"
- -DUSE_sndfile="$(usex sndfile)"
- -DUSE_stereo="$(usex stereo)"
+ -DUSE_QSUI="$(usex qsui)"
+ -DUSE_SCROBBLER="$(usex scrobbler)"
+ -DUSE_SNDFILE="$(usex sndfile)"
+ -DUSE_SOXR="$(usex soxr)"
+ -DUSE_STEREO="$(usex stereo)"
-DUSE_STATICON="$(usex tray)"
-DUSE_UDISKS2="$(usex udisks)"
- -DUSE_SRC="$(usex libsamplerate)"
- -DUSE_vorbis="$(usex vorbis)"
- -DUSE_wavpack="$(usex wavpack)"
+ -DUSE_VORBIS="$(usex vorbis)"
+ -DUSE_WAVPACK="$(usex wavpack)"
)
cmake-utils_src_configure
