| 1 |
tupone 12/11/29 08:24:21 |
| 2 |
|
| 3 |
Added: methane-1.5.1-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bump to 1.5.1 Bug #349548 |
| 6 |
|
| 7 |
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 0145142D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-arcade/methane/files/methane-1.5.1-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/methane/files/methane-1.5.1-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/methane/files/methane-1.5.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: methane-1.5.1-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
--- Makefile.old 2012-11-26 18:58:48.201837870 +0100 |
| 18 |
+++ Makefile 2012-11-27 12:30:16.038998128 +0100 |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
-METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2` |
| 21 |
-METHANE_LIBS = `pkg-config --libs clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2` |
| 22 |
+METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` |
| 23 |
+METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` |
| 24 |
|
| 25 |
OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o |
| 26 |
|
| 27 |
@@ -10,7 +10,7 @@ |
| 28 |
@echo "=================================" |
| 29 |
|
| 30 |
methane: ${OBJF} |
| 31 |
- g++ ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} |
| 32 |
+ $(CXX) ${LDFLAGS} ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} |
| 33 |
|
| 34 |
clean: |
| 35 |
@rm -Rf build |
| 36 |
@@ -23,6 +23,6 @@ |
| 37 |
build/%.o : sources/%.cpp |
| 38 |
@echo " Compiling $<..." |
| 39 |
@if [ ! -d build ]; then mkdir build; fi |
| 40 |
- gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ |
| 41 |
+ $(CC) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ |
| 42 |
|
| 43 |
|
| 44 |
--- sources/methane.cpp.old 2012-11-27 13:49:22.993003266 +0100 |
| 45 |
+++ sources/methane.cpp 2012-11-27 17:37:23.051913777 +0100 |
| 46 |
@@ -80,15 +80,15 @@ |
| 47 |
return 0; |
| 48 |
} |
| 49 |
|
| 50 |
- CL_AutoPtr<CL_SetupSound> setup_sound; |
| 51 |
- CL_AutoPtr<CL_SoundOutput> sound_output; |
| 52 |
- CL_AutoPtr<CL_SetupMikMod> setup_mikmod; |
| 53 |
+ CL_UniquePtr<CL_SetupSound> setup_sound; |
| 54 |
+ CL_UniquePtr<CL_SoundOutput> sound_output; |
| 55 |
+ CL_UniquePtr<CL_SetupMikMod> setup_mikmod; |
| 56 |
|
| 57 |
if (GLOBAL_SoundEnable) |
| 58 |
{ |
| 59 |
- setup_sound = new CL_SetupSound; |
| 60 |
- sound_output = new CL_SoundOutput(44100); |
| 61 |
- setup_mikmod = new CL_SetupMikMod; |
| 62 |
+ setup_sound = cl_move(CL_UniquePtr<CL_SetupSound>(new CL_SetupSound)); |
| 63 |
+ sound_output = cl_move(CL_UniquePtr<CL_SoundOutput>(new CL_SoundOutput(44100))); |
| 64 |
+ setup_mikmod = cl_move(CL_UniquePtr<CL_SetupMikMod>(new CL_SetupMikMod)); |
| 65 |
} |
| 66 |
|
| 67 |
// Set the video mode |
| 68 |
--- sources/target.cpp.old 2012-11-28 21:34:32.666878913 +0100 |
| 69 |
+++ sources/target.cpp 2012-11-28 21:35:16.371247221 +0100 |
| 70 |
@@ -132,7 +132,7 @@ |
| 71 |
CL_GraphicContext gc = m_pWindow->get_gc(); |
| 72 |
|
| 73 |
// Find the resources directory: |
| 74 |
- CL_String resource_dir = CL_Directory::get_resourcedata("methane"); |
| 75 |
+ CL_String resource_dir = "@GENTOO_DATADIR@/methane/"; |
| 76 |
CL_String dataname("page_01.png"); |
| 77 |
CL_String filename = resource_dir + dataname; |
| 78 |
if (!CL_FileHelp::file_exists(filename)) |
Archives