public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in games-emulation/sdlmame: ChangeLog sdlmame-0.139_p4.ebuild
@ 2010-10-20  8:10 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-10-20  8:10 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    10/10/20 08:10:33

  Modified:             ChangeLog
  Added:                sdlmame-0.139_p4.ebuild
  Log:
  version bump
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.37                 games-emulation/sdlmame/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/ChangeLog?r1=1.36&r2=1.37

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	13 Oct 2010 15:06:31 -0000	1.36
+++ ChangeLog	20 Oct 2010 08:10:33 -0000	1.37
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/sdlmame
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.36 2010/10/13 15:06:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.37 2010/10/20 08:10:33 mr_bones_ Exp $
+
+*sdlmame-0.139_p4 (20 Oct 2010)
+
+  20 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +sdlmame-0.139_p4.ebuild:
+  version bump
 
   13 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
   sdlmame-0.139_p3.ebuild:



1.1                  games-emulation/sdlmame/sdlmame-0.139_p4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/sdlmame-0.139_p4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/sdlmame-0.139_p4.ebuild?rev=1.1&content-type=text/plain

Index: sdlmame-0.139_p4.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.139_p4.ebuild,v 1.1 2010/10/20 08:10:33 mr_bones_ Exp $

EAPI=2
inherit eutils flag-o-matic games

MY_PV=${PV/.}
MY_CONF_PN=${PN/sdl}
MY_P=${PN}${MY_PV}
MY_P=${MY_P%%_p*}
MY_CONF_VER="0.139"
DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
HOMEPAGE="http://mamedev.org/"
UPDATES="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "mirror://gentoo/${MY_P}u${PATCH_VER}_diff.zip"; done)"
# Upstream doesn't allow fetching with unknown User-Agent such as wget
SRC_URI="mirror://gentoo/${MY_P/sdl}s.zip $UPDATES
	http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"

LICENSE="XMAME"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug opengl"

RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
	dev-libs/expat
	x11-libs/libXinerama
	debug? (
		x11-libs/gtk+:2
		gnome-base/gconf
	)"
DEPEND="${RDEPEND}
	app-arch/unzip
	x11-proto/xineramaproto"

S=${WORKDIR}

# Function to disable a makefile option
disable_feature() {
	sed -i \
		-e "/$1.*=/s:^:# :" \
		"${S}"/makefile \
		|| die "sed failed"
}

# Function to enable a makefile option
enable_feature() {
	sed -i \
		-e "/^#.*$1.*=/s:^# ::"  \
		"${S}"/makefile \
		|| die "sed failed"
}

src_unpack() {
	base_src_unpack
	unpack ./mame.zip
	rm -f mame.zip
}

src_prepare() {
	if [[ $PV == *_p* ]] ; then
		edos2unix $(grep +++ *diff | awk '{ print $2 }' | sort -u) *diff 2> /dev/null
		einfo "Patching release with source updates"
		epatch ${MY_PV%%_p*}*.diff
	fi
	sed -i \
		-e '/CFLAGS += -O$(OPTIMIZE)/s:^:# :' \
		-e '/CFLAGS += -pipe/s:^:# :' \
		-e '/LDFLAGS += -s/s:^:# :' \
		-e '/LDFLAGS =/d' \
		-e 's:-Werror::' \
		makefile \
		|| die "sed failed"
	# Don't compile zlib and expat
	einfo "Disabling embedded libraries: zlib and expat"
	disable_feature BUILD_ZLIB
	disable_feature BUILD_EXPAT

	if use amd64; then
		einfo "Enabling 64-bit support"
		enable_feature PTR64
	fi

	if use ppc; then
		einfo "Enabling PPC support"
		enable_feature BIGENDIAN
	fi

	if use debug; then
		einfo "Enabling DEBUG support"
		enable_feature DEBUG
	fi
}

src_compile() {
	local make_opts

	use opengl || make_opts="${make_opts} NO_OPENGL=1"

	emake \
		NAME="${PN}" \
		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CXXFLAGS}" \
		CC="${CXX}" \
		SUFFIX="" \
		${make_opts} \
		all \
		|| die "emake failed"
}

