diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-arcade/methane/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-arcade/methane/files')
-rw-r--r-- | games-arcade/methane/files/methane-1.5.1-gentoo.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/games-arcade/methane/files/methane-1.5.1-gentoo.patch b/games-arcade/methane/files/methane-1.5.1-gentoo.patch new file mode 100644 index 000000000000..9e49ecdff25c --- /dev/null +++ b/games-arcade/methane/files/methane-1.5.1-gentoo.patch @@ -0,0 +1,62 @@ +--- Makefile.old 2012-11-26 18:58:48.201837870 +0100 ++++ Makefile 2012-11-27 12:30:16.038998128 +0100 +@@ -1,5 +1,5 @@ +-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` +-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` ++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` ++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` + + 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 + +@@ -10,7 +10,7 @@ + @echo "=================================" + + methane: ${OBJF} +- g++ ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} ++ $(CXX) ${LDFLAGS} ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} + + clean: + @rm -Rf build +@@ -23,6 +23,6 @@ + build/%.o : sources/%.cpp + @echo " Compiling $<..." + @if [ ! -d build ]; then mkdir build; fi +- gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ ++ $(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ + + +--- sources/methane.cpp.old 2012-11-27 13:49:22.993003266 +0100 ++++ sources/methane.cpp 2012-11-27 17:37:23.051913777 +0100 +@@ -80,15 +80,15 @@ + return 0; + } + +- CL_AutoPtr<CL_SetupSound> setup_sound; +- CL_AutoPtr<CL_SoundOutput> sound_output; +- CL_AutoPtr<CL_SetupMikMod> setup_mikmod; ++ CL_UniquePtr<CL_SetupSound> setup_sound; ++ CL_UniquePtr<CL_SoundOutput> sound_output; ++ CL_UniquePtr<CL_SetupMikMod> setup_mikmod; + + if (GLOBAL_SoundEnable) + { +- setup_sound = new CL_SetupSound; +- sound_output = new CL_SoundOutput(44100); +- setup_mikmod = new CL_SetupMikMod; ++ setup_sound = cl_move(CL_UniquePtr<CL_SetupSound>(new CL_SetupSound)); ++ sound_output = cl_move(CL_UniquePtr<CL_SoundOutput>(new CL_SoundOutput(44100))); ++ setup_mikmod = cl_move(CL_UniquePtr<CL_SetupMikMod>(new CL_SetupMikMod)); + } + + // Set the video mode +--- sources/target.cpp.old 2012-11-28 21:34:32.666878913 +0100 ++++ sources/target.cpp 2012-11-28 21:35:16.371247221 +0100 +@@ -132,7 +132,7 @@ + CL_GraphicContext gc = m_pWindow->get_gc(); + + // Find the resources directory: +- CL_String resource_dir = CL_Directory::get_resourcedata("methane"); ++ CL_String resource_dir = "@GENTOO_DATADIR@/methane/"; + CL_String dataname("page_01.png"); + CL_String filename = resource_dir + dataname; + if (!CL_FileHelp::file_exists(filename)) |