diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-02-04 17:00:50 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-02-04 17:00:50 +0000 |
| commit | 4ab11234477f692c104c8aea2989c45374de1bf5 (patch) | |
| tree | 00e7ae6ba30683db6a0c255d0dc8593aadfbe96c /games-arcade/excido/files | |
| parent | Depend on media-libs/libpng thanks to Constantine D. Kardaris (bug #257437). (diff) | |
| download | historical-4ab11234477f692c104c8aea2989c45374de1bf5.tar.gz historical-4ab11234477f692c104c8aea2989c45374de1bf5.tar.bz2 historical-4ab11234477f692c104c8aea2989c45374de1bf5.zip | |
Fix segfault with recent openal/freealut; more makefile cleanup
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'games-arcade/excido/files')
| -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 |
2 files changed, 67 insertions, 0 deletions
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); + } + |