[gentoo-commits] gentoo-x86 commit in games-simulation/openttd: metadata.xml ChangeLog openttd-1.0.1.ebuild

[Michael Sterrett (mr_bones_)]

mr_bones_    10/05/26 20:44:30

  Modified:             metadata.xml ChangeLog openttd-1.0.1.ebuild
  Log:
  fix automagic linking against libtimidity (bug #321559); clarify the midi situation - patches from Locke Shinseiko (Wizzleby)
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.8                  games-simulation/openttd/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/openttd/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	18 Apr 2010 07:35:40 -0000	1.7
+++ metadata.xml	26 May 2010 20:44:30 -0000	1.8
@@ -3,6 +3,8 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
+		<flag name='aplaymidi'>Enables midi music in game, using aplaymidi as an external player</flag>
+
 		<flag name='openmedia'>Enables the free open media sets: OpenGFX, OpenSFX, OpenMSX, removing the requirement for proprietary TTD assets to play OpenTTD.</flag>
 		<flag name='lzo'>Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)</flag>
 		<flag name='dedicated'>Build only the openttd server, and not the client.</flag>



1.88                 games-simulation/openttd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/ChangeLog?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/ChangeLog?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/ChangeLog?r1=1.87&r2=1.88

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog	21 May 2010 21:02:06 -0000	1.87
+++ ChangeLog	26 May 2010 20:44:30 -0000	1.88
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.87 2010/05/21 21:02:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.88 2010/05/26 20:44:30 mr_bones_ Exp $
+
+  26 May 2010; Michael Sterrett <mr_bones_@g.o> openttd-1.0.1.ebuild,
+  metadata.xml:
+  fix automagic linking against libtimidity (bug #321559); clarify the midi
+  situation - patches from Locke Shinseiko (Wizzleby)
 
   21 May 2010; Pacho Ramos <pacho@g.o> openttd-0.7.5.ebuild:
   amd64 stable, bug 300182



1.2                  games-simulation/openttd/openttd-1.0.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/openttd-1.0.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/openttd-1.0.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/openttd-1.0.1.ebuild?r1=1.1&r2=1.2

Index: openttd-1.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.0.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openttd-1.0.1.ebuild	1 May 2010 04:26:33 -0000	1.1
+++ openttd-1.0.1.ebuild	26 May 2010 20:44:30 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.0.1.ebuild,v 1.1 2010/05/01 04:26:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.0.1.ebuild,v 1.2 2010/05/26 20:44:30 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -16,7 +16,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa debug dedicated iconv icu lzo +openmedia +png +truetype zlib"
+IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
 RESTRICT="test"
 
 DEPEND="
@@ -33,15 +33,16 @@
 	iconv? ( virtual/libiconv )
 	png? ( media-libs/libpng )
 	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		alsa? ( media-sound/alsa-utils )
-	)"
+
 PDEPEND="
-	openmedia? (
-		games-misc/opengfx
-		games-misc/opensfx
-		games-misc/openmsx
+	!dedicated? (
+		openmedia? (
+			games-misc/opengfx
+			games-misc/opensfx
+			games-misc/openmsx
+		)
+		aplaymidi? ( media-sound/alsa-utils )
+		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
 	)"
 
 src_configure() {
@@ -50,12 +51,17 @@
 	# always built instead.
 	local myopts="${myopts} --without-allegro"
 
+	# libtimidity not needed except for some embedded platform
+	# nevertheless, it will be automagically linked if it is
+	# installed. Hence, we disable it.
+	myopts="${myopts} --without-libtimidity"
+
 	use debug && myopts="${myopts} --enable-debug=3"
 
 	if use dedicated ; then
 		myopts="${myopts} --enable-dedicated"
 	else
-		use alsa && myopts="${myopts} --with-midi=/usr/bin/aplaymidi"
+		use aplaymidi && myopts="${myopts} --with-midi='/usr/bin/aplaymidi'"
 		myopts="${myopts}
 			$(use_with truetype freetype)
 			$(use_with icu)
@@ -106,50 +112,53 @@
 pkg_postinst() {
 	games_pkg_postinst
 
-	if ! use openmedia ; then
-		elog
-		elog "OpenTTD was compiled without openmedia USE flags."
-		elog
-		elog "In order to play, you must either install games-misc/opengfx"
-		elog "as well as games-misc/opensfx or copy the following 6 files"
-		elog "from a version of Transport Tycoon Deluxe (windows or DOS)"
-		elog "to ~/.openttd/data/ or ${GAMES_DATADIR}/${PN}/data/."
-		elog
-		elog "From the WINDOWS version you need: "
-		elog "  sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-		elog "OR from the DOS version you need: "
-		elog "  SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-		elog
-		elog "File names are case sensitive so make sure they are "
-		elog "correct for whichever version you have."
-		elog
-	fi
-
 	if ! use lzo ; then
-		elog "OpenTTD was compiled without lzo2 support."
-		elog "While lzo2 is not required, disabling it does mean that"
-		elog "loading old savegames/scenarios from ancient versions (~0.2)"
-		elog "will be disabled"
+		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
+		elog "required, disabling it does mean that loading old savegames"
+		elog "or scenarios from ancient versions (~0.2) will fail."
 		elog
 	fi
 
 	if use dedicated ; then
 		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when run, including any running client sessions!"
+		ewarn "processes when triggered, including any running client sessions!"
 	else
-		if use alsa ; then
+		if use aplaymidi ; then
 			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "You have to set the environment variable ALSA_OUTPUT_PORTS."
+			elog "This option is for those with a hardware midi device,"
+			elog "or who have set up ALSA to handle midi ports."
+			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
 			elog "Available ports can be listed by using 'aplaymidi -l'."
-			if ! use openmedia ; then
-				elog "You have disabled the openmedia use flag, in-game music"
-				elog "will be unavailable unless you install games-misc/openmsx"
-				elog "or install a music set in ~/.openttd/gm or use the in-game"
-				elog "download functionality to get a music set"
-			fi
 		else
-			elog "alsa not in USE so music will not be played during the game."
-
+			if ! use timidity ; then
+				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
+				elog "in USE. Music may or may not work in-game. If you happen"
+				elog "to have timidity++ installed, music will work so long"
+				elog "as it remains installed, but OpenTTD will not depend on it."
+			fi
+		fi
+		if ! use openmedia ; then
+			elog
+			elog "OpenTTD was compiled without the 'openmedia' USE flag."
+			elog
+			elog "In order to play, you must at least install:"
+			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
+			elog "following 6 files from a version of Transport Tycoon Deluxe"
+			elog "(windows or DOS) to ~/.openttd/data/ or"
+			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog
+			elog "From the WINDOWS version you need: "
+			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+			elog "OR from the DOS version you need: "
+			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+			elog
+			elog "File names are case sensitive, but should work either with"
+			elog "all upper or all lower case names"
+			elog
+			elog "In addition, in-game music will be unavailable: for music,"
+			elog "install games-misc/openmsx, or use the in-game download"
+			elog "functionality to get a music set"
+			elog
 		fi
 	fi
 }