Play midi through alsa if timidity is disabled (Bug #64863)

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 05b6e7179b983c4fa3469ed71b6c61f0a1f7e8f5..9c0bf993d07efdb57cee4c606ff0737111d38b79 100644 (file)
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.8 2004/12/25 11:15:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.9 2004/12/28 10:06:14 dholm Exp $
+
+  28 Dec 2004; David Holm <dholm@gentoo.org> openttd-0.3.5.ebuild:
+  Play midi through alsa if timidity is disabled (Bug #64863)
 
 *openttd-0.3.5 (25 Dec 2004)
 

diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 5bec3cb3d52583d5ba7f641eeda9143a3b48c66a..8c6078cfe773d5d7c83314d2ceaaa911f7bcdc78 100644 (file)
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,6 +1,6 @@
-MD5 9834a743ac7d407a01d93b1178a34e84 ChangeLog 1462
+MD5 2e85013e98f00f2ced09d5036ceadaec ChangeLog 1592
 MD5 7efefbbe81a05cbc5d4e96203f047fda metadata.xml 245
 MD5 762081c49771d5026f6703266335d28f openttd-0.3.4.ebuild 2041
-MD5 cc5c19a22d3315c3465b292ba592c9d5 openttd-0.3.5.ebuild 2117
+MD5 8918594a845d14ca31bdd6d8487de479 openttd-0.3.5.ebuild 2248
 MD5 0a486aa82ad73424c6a6c791c8143b84 files/digest-openttd-0.3.4 67
 MD5 94e0df18e09dc754083d5e1247f809b7 files/digest-openttd-0.3.5 73

diff --git a/games-simulation/openttd/openttd-0.3.5.ebuild b/games-simulation/openttd/openttd-0.3.5.ebuild
index ed276e89e14c387abac41d98cb5c103f915d6626..25abf5b4c1f6b50521ecfccc261b5d935aba5cb0 100644 (file)
--- a/games-simulation/openttd/openttd-0.3.5.ebuild
+++ b/games-simulation/openttd/openttd-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.3.5.ebuild,v 1.1 2004/12/25 11:15:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.3.5.ebuild,v 1.2 2004/12/28 10:06:14 dholm Exp $
 
 inherit games
 
@@ -11,20 +11,24 @@ SRC_URI="mirror://sourceforge/openttd/${P}-source.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="debug png zlib timidity"
+IUSE="debug png zlib timidity alsa"
 
 DEPEND="virtual/libc
        media-libs/libsdl
        png? ( media-libs/libpng )
        zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
-       timidity? ( media-sound/timidity++ )"
+       timidity? ( media-sound/timidity++ )
+       !timidity? ( alsa? ( media-sound/pmidi ) )"
 
 src_compile() {
        local myopts="MANUAL_CONFIG=1 UNIX=1 WITH_SDL=1 WITH_NETWORK=1 INSTALL=1 RELEASE=${PV} USE_HOMEDIR=1 PERSONAL_DIR=.openttd PREFIX=/usr DATA_DIR=share/games/${PN}"
        use debug && myopts="${myopts} DEBUG=1"
        use png && myopts="${myopts} WITH_PNG=1"
        use zlib && myopts="${myopts} WITH_ZLIB=1"
+       if ! use timidity; then
+               use alsa && myopts="${myopts} MIDI=/usr/bin/pmidi"
+       fi
 
        emake -j1 ${myopts} || die "emake failed"
 }