src_install() {
	dogamesbin ${PN}$(use amd64 && echo 64) || die

	# Avoid collision on /usr/games/bin/jedutil
	exeinto "$(games_get_libdir)/${PN}"
	doexe chdman jedutil ldverify romcmp testkeys || die
	doman src/osd/sdl/man/{chdman,jedutil,ldverify,romcmp,testkeys}.1
	newman src/osd/sdl/man/mame.1 ${PN}.1

	insinto "${GAMES_DATADIR}/${PN}"
	doins -r src/osd/sdl/keymaps || die "doins -r keymaps failed"
	newins sdlmame-ui.bdf ui.bdf || die "newins ui.bdf failed"

	insinto "${GAMES_SYSCONFDIR}/${PN}"
	doins "${FILESDIR}"/vector.ini || die "doins vector.ini failed"

	sed \
		-e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
		"${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \
		|| die "sed failed"

	dodoc docs/{config,mame,newvideo}.txt whatsnew*.txt

	keepdir \
		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}

	prepgamesdirs
}

pkg_postinst() {
	games_pkg_postinst

	elog "It's strongly recommended that you change either the system-wide"
	elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"

	if use opengl; then
		echo
		elog "You built ${PN} with opengl support and should set"
		elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
	fi
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in games-emulation/sdlmame: ChangeLog sdlmame-0.139_p4.ebuild
@ 2010-10-22 18:18 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-10-22 18:18 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    10/10/22 18:18:25

  Modified:             ChangeLog sdlmame-0.139_p4.ebuild
  Log:
  Avoid linking against gtk+ (used by the built-in debugger) unless USE=debug is specified (bug #336062)
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.38                 games-emulation/sdlmame/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/sdlmame/ChangeLog?r1=1.37&r2=1.38

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog	20 Oct 2010 08:10:33 -0000	1.37
+++ ChangeLog	22 Oct 2010 18:18:25 -0000	1.38
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/sdlmame
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.37 2010/10/20 08:10:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.38 2010/10/22 18:18:25 mr_bones_ Exp $
+
+  22 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  sdlmame-0.139_p4.ebuild:
+  Avoid linking against gtk+ (used by the built-in debugger) unless
+  USE=debug is specified (bug #336062)
 
 *sdlmame-0.139_p4 (20 Oct 2010)
 



1.2                  games-emulation/sdlmame/sdlmame-0.139_p4.ebuild

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

Index: sdlmame-0.139_p4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.139_p4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdlmame-0.139_p4.ebuild	20 Oct 2010 08:10:33 -0000	1.1
+++ sdlmame-0.139_p4.ebuild	22 Oct 2010 18:18:25 -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-emulation/sdlmame/sdlmame-0.139_p4.ebuild,v 1.1 2010/10/20 08:10:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.139_p4.ebuild,v 1.2 2010/10/22 18:18:25 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -24,14 +24,14 @@
 
 RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
 	dev-libs/expat
-	x11-libs/libXinerama
 	debug? (
 		x11-libs/gtk+:2
 		gnome-base/gconf
+		x11-libs/libXinerama
 	)"
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	x11-proto/xineramaproto"
+	debug? ( x11-proto/xineramaproto )"
 
 S=${WORKDIR}
 
@@ -47,7 +47,7 @@
 enable_feature() {
 	sed -i \
 		-e "/^#.*$1.*=/s:^# ::"  \
-		"${S}"/makefile \
+		"${S}"/${2:-makefile} \
 		|| die "sed failed"
 }
 
@@ -87,28 +87,29 @@
 	fi
 
 	if use debug; then
-		einfo "Enabling DEBUG support"
+		einfo "Enabling debug support"
 		enable_feature DEBUG
+	else
+		einfo "Disabling debug support"
+		enable_feature NO_X11 src/osd/sdl/sdl.mak
+	fi
+
+	if ! use opengl ; then
+		einfo "Disabling opengl support"
+		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
 	fi
 }
 
 src_compile() {
-	local make_opts
-
-	use opengl || make_opts="${make_opts} NO_OPENGL=1"
-
 	emake \
 		NAME="${PN}" \
 		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CXXFLAGS}" \
 		CC="${CXX}" \
-		SUFFIX="" \
-		${make_opts} \
-		all \
-		|| die "emake failed"
+		all || die
 }
 
 src_install() {
-	dogamesbin ${PN}$(use amd64 && echo 64) || die
+	newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} || die
 
 	# Avoid collision on /usr/games/bin/jedutil
 	exeinto "$(games_get_libdir)/${PN}"






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-10-22 18:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-22 18:18 [gentoo-commits] gentoo-x86 commit in games-emulation/sdlmame: ChangeLog sdlmame-0.139_p4.ebuild Michael Sterrett (mr_bones_)
  -- strict thread matches above, loose matches on Subject: below --
2010-10-20  8:10 Michael Sterrett (mr_bones_)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox