summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/qmmp/ChangeLog8
-rw-r--r--media-sound/qmmp/metadata.xml1
-rw-r--r--media-sound/qmmp/qmmp-0.7.0.ebuild121
-rw-r--r--media-sound/qmmp/qmmp-9999.ebuild39
4 files changed, 157 insertions, 12 deletions
diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 05141fceedd1..1d41ef1011ea 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/qmmp
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.111 2013/03/25 21:03:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.112 2013/04/20 11:54:13 hwoarang Exp $
+
+*qmmp-0.7.0 (20 Apr 2013)
+
+ 20 Apr 2013; Markos Chandras <hwoarang@gentoo.org> +qmmp-0.7.0.ebuild,
+ metadata.xml, qmmp-9999.ebuild:
+ Version bump
*qmmp-0.6.8 (25 Mar 2013)
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index a77f1cd5b91a..954064eaa3cc 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -16,6 +16,7 @@
<flag name="midi">Enable midi support using wildmidi library</flag>
<flag name="mpris">Enable MPRIS support</flag>
<flag name="notifier">Enable qmmps' notifier system</flag>
+ <flag name="opus">Enable the opus plugin</flag>
<flag name="stereo">Enable stereo effect</flag>
<flag name="tray">Build tray icon</flag>
<flag name="kde">Use kde4 notifier system</flag>
diff --git a/media-sound/qmmp/qmmp-0.7.0.ebuild b/media-sound/qmmp/qmmp-0.7.0.ebuild
new file mode 100644
index 000000000000..6b85f611cc8d
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.7.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.7.0.ebuild,v 1.1 2013/04/20 11:54:13 hwoarang Exp $
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack"
+
+RDEPEND="dev-qt/qt3support:4
+ media-libs/taglib
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+ 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 )
+ mplayer? ( || ( media-video/mplayer
+ media-video/mplayer2 )
+ )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:4 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udev? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+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 \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ base_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ -DUSE_FFMPEG_LEGACY=OFF
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udev UDISKS2)
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 85e6a15d891c..534dcb9c91fb 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.23 2013/03/02 22:00:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.24 2013/04/20 11:54:13 hwoarang Exp $
EAPI="5"
@@ -11,7 +11,7 @@ DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
if [ "$PV" != "9999" ]; then
SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~ppc ~x86"
else
SRC_URI=""
ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
@@ -21,23 +21,24 @@ fi
LICENSE="GPL-2"
SLOT="0"
# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad mms modplug mplayer mpris musepack notifier oss
-projectm pulseaudio scrobbler sndfile tray udev +vorbis wavpack"
+IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack"
RDEPEND="dev-qt/qt3support:4
media-libs/taglib
alsa? ( media-libs/alsa-lib )
bs2b? ( media-libs/libbs2b )
- cdda? ( dev-libs/libcdio )
+ cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
dbus? ( sys-apps/dbus )
aac? ( media-libs/faad2 )
- game? ( media-libs/game-music-emu )
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 )
mplayer? ( || ( media-video/mplayer
media-video/mplayer2 )
@@ -49,20 +50,31 @@ RDEPEND="dev-qt/qt3support:4
jack? ( media-sound/jack-audio-connection-kit
media-libs/libsamplerate )
ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
projectm? ( media-libs/libprojectm
dev-qt/qtopengl:4 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
- udev? ( sys-fs/udisks:0 )
wavpack? ( media-sound/wavpack )
scrobbler? ( net-misc/curl )
- sndfile? ( media-libs/libsndfile )"
+ sndfile? ( media-libs/libsndfile )
+ udev? ( sys-fs/udisks:2 )"
DEPEND="${RDEPEND}"
DOCS="AUTHORS ChangeLog README"
CMAKE_IN_SOURCE_BUILD="1"
-REQUIRED_USE="kde? ( dbus )"
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ base_src_prepare
+}
src_configure() {
mycmakeargs=(
@@ -71,9 +83,11 @@ src_configure() {
$(cmake-utils_use_use bs2b)
$(cmake-utils_use_use cover)
$(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
$(cmake-utils_use_use dbus)
$(cmake-utils_use_use enca)
$(cmake-utils_use_use ffmpeg)
+ -DUSE_FFMPEG_LEGACY=OFF
$(cmake-utils_use_use flac)
$(cmake-utils_use_use game GME)
-DUSE_HAL=OFF
@@ -82,20 +96,23 @@ src_configure() {
$(cmake-utils_use_use ladspa)
$(cmake-utils_use_use lyrics)
$(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
$(cmake-utils_use_use mplayer)
$(cmake-utils_use_use mms)
$(cmake-utils_use_use modplug)
$(cmake-utils_use_use mpris)
$(cmake-utils_use_use musepack MPC)
$(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
$(cmake-utils_use_use oss)
$(cmake-utils_use_use projectm)
$(cmake-utils_use_use pulseaudio PULSE)
$(cmake-utils_use_use scrobbler)
$(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
$(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udev UDISKS2)
$(cmake-utils_use_use libsamplerate SRC)
- $(cmake-utils_use_use udev UDISKS)
$(cmake-utils_use_use vorbis)
$(cmake-utils_use_use wavpack)
)