| [proaudio] [2394] media-sound/aqualung-9999: added desktop icon, fixed dependencies, fixed use flags, cleanup |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2394
Author: lilrc
Date: 2013-01-20 00:24:53 +0100 (Sun, 20 Jan 2013)
Log Message:
-----------
media-sound/aqualung-9999: added desktop icon, fixed dependencies, fixed use flags, cleanup
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/aqualung/ChangeLog
trunk/overlays/proaudio/media-sound/aqualung/Manifest
trunk/overlays/proaudio/media-sound/aqualung/aqualung-9999.ebuild
Modified: trunk/overlays/proaudio/media-sound/aqualung/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/aqualung/ChangeLog 2013-01-18 23:01:53 UTC (rev 2393)
+++ trunk/overlays/proaudio/media-sound/aqualung/ChangeLog 2013-01-19 23:24:53 UTC (rev 2394)
@@ -1,7 +1,16 @@
# ChangeLog for media-sound/aqualung
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Jan 2013; Karl Lindén (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ aqualung-9999:
+ added EAPI
+ added desktop entry with icon
+ replaced revision-hack with cleaner code
+ fixed use flags (+lame, +encode, -mp3; corrected non-working ones)
+ added versioned dependency on <dev-libs/libcdio-0.90
+ cleanup
+
21 Sep 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> aqualung-9999.ebuild:
aqualung-9999: alsa and musepack deps fixed
Modified: trunk/overlays/proaudio/media-sound/aqualung/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/aqualung/Manifest 2013-01-18 23:01:53 UTC (rev 2393)
+++ trunk/overlays/proaudio/media-sound/aqualung/Manifest 2013-01-19 23:24:53 UTC (rev 2394)
@@ -1,3 +1,3 @@
-EBUILD aqualung-9999.ebuild 2520 SHA256 592265400fea4a4e318e5335e6584054d073b2c26fb7f13827f4cd17c82c6070 SHA512 9c8620e9538e893c37e3d150ca9a6beafe0c6d63b47472631deef1f736e89bc74af0d614dfa01c402133699b7e8b7226e1ad397d0386ee14e5bc5354d0827729 WHIRLPOOL cbcc4320560214f9aa48434536e469319007fc73237e3fad6db9657d5a2e23429125f47a907dee21106a843f1d139f55aed606cbe07715f371f86108eed3bbd8
-MISC ChangeLog 906 SHA256 f8d05abf70cba81b5a2573fc5e7485fd9a92069b12b7991e8c5ab59b6be0133a SHA512 cd2d0d0bb802bdfb30a448616b7f4fa96e7da70c606addad8e97bdec8c2d035e60cf79460b9c52942a801cea2b27ec5989a431bfa58d206da87567ba88872758 WHIRLPOOL 77a7e4c60ec88ec5e76a4c586725ef7cb9d3a114ab8f1a49357dbfb0682cd561ba28a76d63e7e43ff61799c8cdd9040f4689c845322c36752ac9cef37770f280
+EBUILD aqualung-9999.ebuild 2938 SHA256 d7f4b8b9b4848dcedb74af69c96c1312a144699c78f7daef085d9a07bb21d0ff SHA512 50d094cf1e2ec86664c98240cb6965b4f6e3ca973ff7f42e4bbf5b3af3f8d3cd700270c9a66b81947032ae8d99aaf4534df1c300b73df92d838373d66b9baf1c WHIRLPOOL 409f267526a721fda1a923a9e6838895e101180fc1d7b230ea6efadc921b8510412e93fa4e78e7e077878b001e18f73df44a215f6e969881ba6a3800c5ebca68
+MISC ChangeLog 1212 SHA256 eced1dddcebd0c5395d62f2e61a3710eeca62d92fb491fa27ee225552aee7d41 SHA512 a6812f49634cbf2548a93dd1a1b8b2459087c12c9f145ef2185d62f3b7f4ba62c7990c089ae16df6cf2dd75c5386b61bdcd13d654e51736d01b745ee6e2a7847 WHIRLPOOL 1a731f602fcb674ea38ebcd13d82198899d116e940dc245e2223ad56e2d06eb94ad40be7dc12dcb6ee9006294c3cfd5e3db9a884995ce9a955836e360bc8c102
MISC metadata.xml 718 SHA256 7a84e2d6bff482a208930cd5900b7367ac6392bdc348d90efcf2d9b2d61046f5 SHA512 89364c46866675dabfd5499ca909a91dcac6bcfb4e95a8243ec3e2a693f1a16f5f66ecb5032d601bf23a4f0eee00a3fb37caf61c8a358e943266616152e21dde WHIRLPOOL e9dee03e6f600036ba63a3a4646cf3f41135414ad0f7170da6b038caea0e2c009fc281edf5a80e7490e2cf234360fdd4f3cfb83d763e8f1405b95587cbd47b3a
Modified: trunk/overlays/proaudio/media-sound/aqualung/aqualung-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/aqualung/aqualung-9999.ebuild 2013-01-18 23:01:53 UTC (rev 2393)
+++ trunk/overlays/proaudio/media-sound/aqualung/aqualung-9999.ebuild 2013-01-19 23:24:53 UTC (rev 2394)
@@ -1,44 +1,49 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit subversion base eutils autotools
+EAPI="5"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa libsamplerate loop-playback lua mac mad modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack"
+inherit subversion eutils autotools-utils
-DESCRIPTION="Aqualung is a music player capable of gapless playback.
+IUSE="alsa cdda cddb debug encode flac ffmpeg ifp jack ladspa lame
+libsamplerate loop-playback lua mac mad modplug musepack oss podcast
+pulseaudio sndfile speex systray vorbis wavpack"
+
+DESCRIPTION="Aqualung is a music player capable of gapless playback. \
Not very suitable for eye candy seekers."
HOMEPAGE="http://aqualung.sourceforge.net";
-SRC_URI=""
ESVN_REPO_URI="https://aqualung.svn.sourceforge.net/svnroot/aqualung/trunk";
ESVN_PROJECT="aqualung"
-ESVN_PATCHES=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-RDEPEND="vorbis? ( >=media-libs/libvorbis-1.0 )
- sndfile? ( >=media-libs/libsndfile-1.0.12 )
+# Won't compile with cdda support against >=libcdio-0.90 due to changes in the library
+# Remove the "<" in "<dev-libs/libcdio-0.90" when the issue is resolved
+# Karl Lindén 19 Jan 2013
+RDEPEND="alsa? ( media-libs/alsa-lib )
+ cdda? ( <dev-libs/libcdio-0.90 )
+ cddb? ( amd64? ( >=media-libs/libcddb-1.3.0 ) )
+ encode? ( lame? ( media-sound/lame ) )
+ ffmpeg? ( virtual/ffmpeg )
flac? ( media-libs/flac )
- modplug? ( media-libs/libmodplug )
- alsa? ( media-libs/alsa-lib )
+ ifp? ( media-libs/libifp )
+ jack? ( media-sound/jack-audio-connection-kit )
+ libsamplerate? ( media-libs/libsamplerate )
lua? ( dev-lang/lua )
mac? ( media-sound/mac )
- mp3? ( media-libs/libmad )
+ mad? ( media-libs/libmad )
+ modplug? ( media-libs/libmodplug )
musepack? ( >=media-sound/musepack-tools-444 )
- ffmpeg? ( virtual/ffmpeg )
- ifp? ( media-libs/libifp )
pulseaudio? ( media-sound/pulseaudio )
+ sndfile? ( >=media-libs/libsndfile-1.0.12 )
speex? ( media-libs/speex media-libs/liboggz )
+ vorbis? ( >=media-libs/libvorbis-1.0 )
wavpack? ( >=media-sound/wavpack-4.40.0 )
- cddb? ( !amd64? ( >=media-libs/libcddb-1.2.1 ) )
- cddb? ( amd64? ( >=media-libs/libcddb-1.3.0 ) )
- jack? ( media-sound/jack-audio-connection-kit )
- cdda? ( dev-libs/libcdio )
- libsamplerate? ( media-libs/libsamplerate )
>=x11-libs/gtk+-2.6"
DEPEND="${RDEPEND}
@@ -47,46 +52,65 @@
dev-libs/libxml2
media-libs/raptor"
-src_unpack() {
- subversion_src_unpack
- cd "${S}"
- # subversion.eclass strips the .svn folder, so i'm injecting a version.h
- echo "#define AQUALUNG_VERSION \"R-$(cd
-"${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}" ; svn info |
-grep '^Revision' | awk '{print $2}')\"" > src/version.h
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS ChangeLog NEWS README )
- eautoreconf || die
+src_prepare() {
+ subversion_wc_info
+
+ echo "#define AQUALUNG_VERSION \"R-${ESVN_WC_REVISION}\"" > src/version.h
+
+ autotools-utils_src_prepare
}
-src_compile() {
- econf \
- `use_with flac` \
- `use_with vorbis ogg` \
- `use_with sndfile` \
- `use_with alsa` \
- `use_with mad mpeg` \
- `use_with oss` \
- `use_with jack` \
- `use_with mac` \
- `use_with mod` \
- `use_with musepack mpc` \
- `use_with ffmpeg lavc` \
- `use_with ifp` \
- `use_with speex` \
- `use_with wavpack` \
- `use_with cddb` \
- `use_with systray` \
- `use_with ladspa` \
- `use_with lua` \
- `use_with cdda` \
- `use_with loop-playback loop` \
- `use_with podcast` \
- `use_with pulseaudio pulse` \
- `use_with libsamplerate src` \
- `use_enable debug` \
- || die "econf failed"
+src_configure() {
+ local myeconfargs=(
+ $(use_with alsa)
+ $(use_with cdda)
+ $(use_with cddb)
+ $(use_with ffmpeg lavc)
+ $(use_with flac)
+ $(use_with ifp)
+ $(use_with jack)
+ $(use_with ladspa)
+ $(use_with libsamplerate src)
+ $(use_with lua)
+ $(use_with mac)
+ $(use_with mad mpeg)
+ $(use_with modplug mod)
+ $(use_with musepack mpc)
+ $(use_with oss)
+ $(use_with pulseaudio pulse)
+ $(use_with sndfile)
+ $(use_with speex)
+ $(use_with vorbis)
+ $(use_with wavpack)
+ $(use_enable debug)
+ $(use_enable loop-playback loop)
+ $(use_enable podcast)
+ $(use_enable systray)
+ )
+ if use encode; then
+ myeconfargs+=(
+ $(use_with lame)
+ $(use_with vorbis vorbisenc)
+ --enable-transcoding
+ )
+ else
+ myeconfargs+=(
+ --without-lame
+ --without-vorbisenc
+ --disable-transcoding
+ )
+ fi
- emake || die "make failed"
+ autotools-utils_src_configure
}
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
+src_install() {
+ autotools-utils_src_install
+
+ newicon -s 64 src/img/icon_64.png "${PN}.png"
+ make_desktop_entry "${PN}" "${PN/a/A}" "${PN}" "Audio;AudioVideo"
+}