From 391b5b359a346aff490103da7dddc85047f83830 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Oct 2021 20:54:53 +0100 Subject: gentoo resync : 01.10.2021 --- games-puzzle/flobopuyo/Manifest | 8 +- .../flobopuyo/files/flobopuyo-0.20-gcc4.patch | 25 ---- .../flobopuyo/files/flobopuyo-0.20-gcc41.patch | 28 +++-- .../flobopuyo/files/flobopuyo-0.20-libs.patch | 136 --------------------- .../flobopuyo/files/flobopuyo-0.20-makefile.patch | 62 ++++++++++ .../flobopuyo/files/flobopuyo-0.20-segfault.patch | 84 +++++++++++++ games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild | 50 -------- games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild | 56 +++++++++ 8 files changed, 225 insertions(+), 224 deletions(-) delete mode 100644 games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch delete mode 100644 games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch create mode 100644 games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch create mode 100644 games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch delete mode 100644 games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild create mode 100644 games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild (limited to 'games-puzzle/flobopuyo') diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest index 2782e1587c07..49bb6d7334f5 100644 --- a/games-puzzle/flobopuyo/Manifest +++ b/games-puzzle/flobopuyo/Manifest @@ -1,7 +1,7 @@ -AUX flobopuyo-0.20-gcc4.patch 967 BLAKE2B befdc13ec4da55497fae89f79aa1ad518738ffd69a8eae10167551dc45daeffbb9130adb319e426a8d5c65e2743a0bfc0d83dfec2ee19855d72fe86d0dba4478 SHA512 f1bfdbf6ba4e4fc2be453aa7d2299f70a2a47a1906e2b7043ef8c14a7b4c8e5bc1de29565e1404ba9c6688c03f4439f123b3325f3223bd3771eee9fe458ecd62 -AUX flobopuyo-0.20-gcc41.patch 447 BLAKE2B 189a5e2f970fd4e9ea1e5e12b6344e9c96d29a4de99ace9a9fbcaba35b832369159535d3195c871b91e75678b97f274fc0e4bf788a17608fdf7ab84a75716228 SHA512 05b888959fcc4e1bc0a1248c9efdbdc9768ee25382fb67dad1d49214c7180e97fa498853bca4483c7786f946d9b0527cfbd79065e5585cc26f72ade3900219ec -AUX flobopuyo-0.20-libs.patch 4687 BLAKE2B fc571a5de46bb52bfa65eacc3078fddbe6b5c5f1e58378b2ff7e1f91b6130a0011705f6f17cf47dbe3c5417fbc7dfa3f708b970548f81f7234d467d11b6cf09e SHA512 fd879dca79a8532909286a50ec9d3d66b2fdf149a64602ee8990aad2a3de8dbed268f6837d39039db77774ab7e29a91b121f06dc172eae59a6c69c0f799a810b +AUX flobopuyo-0.20-gcc41.patch 696 BLAKE2B c6015139b6ffcd61d813c2dea015e2eb30aa57b6969662a98f6f70d1065c5add4765dc14d80866e4591a05150af2dff320ecde3cbf381a0b0673176903fbb6eb SHA512 030cfc1eb01154b96c57116d727a4c6ae899cb7b47c52e3bc387b6557e2dbd1308b2d37819c565e7d88f4eac68d79fa587dcdb5b0d217b2995570b7d521fb558 +AUX flobopuyo-0.20-makefile.patch 1974 BLAKE2B 2dea13acb6e30c57ec4f782727203829996f20b65f223ee3130e4339cad9b3c308f36dffaf600de24d71bf8b8d0565a89b0222775bdd7d6f34b4451c7d7b04b4 SHA512 a6b1955caf15a145b830076e4c3205ccd31d2f3ee0333e2a85cc66fdd7d184b3113fe004f0bd539036afb2603eaa227f89c7826ba845bfcd7ffdc063dc01854b +AUX flobopuyo-0.20-segfault.patch 4094 BLAKE2B 626c544742e1984912efe97a687a72713e0e17b9d137e35888efaa63683044caca83b6a3446ae451e33663d73ef0ed4fb88dd78ed3b5ac5c661973db7c178e12 SHA512 7fae3d835303566eb73a317204abdde2dbc56e972f9661d433b825eeb40397130c09087e4c6fdd881f627286884ed802c2a3cb38c4a8f7169e5408df05d2913e DIST flobopuyo-0.20.tgz 2949750 BLAKE2B 5e6b451ca05c4e3c497889fe350ceea8dffd9a0bc53b69747449e1ab607c26328ee3d2d1acb9ebf8a7fa634e43e12746f02c50166f16c7e2d3bbfa6531878250 SHA512 8ec7e690e53cfc171959663ef07912f2b23ae1842b72faa0125de8d6d2ad93672b9b4d68593b1f49f97c53a13409aca7bc5a598858fc7cff4698a4064ec95276 DIST flobopuyo.png 25038 BLAKE2B ab9af4d0785614725c5b03942956c5cabfdfa38b3f5b2870dfbed9428ab51c553dad784b643f3387bfb4d90073befe9ea6d6bac57bbb266154b28092410d5c1d SHA512 6eca6fd1559d8ecb62b19be9fcaef2af1edb727154dd4e10f9f0f9ef9863d99c9445689bd64724cb5da0b251384efc491acfa40bf5105fa9bdcecad3f809ceb6 -EBUILD flobopuyo-0.20-r2.ebuild 1096 BLAKE2B 139dca0ecac332f94b86cd7de8a9c3acfdafa00eec26674a6a55404db481b20e6d691cb748e5d75e0ad729bf97cb9eaf2520b596a7f5d36d985599780c774a18 SHA512 aa572ac59adaf81ddb4cb7312fba084f8ac5c2aea9c46c650f903622feafc65a33a80708af9aeaa411f1f1880061eb522dcd29773d1ebcb5568f3941a68df57b +EBUILD flobopuyo-0.20-r3.ebuild 1078 BLAKE2B b4019ad7b61af7445056e43edcb08ee0e4516073a82805e525963e869050b9c2fcbbce8a2bbb5a0ef0eec0cfa3735f93a647268834b0195e1048b704c7f36b59 SHA512 9e7452773d5de3f9b91232a7c563c29bf6d945fabb42e80460528f2ce7b544fef49fee229b40c45489335dbdc564b9e30bbebdbf612afbaa234ba4ce28a16197 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610 diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch deleted file mode 100644 index 6c5d39445a4c..000000000000 --- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 index 6b3f54ef5630..765bcae8d21e 100644 --- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch @@ -1,13 +1,23 @@ -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(); +https://bugs.gentoo.org/106406 +https://bugs.gentoo.org/121259 +--- a/IosVector.cpp ++++ b/IosVector.cpp +@@ -104,3 +104,3 @@ + 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"); +--- a/PuyoGame.cpp ++++ b/PuyoGame.cpp +@@ -47,3 +47,3 @@ + else +- return (PuyoState)(int)(sequenceItems.getElementAt(sequence)); ++ return (PuyoState)(long)(sequenceItems.getElementAt(sequence)); + } +--- a/PuyoGame.h ++++ b/PuyoGame.h +@@ -48,3 +48,3 @@ 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 deleted file mode 100644 index b9b55a333cb6..000000000000 --- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- a/Makefile.orig 2004-10-08 18:41:12.000000000 -0400 -+++ b/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) diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch new file mode 100644 index 000000000000..670f18889cab --- /dev/null +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch @@ -0,0 +1,62 @@ +Set non-/games paths, respect FLAGS, add LIBS to pass them in right order, +use pkg-config, don't strip, and show commands/errors directly. + +https://bugs.gentoo.org/125550 +https://bugs.gentoo.org/126835 +https://bugs.gentoo.org/234013 +--- a/Makefile ++++ b/Makefile +@@ -15,4 +15,4 @@ + PREFIX=/usr/local +-DATADIR=$(PREFIX)/share/games/flobopuyo +-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games ++DATADIR=$(PREFIX)/share/flobopuyo ++INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin + INSTALL_DATADIR=$(DESTDIR)/$(DATADIR) +@@ -44,10 +44,10 @@ + CC=g++ +-CXX=g++ + +-CFLAGS= -DDATADIR=\"${DATADIR}\" +-LDFLAGS= ++CFLAGS:=$(CXXFLAGS) $(CPPFLAGS) -DDATADIR=\"$(DATADIR)\" + + ifneq ($(PLATFORM), $(CYGWIN_VERSION)) +-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include +-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs` ++OPENGL-false= ++OPENGL-$(ENABLE_OPENGL)=opengl ++CFLAGS:=$(CFLAGS) $(shell $(PKG_CONFIG) --cflags $(OPENGL-true) sdl SDL_image SDL_mixer) ++LIBS:=$(LIBS) $(shell $(PKG_CONFIG) --libs $(OPENGL-true) sdl SDL_image SDL_mixer) + endif +@@ -92,3 +92,2 @@ + ifeq ($(PLATFORM), Linux) +-LDFLAGS:=$(LDFLAGS) -lGL + endif +@@ -112,3 +111,3 @@ + flobopuyo: ${OBJFILES} +- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES} ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o flobopuyo $(OBJFILES) $(LIBS) + @echo "--------------------------------------" +@@ -127,6 +126,6 @@ + %.o:%.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false) ++ $(CXX) $(CXXFLAGS) -c $< + + %.o:%.cpp +- @echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false) ++ $(CXX) $(CXXFLAGS) -c $< + +@@ -157,6 +156,6 @@ + glSDL.o:glSDL.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS ++ $(CXX) $(CXXFLAGS) -c $< + @rm -f EXT_WARNINGS + SDL_prim.o:SDL_prim.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS ++ $(CXX) $(CXXFLAGS) -c $< + @rm -f EXT_WARNINGS +@@ -180,3 +179,2 @@ + install: flobopuyo +- strip flobopuyo + mkdir -p ${INSTALL_BINDIR} diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch new file mode 100644 index 000000000000..2edf49c03c11 --- /dev/null +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch @@ -0,0 +1,84 @@ +Fatch adjusted from Fedora to fix segfault when using optimizations. +https://bugs.gentoo.org/815262 +--- a/PuyoGame.cpp ++++ b/PuyoGame.cpp +@@ -639,3 +639,3 @@ + PuyoPuyo *markedPuyo = getPuyoAt(u, v); +- if (markedPuyo->getPuyoState() == PUYO_MARKED) { ++ if (markedPuyo && markedPuyo->getPuyoState() == PUYO_MARKED) { + // mark the puyo so we wont'do the job twice +--- a/PuyoGame.h ++++ b/PuyoGame.h +@@ -112,6 +112,18 @@ + PuyoState getCompanionState() const { return companionPuyo->getPuyoState(); } +- PuyoState getFallingState() const { return fallingPuyo->getPuyoState(); } ++ PuyoState getFallingState() const { ++ if (fallingPuyo) ++ return fallingPuyo->getPuyoState(); ++ return PUYO_EMPTY; ++ } + +- int getFallingX() const { return fallingPuyo->getPuyoX(); } +- int getFallingY() const { return fallingPuyo->getPuyoY(); } ++ int getFallingX() const { ++ if (fallingPuyo) ++ return fallingPuyo->getPuyoX(); ++ return 0; ++ } ++ int getFallingY() const { ++ if (fallingPuyo) ++ return fallingPuyo->getPuyoY(); ++ return 0; ++ } + int getCompanionX() const { return companionPuyo->getPuyoX(); } +--- a/PuyoIA.cpp ++++ b/PuyoIA.cpp +@@ -111,6 +111,6 @@ + { +- if ((c_x<(PUYODIMX - 1)) && (c_color == (game->getPuyoAt(c_x+1,c_y))->getPuyoState())) /* Test du pattern a droite */ ++ if ((c_x<(PUYODIMX - 1)) && (c_color == (game->getPuyoCellAt(c_x+1,c_y)))) + { +- PuyoState cColorA = (game->getPuyoAt(c_x+1,c_y+1))->getPuyoState(); +- if ((c_color!=cColorA) && (cColorA>5) && (cColorA<11) && (cColorA == (game->getPuyoAt(c_x+1,c_y-1))->getPuyoState())) ++ PuyoState cColorA = (game->getPuyoCellAt(c_x+1,c_y+1)); ++ if ((c_color!=cColorA) && (cColorA>5) && (cColorA<11) && (cColorA == (game->getPuyoCellAt(c_x+1,c_y-1)))) + { +@@ -120,6 +120,6 @@ + +- if ((c_x>0) && (c_color == (game->getPuyoAt(c_x-1,c_y))->getPuyoState())) /* Test du pattern a gauche */ ++ if ((c_x>0) && (c_color == (game->getPuyoCellAt(c_x-1,c_y)))) + { +- PuyoState cColorB = (game->getPuyoAt(c_x-1,c_y+1))->getPuyoState(); +- if ((c_color!=cColorB) && (cColorB>5) && (cColorB<11) && (cColorB == (game->getPuyoAt(c_x-1,c_y-1))->getPuyoState())) ++ PuyoState cColorB = (game->getPuyoCellAt(c_x-1,c_y+1)); ++ if ((c_color!=cColorB) && (cColorB>5) && (cColorB<11) && (cColorB == (game->getPuyoCellAt(c_x-1,c_y-1)))) + { +@@ -131,3 +131,3 @@ + { +- if (c_color == (game->getPuyoAt(c_x,c_y+2))->getPuyoState()) ++ if (c_color == (game->getPuyoCellAt(c_x,c_y+2))) + { +@@ -140,6 +140,6 @@ + { +- if ((f_x<(PUYODIMX - 1)) && (f_color == (game->getPuyoAt(f_x+1,f_y))->getPuyoState())) /* Test du pattern a droite */ ++ if ((f_x<(PUYODIMX - 1)) && (f_color == (game->getPuyoCellAt(f_x+1,f_y)))) + { +- PuyoState fColorA = (game->getPuyoAt(f_x+1,f_y+1))->getPuyoState(); +- if ((f_color!=fColorA) && (fColorA>5) && (fColorA<11) && (fColorA == (game->getPuyoAt(f_x+1,f_y-1))->getPuyoState())) ++ PuyoState fColorA = (game->getPuyoCellAt(f_x+1,f_y+1)); ++ if ((f_color!=fColorA) && (fColorA>5) && (fColorA<11) && (fColorA == (game->getPuyoCellAt(f_x+1,f_y-1)))) + { +@@ -149,6 +149,6 @@ + +- if ((f_x>0) && (f_color == (game->getPuyoAt(f_x-1,f_y))->getPuyoState())) /* Test du pattern a gauche */ ++ if ((f_x>0) && (f_color == (game->getPuyoCellAt(f_x-1,f_y)))) + { + PuyoState fColorB = (game->getPuyoAt(f_x-1,f_y+1))->getPuyoState(); +- if ((f_color!=fColorB) && (fColorB>5) && (fColorB<11) && (fColorB == (game->getPuyoAt(f_x-1,f_y-1))->getPuyoState())) ++ if ((f_color!=fColorB) && (fColorB>5) && (fColorB<11) && (fColorB == (game->getPuyoCellAt(f_x-1,f_y-1)))) + { +@@ -160,3 +160,3 @@ + { +- if (f_color == (game->getPuyoAt(f_x,f_y+2))->getPuyoState()) ++ if (f_color == (game->getPuyoCellAt(f_x,f_y+2))) + { diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild deleted file mode 100644 index 717a4ba609cb..000000000000 --- a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop toolchain-funcs - -DESCRIPTION="Clone of the famous PuyoPuyo game" -HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29" -SRC_URI="http://www.ios-software.com/flobopuyo/${P}.tgz - mirror://gentoo/${PN}.png" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="opengl" - -DEPEND="media-libs/libsdl - media-libs/sdl-image[jpeg,png] - media-libs/sdl-mixer[mod] - opengl? ( virtual/opengl ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eapply \ - "${FILESDIR}"/${P}-gcc4.patch \ - "${FILESDIR}"/${P}-gcc41.patch \ - "${FILESDIR}"/${P}-libs.patch - - find . -type f -name ".*" -exec rm -f \{\} \; - sed -i \ - -e "s:^DATADIR=.*:DATADIR=\"/usr/share/${PN}\":" \ - -e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:/usr/bin:" \ - Makefile \ - || die -} - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - ENABLE_OPENGL="$(use opengl && echo true || echo false)" -} - -src_install() { - default - doman man/flobopuyo.6 - doicon "${DISTDIR}/${PN}.png" - make_desktop_entry flobopuyo FloboPuyo -} diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild new file mode 100644 index 000000000000..c38cdc1d7cbb --- /dev/null +++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Clone of the famous PuyoPuyo game" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI=" + mirror://gentoo/${P}.tgz + mirror://gentoo/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="opengl" + +RDEPEND=" + media-libs/libsdl[joystick,sound,video] + media-libs/sdl-image[jpeg,png] + media-libs/sdl-mixer[mod] + opengl? ( media-libs/libglvnd )" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-gcc41.patch + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-segfault.patch +) + +src_prepare() { + default + + rm data/sfx/._bi || die +} + +src_compile() { + tc-export CXX PKG_CONFIG + + emake PREFIX="${EPREFIX}"/usr ENABLE_OPENGL=$(usex opengl true false) +} + +src_install() { + emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install + + dodoc Changelog TODO + doman man/flobopuyo.6 + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry flobopuyo FloboPuyo +} -- cgit v1.2.3