diff options
| -rw-r--r-- | games-arcade/excido/ChangeLog | 9 | ||||
| -rw-r--r-- | games-arcade/excido/Manifest | 15 | ||||
| -rw-r--r-- | games-arcade/excido/excido-0.1.5c-r2.ebuild | 38 | ||||
| -rw-r--r-- | games-arcade/excido/files/excido-0.1.5c-build.patch | 29 | ||||
| -rw-r--r-- | games-arcade/excido/files/excido-0.1.5c-freealut.patch | 38 |
5 files changed, 127 insertions, 2 deletions
diff --git a/games-arcade/excido/ChangeLog b/games-arcade/excido/ChangeLog index 8ad0de5299d7..65134ddb774b 100644 --- a/games-arcade/excido/ChangeLog +++ b/games-arcade/excido/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-arcade/excido # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/excido/ChangeLog,v 1.16 2009/02/03 23:37:20 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/excido/ChangeLog,v 1.17 2009/02/04 17:00:50 nyhm Exp $ + +*excido-0.1.5c-r2 (04 Feb 2009) + + 04 Feb 2009; Tristan Heaven <nyhm@gentoo.org> + +files/excido-0.1.5c-build.patch, +files/excido-0.1.5c-freealut.patch, + +excido-0.1.5c-r2.ebuild: + Fix segfault with recent openal/freealut; more makefile cleanup 03 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> excido-0.1.5c-r1.ebuild: diff --git a/games-arcade/excido/Manifest b/games-arcade/excido/Manifest index 9409cdf8bc07..6ef318c3414a 100644 --- a/games-arcade/excido/Manifest +++ b/games-arcade/excido/Manifest @@ -1,5 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX excido-0.1.5c-alut.patch 735 RMD160 5c6d5deba2abc6330528f4e633e4b97d88cf845d SHA1 677358bc38cdc60d56e69f39f18c4b2fc3d9c39b SHA256 0665346b64d7045a78b50fb9f78e47dd24696bb26ca1090ee269677de6eb65d1 +AUX excido-0.1.5c-build.patch 1029 RMD160 a7aa54aa08d3f576aed0521e085331967507031c SHA1 757fc4d104e7ada21ee7b14db79d7ac764bf1433 SHA256 539f17d2df6c37d22659f9a68cb0c4ad55316c95e14844e3910985d3f8b69ef9 +AUX excido-0.1.5c-freealut.patch 1200 RMD160 24cca6771bbee183caea2ef734987a8adb6ad3ef SHA1 b2206ece62a15bbb7530ccb25919b554b1bf3daf SHA256 59668e957767f873c56c44432b7e0282e4bfca277013ab7f8629cb116a11a3ab DIST excido-0.1.5c-src.tar.bz2 2981629 RMD160 22594630726e2e5f95268dd25897d31ff69a4287 SHA1 ba03dcfea2209f8b09a2d3db1d58547ce89e75a5 SHA256 d53bcaf4e18265ece7c4206c91cdf26682ff1aeba917cb9d5bd2f4218ce364ef EBUILD excido-0.1.5c-r1.ebuild 1443 RMD160 24392ed45a38f95c0aacf5e7f14b84db0872475e SHA1 fec52dedbf5aed1f40628e746724bc20a566f0a8 SHA256 5f0ea42c90cd8fd235e1d18ddb468f3c09abc7b9caa1c4637414d99078c001c6 -MISC ChangeLog 2224 RMD160 84ce87a6cfc8d76fc52c9fd424c5575f55a471ea SHA1 8b1e9cff17db325bb1c748fd3f339d6b276ac30d SHA256 7738579a642f77b43c19e68b8c7d5150d9012dbc2c9b515bd2bf8a81f69616a8 +EBUILD excido-0.1.5c-r2.ebuild 1000 RMD160 001bd197aa479814ac41fc09682ce118ab6ca0a8 SHA1 0f269ea9defd20a65ccd7817f712473992859d56 SHA256 a7af34ed0a1507659b7598b2605a0141085dbd107457aff927be78457402cc5a +MISC ChangeLog 2468 RMD160 dc7f2c6fef8e6e931224d9d77b06e764b64ca044 SHA1 4b3cb69746a8375822e5c9416ed2870bdb2bf587 SHA256 93360136eb01ead79796a0c5dd1bfffb2d09f9e63fd123bbd4ec5e99e64d31e7 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkmJyccACgkQdz7hIScOURF0hgCeLGczkVpG2xusxjAmi+hYALjN +7tEAn37V/+ULPTIoNfMVqb1JtlmMSfjQ +=Tgyi +-----END PGP SIGNATURE----- diff --git a/games-arcade/excido/excido-0.1.5c-r2.ebuild b/games-arcade/excido/excido-0.1.5c-r2.ebuild new file mode 100644 index 000000000000..35c42fac9519 --- /dev/null +++ b/games-arcade/excido/excido-0.1.5c-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/excido/excido-0.1.5c-r2.ebuild,v 1.1 2009/02/04 17:00:50 nyhm Exp $ + +EAPI=2 +inherit games + +DESCRIPTION="A fast paced action game" +HOMEPAGE="http://icculus.org/excido/" +SRC_URI="http://icculus.org/excido/${P}-src.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="dev-games/physfs + media-libs/libsdl[opengl] + media-libs/sdl-mixer + media-libs/sdl-ttf + media-libs/sdl-image[png] + media-libs/openal + media-libs/freealut" + +PATCHES=( "${FILESDIR}"/${P}-freealut.patch "${FILESDIR}"/${P}-build.patch ) + +src_compile() { + emake DATADIR="${GAMES_DATADIR}"/${PN}/ || die "emake failed" +} + +src_install() { + dogamesbin ${PN} || die "dogamesbin failed" + insinto "${GAMES_DATADIR}"/${PN} + doins data/* || die "doins failed" + dodoc BUGS CHANGELOG HACKING README TODO \ + keyguide.txt data/CREDITS data/*.txt + prepgamesdirs +} diff --git a/games-arcade/excido/files/excido-0.1.5c-build.patch b/games-arcade/excido/files/excido-0.1.5c-build.patch new file mode 100644 index 000000000000..779d9c3f4066 --- /dev/null +++ b/games-arcade/excido/files/excido-0.1.5c-build.patch @@ -0,0 +1,29 @@ +--- Makefile ++++ Makefile +@@ -1,8 +1,8 @@ +-CC=g++ +-CFLAGS=`sdl-config --cflags` #-g -Wall #-O2 ++CXX?=g++ ++CXXFLAGS+=$(shell sdl-config --cflags) #-g -Wall #-O2 + #CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2 + OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}} +-LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU ++LIBS = $(shell sdl-config --libs) -lSDL_image -lSDL_ttf -lphysfs -lopenal -lalut -lGL -lGLU + #LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/*.o SDL_ttf/*.o -L. physfs/*.o openal/*.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU + PREFIX=/usr/local + BINDIR=$(PREFIX)/bin/ +@@ -16,12 +16,12 @@ + + + .cpp.o: +- $(CC) $(CFLAGS) $(DEFINES) -o ${patsubst %.cpp, %.o, $<} -c $< ++ $(CXX) $(CXXFLAGS) $(DEFINES) -o ${patsubst %.cpp, %.o, $<} -c $< + + all: $(TARGET) + + $(TARGET): $(OBJS) +- $(CC) $(CFLAGS) -o $(TARGET) $(LIBS) $(OBJS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) + + clean: + rm -f $(OBJS) $(TARGET) diff --git a/games-arcade/excido/files/excido-0.1.5c-freealut.patch b/games-arcade/excido/files/excido-0.1.5c-freealut.patch new file mode 100644 index 000000000000..d0538083af1f --- /dev/null +++ b/games-arcade/excido/files/excido-0.1.5c-freealut.patch @@ -0,0 +1,38 @@ +--- src/SoundCore.cpp ++++ src/SoundCore.cpp +@@ -352,32 +352,13 @@ + + PHYSFS_close(filehandle); + +- ALenum format; +- ALvoid *data; +- ALsizei size,freq; +- ALboolean loop=AL_FALSE; + ALenum error; + + alGetError(); + +- alGenBuffers(1,&newsample.alid); +- if((error=alGetError())!=AL_NO_ERROR){ +- fprintf(stderr,"SoundCore::LoadSample: Error on alGenBuffers\n"); +- PrintALError(error); +- } +- alutLoadWAVMemory((ALbyte*)filedata,&format,&data,&size,&freq,&loop); +- if((error=alGetError())!=AL_NO_ERROR){ +- fprintf(stderr,"SoundCore::LoadSample: Error on alutLoadWAVMemory\n"); +- PrintALError(error); +- } +- alBufferData(newsample.alid,format,data,size,freq); +- if((error=alGetError())!=AL_NO_ERROR){ +- fprintf(stderr,"SoundCore::LoadSample: Error on alBufferData\n"); +- PrintALError(error); +- } +- alutUnloadWAV(format,data,size,freq); +- if((error=alGetError())!=AL_NO_ERROR){ +- fprintf(stderr,"SoundCore::LoadSample: Error on alutUnloadWAV\n"); ++ newsample.alid=alutCreateBufferFromFileImage(filedata, filesize); ++ if(((error=alGetError())!=AL_NO_ERROR)||(newsample.alid==AL_NONE)){ ++ fprintf(stderr,"SoundCore::LoadSample: Error on alutCreateBufferFromFileImage\n"); + PrintALError(error); + } + |