diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-06-24 23:39:15 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-06-24 23:39:15 +0000 |
| commit | 2a36002048bbcb9fad5c3eed5b5fc8eee8ded6cf (patch) | |
| tree | 0c3ef9cb4153070563d621a6101ce0b4d1ab0330 /games-arcade | |
| parent | Automated update of use.local.desc (diff) | |
| download | historical-2a36002048bbcb9fad5c3eed5b5fc8eee8ded6cf.tar.gz historical-2a36002048bbcb9fad5c3eed5b5fc8eee8ded6cf.tar.bz2 historical-2a36002048bbcb9fad5c3eed5b5fc8eee8ded6cf.zip | |
EAPI=2; tidy; add patch for building with glibc210 from Martin Väth (bug #274833)
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-arcade')
4 files changed, 37 insertions, 14 deletions
diff --git a/games-arcade/emilia-pinball/ChangeLog b/games-arcade/emilia-pinball/ChangeLog index 2553bf7958d0..d32ff80fedc2 100644 --- a/games-arcade/emilia-pinball/ChangeLog +++ b/games-arcade/emilia-pinball/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-arcade/emilia-pinball -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/ChangeLog,v 1.15 2008/02/29 18:55:23 carlo Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/ChangeLog,v 1.16 2009/06/24 23:39:15 mr_bones_ Exp $ + + 24 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org> + +files/emilia-pinball-0.3.1-glibc210.patch, emilia-pinball-0.3.1.ebuild: + EAPI=2; tidy; add patch for building with glibc210 from Martin Väth (bug + #274833) 29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> emilia-pinball-0.3.1.ebuild: diff --git a/games-arcade/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest index e69d391aba60..3435e3dcd081 100644 --- a/games-arcade/emilia-pinball/Manifest +++ b/games-arcade/emilia-pinball/Manifest @@ -1,4 +1,5 @@ +AUX emilia-pinball-0.3.1-glibc210.patch 379 RMD160 af16d019329c553a9d22cc5dbfdbf7907d5f03b2 SHA1 70e79bb369138d132ce93edd839c373301621e1e SHA256 7947e7c4327b339185da9d87c83fdf9c03d43d6dcb678b93d67b36de116f94da DIST pinball-0.3.1.tar.gz 6082982 RMD160 ba85469c9f53f7a0a46ab26aa4e45666b2dca806 SHA1 7daf63a7b7e586ede2a6ffae3e53abd0e23fff22 SHA256 ba47989f7fb6e294faa95285563220c8b01c3dbb9aa1bc29828eb7e832855cb8 -EBUILD emilia-pinball-0.3.1.ebuild 1378 RMD160 b00ddbebdf854a816997a31b3c8bfeffd3a4d165 SHA1 24edb8dcde89b6e1228a59d99f137df11e952609 SHA256 9eb73ead1448b76465ab9da59865cde5a033e98f1c688e98d7bda2ed2f7b3ff4 -MISC ChangeLog 2259 RMD160 47d29355951d2289e6f571825768b63a26654bca SHA1 262af24df9ddb557d8ec85841c789e5e3d9550b2 SHA256 3e701684f7ea9404f8ba14a29decab659d9148ffd25daadef5321a11148e14a1 +EBUILD emilia-pinball-0.3.1.ebuild 1467 RMD160 ca84e94dbdf1416e8e87e5cd601d96d3c01c715e SHA1 a6e2cf5caa1b3f57440eb9427c35976d922e9ad7 SHA256 31b3ee536f466078fe3e40db63712bacc5495766fdd3864a5c948d29219c7a0d +MISC ChangeLog 2481 RMD160 917e7bb0d4555371cedd14bca90cf278f6b4e88e SHA1 e62c19a5c8248a23f2f153cf00b477377ad16d10 SHA256 72bfaa05dc6fec2fad9cc25a01ddf0c804c16356eafbd587664d29a11880f63e MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1.ebuild index b79517ee32a0..917e173874b6 100644 --- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1.ebuild +++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/emilia-pinball-0.3.1.ebuild,v 1.14 2008/02/29 18:55:23 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/emilia-pinball-0.3.1.ebuild,v 1.15 2009/06/24 23:39:15 mr_bones_ Exp $ +EAPI=2 inherit eutils games MY_PN=${PN/emilia-/} @@ -17,24 +18,27 @@ IUSE="" RDEPEND="virtual/opengl x11-libs/libSM - media-libs/libsdl - media-libs/sdl-image - media-libs/sdl-mixer" + media-libs/libsdl[opengl,video,X] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis]" DEPEND="${RDEPEND} x11-libs/libXt" S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}"/${P}-glibc210.patch ) + +src_configure() { + egamesconf --with-x +} + src_compile() { - egamesconf \ - --with-x \ - || die emake -j1 CXXFLAGS="${CXXFLAGS}" || die "emake failed" } src_install() { dodoc README || die "dodoc failed" - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" dosym "${GAMES_BINDIR}"/pinball "${GAMES_BINDIR}"/emilia-pinball mv "${D}/${GAMES_PREFIX}/include" "${D}/usr/" \ || die "mv failed (include)" @@ -45,6 +49,6 @@ src_install() { -e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \ "${D}"/usr/bin/pinball-config || die "sed failed" newicon data/pinball.xpm ${PN}.xpm - make_desktop_entry emilia-pinball "Emilia pinball" ${PN} + make_desktop_entry emilia-pinball "Emilia pinball" prepgamesdirs } diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch new file mode 100644 index 000000000000..800dbeae21a7 --- /dev/null +++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch @@ -0,0 +1,13 @@ +--- base/Config.cpp ++++ base/Config.cpp +@@ -423,8 +423,8 @@ + m_sDataDir = string(EM_DATADIR) + "/"; + m_sExeDir = "./"; + if ( *( m_sDataDir.c_str() ) != '/' ) { +- char* ptr=0; +- char* ptrw = 0; ++ const char* ptr=0; ++ const char* ptrw = 0; + //cout<<"relative to exe file"<<endl; + ptr = (strrchr(argv0,'/')); // unix /cygwin / check win32 + #ifdef WIN32 |