From 77d8654edaa89d4281954c4c65b8e421c2267ca3 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Mon, 29 Jan 2007 21:10:31 +0000 Subject: [PATCH] Add custom-cflags use, also disable libao on amd64. Package-Manager: portage-2.1.2-r4 --- games-emulation/zsnes/ChangeLog | 5 ++- games-emulation/zsnes/Manifest | 22 ++++++------- games-emulation/zsnes/zsnes-1.51.ebuild | 42 ++++++++++++++++++------- 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog index e28f88197427..1540db959478 100644 --- a/games-emulation/zsnes/ChangeLog +++ b/games-emulation/zsnes/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-emulation/zsnes # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.23 2007/01/29 17:04:23 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.24 2007/01/29 21:10:31 drizzt Exp $ + + 29 Jan 2007; Timothy Redaelli zsnes-1.51.ebuild: + Add custom-cflags use, also disable libao on amd64. *zsnes-1.51 (29 Jan 2007) diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest index 56de1eb8b58b..0ea1286f79b7 100644 --- a/games-emulation/zsnes/Manifest +++ b/games-emulation/zsnes/Manifest @@ -23,14 +23,14 @@ EBUILD zsnes-1.42.ebuild 1506 RMD160 acfb4288a677b5bb41ad8392695b96506866e32a SH MD5 d2185588da42a9edd0f6ce9288ce33b6 zsnes-1.42.ebuild 1506 RMD160 acfb4288a677b5bb41ad8392695b96506866e32a zsnes-1.42.ebuild 1506 SHA256 76ea0337597ce7b0cd921b24e626db5aa5938b632fabc1b0c52d03f1efe92fa2 zsnes-1.42.ebuild 1506 -EBUILD zsnes-1.51.ebuild 1850 RMD160 b17d86d76c8f089b059033f509fb1b36f748db51 SHA1 3e247dca2b8d25abfbed423ac85428015a09ac5f SHA256 35658d72a0a3723c23ce149974cb0277966e16063a3b59ae00568687149cfe43 -MD5 8eb732fe744ed6e8e69c9f1629e6f8b6 zsnes-1.51.ebuild 1850 -RMD160 b17d86d76c8f089b059033f509fb1b36f748db51 zsnes-1.51.ebuild 1850 -SHA256 35658d72a0a3723c23ce149974cb0277966e16063a3b59ae00568687149cfe43 zsnes-1.51.ebuild 1850 -MISC ChangeLog 6060 RMD160 f01caac9d5a6badcaab38d036920fc0e9c0b8877 SHA1 546813c8723bb96cfc50bb0d670331129831e068 SHA256 6b6f50cc8c3f778c23152d23bd523c265ff3e4f8f51c5180a260f726dbdcca42 -MD5 d9930e0afcddeaeb4d0d9a6012707444 ChangeLog 6060 -RMD160 f01caac9d5a6badcaab38d036920fc0e9c0b8877 ChangeLog 6060 -SHA256 6b6f50cc8c3f778c23152d23bd523c265ff3e4f8f51c5180a260f726dbdcca42 ChangeLog 6060 +EBUILD zsnes-1.51.ebuild 2286 RMD160 1d833abeb98eb5841c3384b4619419f4be950b98 SHA1 44e6630c71f2aa1782601906311f77fedde7b126 SHA256 67837ceeacbb4224435c94b5b3bc678f9916fe690f7dd8bc18679d0d2ba98568 +MD5 b6c7c79616e1533d37bd64b27e465dbf zsnes-1.51.ebuild 2286 +RMD160 1d833abeb98eb5841c3384b4619419f4be950b98 zsnes-1.51.ebuild 2286 +SHA256 67837ceeacbb4224435c94b5b3bc678f9916fe690f7dd8bc18679d0d2ba98568 zsnes-1.51.ebuild 2286 +MISC ChangeLog 6186 RMD160 48b03abcb02dc4e63f00849b189c57ccad3b215c SHA1 8393bb866614e72c6524b0e95354ec5eb0c63503 SHA256 84c2e71cf610e3ec7e38a744f767d2e9ac14aec9cd9db1b6e0f6eaa62e28db57 +MD5 a2fe7e4018366d8b10cb85461a0d3ba2 ChangeLog 6186 +RMD160 48b03abcb02dc4e63f00849b189c57ccad3b215c ChangeLog 6186 +SHA256 84c2e71cf610e3ec7e38a744f767d2e9ac14aec9cd9db1b6e0f6eaa62e28db57 ChangeLog 6186 MISC metadata.xml 372 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 SHA1 41d62af5e7cd389224135e8385b22355f2c7f2ac SHA256 043dd4fd85df344c5a335c1f3bc1a0f9ce9b169337060367f767b3e4be217bdb MD5 67c743475aa0bdcc349144352575421c metadata.xml 372 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 metadata.xml 372 @@ -44,7 +44,7 @@ SHA256 f9ba651da95dcbc8a7c53b572bc4ecd38f552891b26c351b8ab719177399e6c1 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFvikfGDyatLGpTbYRAkIzAJsHGyJp5elEHuJvSrX60gN0bSepBQCfTe7Z -u4SU3ocFWfZWKTP56jK6q1M= -=Nkxu +iD8DBQFFvmLNGDyatLGpTbYRAm/lAJ45xwE7CdPTMPj4SknH6UFzVdlk4QCgk2nr +WGOzynfnkAPKpfrgeAJfad8= +=yMD/ -----END PGP SIGNATURE----- diff --git a/games-emulation/zsnes/zsnes-1.51.ebuild b/games-emulation/zsnes/zsnes-1.51.ebuild index c04965474792..318a15afeae5 100644 --- a/games-emulation/zsnes/zsnes-1.51.ebuild +++ b/games-emulation/zsnes/zsnes-1.51.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51.ebuild,v 1.1 2007/01/29 17:04:23 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51.ebuild,v 1.2 2007/01/29 21:10:31 drizzt Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" -inherit eutils autotools games toolchain-funcs +inherit eutils autotools flag-o-matic games toolchain-funcs DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly" HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/" @@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="ao opengl png" +IUSE="ao custom-cflags opengl png" RDEPEND=">=media-libs/libsdl-1.2.0 >=sys-libs/zlib-1.2.3-r1 amd64? ( app-emulation/emul-linux-x86-sdl ) - ao? ( media-libs/libao ) + !amd64? ( ao? ( media-libs/libao ) ) opengl? ( virtual/opengl ) png? ( media-libs/libpng )" DEPEND="${RDEPEND} @@ -27,6 +27,12 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${PN}_${PV//./_}/src" +pkg_setup() { + if use ao && [[ "${ARCH}" = "amd64" ]]; then + ewarn "libao use flag is disabled on amd64 since deps cannot be met." + fi +} + src_unpack() { unpack ${A} cd "${S}" @@ -36,8 +42,14 @@ src_unpack() { [[ "${ARCH}" = amd64 ]] && epatch "${FILESDIR}"/${P}-gzdirect.patch # Remove hardcoded CFLAGS and LDFLAGS + if use custom-cflags; then + sed -i -e '/^\s*CFLAGS=.* -fomit-frame-pointer /d' \ + configure.in || die + append-flags -fomit-frame-pointer -D__RELEASE__ + else + strip-flags + fi sed -i \ - -e '/^\s*CFLAGS=.* -fomit-frame-pointer /d' \ -e 's:^\s*CFLAGS=.* -I\/usr\/local\/include .*$:CFLAGS="${CFLAGS} -I.":' \ -e '/^\s*LDFLAGS=.* -L\/usr\/local\/lib /d' \ configure.in || die @@ -47,16 +59,24 @@ src_unpack() { src_compile() { tc-export CC + use amd64 && multilib_toolchain_setup x86 + + local myconf + use custom-cflags && myconf="--disable-cpucheck force_arch=no" + + if use ao && [[ "${ARCH}" != amd64 ]]; then + myconf="--enable-ao" + else + myconf="--disable-ao" + fi + egamesconf \ - $(use_enable ao libao) \ $(use_enable png libpng) \ $(use_enable opengl) \ --disable-debug \ - --disable-debugger \ - --disable-cpucheck \ --enable-release \ - force_arch=no \ + ${myconf} \ || die emake || die "emake failed" } @@ -64,8 +84,8 @@ src_compile() { src_install() { dogamesbin zsnes || die "dogamesbin failed" newman linux/zsnes.1 zsnes.6 - dodoc ../docs/{*.txt,README.LINUX} - dohtml -r ../docs/Linux/* + dodoc "${WORKDIR}"/docs/{*.txt,README.LINUX} + dohtml -r "${WORKDIR}"/docs/Linux/* make_desktop_entry zsnes ZSNES zsnes.png doicon "${T}/${PN}.png" prepgamesdirs -- 2.26.2