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-puzzle/flobopuyo/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-puzzle/flobopuyo/files')
3 files changed, 174 insertions, 0 deletions
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch new file mode 100644 index 000000000000..6c5d39445a4c --- /dev/null +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch @@ -0,0 +1,25 @@ +Index: flobopuyo-0.20/IosVector.cpp +=================================================================== +--- flobopuyo-0.20.orig/IosVector.cpp ++++ flobopuyo-0.20/IosVector.cpp +@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize()
+ void IosVector::dumpVector() const {
+ fprintf(stderr, "Size: %d\n", getSize());
+ for (int i = 0, j = getSize() ; i < j ; i++)
+- fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
++ fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));
+ fprintf(stderr, "\n");
+ }
+Index: flobopuyo-0.20/PuyoGame.cpp +=================================================================== +--- flobopuyo-0.20.orig/PuyoGame.cpp ++++ flobopuyo-0.20/PuyoGame.cpp +@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe + return (PuyoState)newItem;
+ }
+ else
+- return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
++ return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
+ }
+
+ PuyoPuyo::PuyoPuyo(PuyoState state)
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch new file mode 100644 index 000000000000..6b3f54ef5630 --- /dev/null +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch @@ -0,0 +1,13 @@ +Index: flobopuyo-0.20/PuyoGame.h +=================================================================== +--- flobopuyo-0.20.orig/PuyoGame.h ++++ flobopuyo-0.20/PuyoGame.h +@@ -46,7 +46,7 @@ public:
+ virtual ~PuyoPuyo() {};
+ PuyoState getPuyoState();
+ void setPuyoState(PuyoState state);
+- bool PuyoPuyo::isFalling();
++ bool isFalling();
+ int getPuyoX() const;
+ int getPuyoY() const;
+ void setPuyoXY(int X, int Y);
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch new file mode 100644 index 000000000000..64cd0335ce9c --- /dev/null +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch @@ -0,0 +1,136 @@ +--- Makefile.orig 2004-10-08 18:41:12.000000000 -0400 ++++ Makefile 2008-08-06 19:48:47.000000000 -0400 +@@ -41,15 +41,13 @@ + ############## + + SDL_CONFIG=sdl-config +-CC=g++ +-CXX=g++ + +-CFLAGS= -DDATADIR=\"${DATADIR}\" +-LDFLAGS= ++CXXFLAGS+= -DDATADIR=\"${DATADIR}\" + + ifneq ($(PLATFORM), $(CYGWIN_VERSION)) +-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include +-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs` ++CXXFLAGS:=$(CXXFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include ++LDFLAGS:=$(LDFLAGS) ++LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs` + endif + + HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\ +@@ -71,46 +69,46 @@ + ################ + # Mac OS X + ifeq ($(PLATFORM), Darwin) +-CFLAGS:=$(CFLAGS) -DMACOSX -UDATADIR ++CXXFLAGS:=$(CXXFLAGS) -DMACOSX -UDATADIR + endif + + ################ + # Win32 + ifeq ($(PLATFORM), $(CYGWIN_VERSION)) +-CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) +-LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain ++CXXFLAGS:=$(CXXFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) ++LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) ++LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain + endif + + ifeq ($(ENABLE_AUDIO), true) +-CFLAGS:=$(CFLAGS) -DUSE_AUDIO=1 ++CXXFLAGS:=$(CXXFLAGS) -DUSE_AUDIO=1 + OBJFILES:=$(OBJFILES) + endif + + ifeq ($(ENABLE_OPENGL), true) +-CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1 ++CXXFLAGS:=$(CXXFLAGS) -DHAVE_OPENGL=1 + OBJFILES:=$(OBJFILES) glSDL.o + ifeq ($(PLATFORM), Linux) +-LDFLAGS:=$(LDFLAGS) -lGL ++LDFLAGS:=$(LDFLAGS) ++LIBS:=$(LIBS) -lGL + endif + endif + + ifeq ($(ENABLE_DGA), true) + ifeq ($(PLATFORM), Linux) +-CFLAGS:=$(CFLAGS) -DUSE_DGA=1 ++CXXFLAGS:=$(CXXFLAGS) -DUSE_DGA=1 + endif + endif + + ifeq ($(DEBUG), true) +-CFLAGS:=$(CFLAGS) -DDEBUG=1 -g ++CXXFLAGS:=$(CXXFLAGS) -DDEBUG=1 -g + LDFLAGS:=$(LDFLAGS) -g + endif + +-CXXFLAGS=${CFLAGS} +- + all: prelude flobopuyo + + flobopuyo: ${OBJFILES} +- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES} ++ @echo "[flobopuyo]" && $(CXX) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image + @echo "--------------------------------------" + @echo " Compilation finished" + @[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true +@@ -121,14 +119,14 @@ + prelude: + @rm -f WARNINGS + @touch WARNINGS +- @echo "Compiling with CFLAGS=$(CFLAGS)" ++ @echo "Compiling with CXXFLAGS=$(CXXFLAGS)" + @echo "Compiling with LDFLAGS=$(LDFLAGS)" + + %.o:%.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false) ++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $< + + %.o:%.cpp +- @echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false) ++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $< + + PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES} + HiScores.o:HiScores.cpp HiScores.h preferences.h +@@ -155,10 +153,10 @@ + IosException.o:IosException.cpp + IosVector.o:IosVector.cpp + glSDL.o:glSDL.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS ++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $< + @rm -f EXT_WARNINGS + SDL_prim.o:SDL_prim.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS ++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $< + @rm -f EXT_WARNINGS + corona.o:corona.cpp + corona32.o:corona32.cpp +@@ -178,7 +176,6 @@ + rm -f .DS_Store */.DS_Store */*/.DS_Store .gdb_history + + install: flobopuyo +- strip flobopuyo + mkdir -p ${INSTALL_BINDIR} + mkdir -p ${INSTALL_DATADIR} + cp -r data/* ${INSTALL_DATADIR} +@@ -191,7 +188,7 @@ + chmod a+rx ${INSTALL_BINDIR}/flobopuyo + + flobopuyo-static: prelude ${OBJFILES} +- @echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static ${OBJFILES}\ ++ @echo "[flobopuyo-static]" && g++ $(CXXFLAGS) -o flobopuyo-static ${OBJFILES}\ + /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a /sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs` + @echo "--------------------------------------" + @echo " Compilation finished" +@@ -207,7 +204,6 @@ + rm -rf $(bundle_name)/Contents/Resources/data/CVS $(bundle_name)/Contents/Resources/data/*/CVS + rm -rf $(bundle_name)/Contents/Resources/data/.xvpics $(bundle_name)/Contents/Resources/data/*/.xvpics + rm -f $(bundle_name)/Contents/Resources/data/.DS_Store $(bundle_name)/Contents/Resources/data/*/.DS_Store +- strip $(bundle_name)/Contents/MacOS/flobopuyo + + mac-package: bundle + mkdir -p $(macimage_name) |