Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/flobopuyo/, games-puzzle/flobopuyo/files/
Date: Tue, 28 Sep 2021 22:53:50
Message-Id: 1632869403.cecff2663a5b57278bd8e6e5f7a60ce86292614f.ionen@gentoo
1 commit: cecff2663a5b57278bd8e6e5f7a60ce86292614f
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 28 20:53:48 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 28 22:50:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cecff266
7
8 games-puzzle/flobopuyo: EAPI6->8, fix runtime with optimizations
9
10 Works with -O0, but broke at -O2 likely some gcc versions ago.
11
12 Also:
13 * cleanup patches, and while there have Makefile use pkg-config,
14 echo commands, and respect CPPFLAGS
15 * add missing [joystick], bison, and flex deps
16 * removed dead HOMEPAGE, no replacement found
17
18 Closes: https://bugs.gentoo.org/815262
19 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
20
21 .../flobopuyo/files/flobopuyo-0.20-gcc4.patch | 25 ----
22 .../flobopuyo/files/flobopuyo-0.20-gcc41.patch | 28 +++--
23 .../flobopuyo/files/flobopuyo-0.20-libs.patch | 136 ---------------------
24 .../flobopuyo/files/flobopuyo-0.20-makefile.patch | 62 ++++++++++
25 .../flobopuyo/files/flobopuyo-0.20-segfault.patch | 84 +++++++++++++
26 games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild | 50 --------
27 games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild | 56 +++++++++
28 7 files changed, 221 insertions(+), 220 deletions(-)
29
30 diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
31 deleted file mode 100644
32 index 6c5d39445a4..00000000000
33 --- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
34 +++ /dev/null
35 @@ -1,25 +0,0 @@
36 -Index: flobopuyo-0.20/IosVector.cpp
37 -===================================================================
38 ---- flobopuyo-0.20.orig/IosVector.cpp
39 -+++ flobopuyo-0.20/IosVector.cpp
40 -@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize()
41 - void IosVector::dumpVector() const {
42 - fprintf(stderr, "Size: %d\n", getSize());
43 - for (int i = 0, j = getSize() ; i < j ; i++)
44 -- fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
45 -+ fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));
46 - fprintf(stderr, "\n");
47 - }
48 -Index: flobopuyo-0.20/PuyoGame.cpp
49 -===================================================================
50 ---- flobopuyo-0.20.orig/PuyoGame.cpp
51 -+++ flobopuyo-0.20/PuyoGame.cpp
52 -@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe
53 - return (PuyoState)newItem;
54 - }
55 - else
56 -- return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
57 -+ return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
58 - }
59 -
60 - PuyoPuyo::PuyoPuyo(PuyoState state)
61
62 diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
63 index 6b3f54ef563..765bcae8d21 100644
64 --- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
65 +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
66 @@ -1,13 +1,23 @@
67 -Index: flobopuyo-0.20/PuyoGame.h
68 -===================================================================
69 ---- flobopuyo-0.20.orig/PuyoGame.h
70 -+++ flobopuyo-0.20/PuyoGame.h
71 -@@ -46,7 +46,7 @@ public:
72 - virtual ~PuyoPuyo() {};
73 - PuyoState getPuyoState();
74 +https://bugs.gentoo.org/106406
75 +https://bugs.gentoo.org/121259
76 +--- a/IosVector.cpp
77 ++++ b/IosVector.cpp
78 +@@ -104,3 +104,3 @@
79 + for (int i = 0, j = getSize() ; i < j ; i++)
80 +- fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
81 ++ fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));
82 + fprintf(stderr, "\n");
83 +--- a/PuyoGame.cpp
84 ++++ b/PuyoGame.cpp
85 +@@ -47,3 +47,3 @@
86 + else
87 +- return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
88 ++ return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
89 + }
90 +--- a/PuyoGame.h
91 ++++ b/PuyoGame.h
92 +@@ -48,3 +48,3 @@
93 void setPuyoState(PuyoState state);
94 - bool PuyoPuyo::isFalling();
95 + bool isFalling();
96 int getPuyoX() const;
97 - int getPuyoY() const;
98 - void setPuyoXY(int X, int Y);
99
100 diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
101 deleted file mode 100644
102 index b9b55a333cb..00000000000
103 --- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
104 +++ /dev/null
105 @@ -1,136 +0,0 @@
106 ---- a/Makefile.orig 2004-10-08 18:41:12.000000000 -0400
107 -+++ b/Makefile 2008-08-06 19:48:47.000000000 -0400
108 -@@ -41,15 +41,13 @@
109 - ##############
110 -
111 - SDL_CONFIG=sdl-config
112 --CC=g++
113 --CXX=g++
114 -
115 --CFLAGS= -DDATADIR=\"${DATADIR}\"
116 --LDFLAGS=
117 -+CXXFLAGS+= -DDATADIR=\"${DATADIR}\"
118 -
119 - ifneq ($(PLATFORM), $(CYGWIN_VERSION))
120 --CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
121 --LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
122 -+CXXFLAGS:=$(CXXFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
123 -+LDFLAGS:=$(LDFLAGS)
124 -+LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
125 - endif
126 -
127 - HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
128 -@@ -71,46 +69,46 @@
129 - ################
130 - # Mac OS X
131 - ifeq ($(PLATFORM), Darwin)
132 --CFLAGS:=$(CFLAGS) -DMACOSX -UDATADIR
133 -+CXXFLAGS:=$(CXXFLAGS) -DMACOSX -UDATADIR
134 - endif
135 -
136 - ################
137 - # Win32
138 - ifeq ($(PLATFORM), $(CYGWIN_VERSION))
139 --CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE)
140 --LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain
141 -+CXXFLAGS:=$(CXXFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE)
142 -+LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
143 -+LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain
144 - endif
145 -
146 - ifeq ($(ENABLE_AUDIO), true)
147 --CFLAGS:=$(CFLAGS) -DUSE_AUDIO=1
148 -+CXXFLAGS:=$(CXXFLAGS) -DUSE_AUDIO=1
149 - OBJFILES:=$(OBJFILES)
150 - endif
151 -
152 - ifeq ($(ENABLE_OPENGL), true)
153 --CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
154 -+CXXFLAGS:=$(CXXFLAGS) -DHAVE_OPENGL=1
155 - OBJFILES:=$(OBJFILES) glSDL.o
156 - ifeq ($(PLATFORM), Linux)
157 --LDFLAGS:=$(LDFLAGS) -lGL
158 -+LDFLAGS:=$(LDFLAGS)
159 -+LIBS:=$(LIBS) -lGL
160 - endif
161 - endif
162 -
163 - ifeq ($(ENABLE_DGA), true)
164 - ifeq ($(PLATFORM), Linux)
165 --CFLAGS:=$(CFLAGS) -DUSE_DGA=1
166 -+CXXFLAGS:=$(CXXFLAGS) -DUSE_DGA=1
167 - endif
168 - endif
169 -
170 - ifeq ($(DEBUG), true)
171 --CFLAGS:=$(CFLAGS) -DDEBUG=1 -g
172 -+CXXFLAGS:=$(CXXFLAGS) -DDEBUG=1 -g
173 - LDFLAGS:=$(LDFLAGS) -g
174 - endif
175 -
176 --CXXFLAGS=${CFLAGS}
177 --
178 - all: prelude flobopuyo
179 -
180 - flobopuyo: ${OBJFILES}
181 -- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
182 -+ @echo "[flobopuyo]" && $(CXX) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image
183 - @echo "--------------------------------------"
184 - @echo " Compilation finished"
185 - @[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true
186 -@@ -121,14 +119,14 @@
187 - prelude:
188 - @rm -f WARNINGS
189 - @touch WARNINGS
190 -- @echo "Compiling with CFLAGS=$(CFLAGS)"
191 -+ @echo "Compiling with CXXFLAGS=$(CXXFLAGS)"
192 - @echo "Compiling with LDFLAGS=$(LDFLAGS)"
193 -
194 - %.o:%.c
195 -- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
196 -+ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
197 -
198 - %.o:%.cpp
199 -- @echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
200 -+ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
201 -
202 - PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES}
203 - HiScores.o:HiScores.cpp HiScores.h preferences.h
204 -@@ -155,10 +153,10 @@
205 - IosException.o:IosException.cpp
206 - IosVector.o:IosVector.cpp
207 - glSDL.o:glSDL.c
208 -- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
209 -+ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
210 - @rm -f EXT_WARNINGS
211 - SDL_prim.o:SDL_prim.c
212 -- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
213 -+ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
214 - @rm -f EXT_WARNINGS
215 - corona.o:corona.cpp
216 - corona32.o:corona32.cpp
217 -@@ -178,7 +176,6 @@
218 - rm -f .DS_Store */.DS_Store */*/.DS_Store .gdb_history
219 -
220 - install: flobopuyo
221 -- strip flobopuyo
222 - mkdir -p ${INSTALL_BINDIR}
223 - mkdir -p ${INSTALL_DATADIR}
224 - cp -r data/* ${INSTALL_DATADIR}
225 -@@ -191,7 +188,7 @@
226 - chmod a+rx ${INSTALL_BINDIR}/flobopuyo
227 -
228 - flobopuyo-static: prelude ${OBJFILES}
229 -- @echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static ${OBJFILES}\
230 -+ @echo "[flobopuyo-static]" && g++ $(CXXFLAGS) -o flobopuyo-static ${OBJFILES}\
231 - /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`
232 - @echo "--------------------------------------"
233 - @echo " Compilation finished"
234 -@@ -207,7 +204,6 @@
235 - rm -rf $(bundle_name)/Contents/Resources/data/CVS $(bundle_name)/Contents/Resources/data/*/CVS
236 - rm -rf $(bundle_name)/Contents/Resources/data/.xvpics $(bundle_name)/Contents/Resources/data/*/.xvpics
237 - rm -f $(bundle_name)/Contents/Resources/data/.DS_Store $(bundle_name)/Contents/Resources/data/*/.DS_Store
238 -- strip $(bundle_name)/Contents/MacOS/flobopuyo
239 -
240 - mac-package: bundle
241 - mkdir -p $(macimage_name)
242
243 diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch
244 new file mode 100644
245 index 00000000000..670f18889ca
246 --- /dev/null
247 +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch
248 @@ -0,0 +1,62 @@
249 +Set non-/games paths, respect FLAGS, add LIBS to pass them in right order,
250 +use pkg-config, don't strip, and show commands/errors directly.
251 +
252 +https://bugs.gentoo.org/125550
253 +https://bugs.gentoo.org/126835
254 +https://bugs.gentoo.org/234013
255 +--- a/Makefile
256 ++++ b/Makefile
257 +@@ -15,4 +15,4 @@
258 + PREFIX=/usr/local
259 +-DATADIR=$(PREFIX)/share/games/flobopuyo
260 +-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games
261 ++DATADIR=$(PREFIX)/share/flobopuyo
262 ++INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin
263 + INSTALL_DATADIR=$(DESTDIR)/$(DATADIR)
264 +@@ -44,10 +44,10 @@
265 + CC=g++
266 +-CXX=g++
267 +
268 +-CFLAGS= -DDATADIR=\"${DATADIR}\"
269 +-LDFLAGS=
270 ++CFLAGS:=$(CXXFLAGS) $(CPPFLAGS) -DDATADIR=\"$(DATADIR)\"
271 +
272 + ifneq ($(PLATFORM), $(CYGWIN_VERSION))
273 +-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
274 +-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
275 ++OPENGL-false=
276 ++OPENGL-$(ENABLE_OPENGL)=opengl
277 ++CFLAGS:=$(CFLAGS) $(shell $(PKG_CONFIG) --cflags $(OPENGL-true) sdl SDL_image SDL_mixer)
278 ++LIBS:=$(LIBS) $(shell $(PKG_CONFIG) --libs $(OPENGL-true) sdl SDL_image SDL_mixer)
279 + endif
280 +@@ -92,3 +92,2 @@
281 + ifeq ($(PLATFORM), Linux)
282 +-LDFLAGS:=$(LDFLAGS) -lGL
283 + endif
284 +@@ -112,3 +111,3 @@
285 + flobopuyo: ${OBJFILES}
286 +- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
287 ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o flobopuyo $(OBJFILES) $(LIBS)
288 + @echo "--------------------------------------"
289 +@@ -127,6 +126,6 @@
290 + %.o:%.c
291 +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
292 ++ $(CXX) $(CXXFLAGS) -c $<
293 +
294 + %.o:%.cpp
295 +- @echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
296 ++ $(CXX) $(CXXFLAGS) -c $<
297 +
298 +@@ -157,6 +156,6 @@
299 + glSDL.o:glSDL.c
300 +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
301 ++ $(CXX) $(CXXFLAGS) -c $<
302 + @rm -f EXT_WARNINGS
303 + SDL_prim.o:SDL_prim.c
304 +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
305 ++ $(CXX) $(CXXFLAGS) -c $<
306 + @rm -f EXT_WARNINGS
307 +@@ -180,3 +179,2 @@
308 + install: flobopuyo
309 +- strip flobopuyo
310 + mkdir -p ${INSTALL_BINDIR}
311
312 diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch
313 new file mode 100644
314 index 00000000000..2edf49c03c1
315 --- /dev/null
316 +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch
317 @@ -0,0 +1,84 @@
318 +Fatch adjusted from Fedora to fix segfault when using optimizations.
319 +https://bugs.gentoo.org/815262
320 +--- a/PuyoGame.cpp
321 ++++ b/PuyoGame.cpp
322 +@@ -639,3 +639,3 @@
323 + PuyoPuyo *markedPuyo = getPuyoAt(u, v);
324 +- if (markedPuyo->getPuyoState() == PUYO_MARKED) {
325 ++ if (markedPuyo && markedPuyo->getPuyoState() == PUYO_MARKED) {
326 + // mark the puyo so we wont'do the job twice
327 +--- a/PuyoGame.h
328 ++++ b/PuyoGame.h
329 +@@ -112,6 +112,18 @@
330 + PuyoState getCompanionState() const { return companionPuyo->getPuyoState(); }
331 +- PuyoState getFallingState() const { return fallingPuyo->getPuyoState(); }
332 ++ PuyoState getFallingState() const {
333 ++ if (fallingPuyo)
334 ++ return fallingPuyo->getPuyoState();
335 ++ return PUYO_EMPTY;
336 ++ }
337 +
338 +- int getFallingX() const { return fallingPuyo->getPuyoX(); }
339 +- int getFallingY() const { return fallingPuyo->getPuyoY(); }
340 ++ int getFallingX() const {
341 ++ if (fallingPuyo)
342 ++ return fallingPuyo->getPuyoX();
343 ++ return 0;
344 ++ }
345 ++ int getFallingY() const {
346 ++ if (fallingPuyo)
347 ++ return fallingPuyo->getPuyoY();
348 ++ return 0;
349 ++ }
350 + int getCompanionX() const { return companionPuyo->getPuyoX(); }
351 +--- a/PuyoIA.cpp
352 ++++ b/PuyoIA.cpp
353 +@@ -111,6 +111,6 @@
354 + {
355 +- if ((c_x<(PUYODIMX - 1)) && (c_color == (game->getPuyoAt(c_x+1,c_y))->getPuyoState())) /* Test du pattern a droite */
356 ++ if ((c_x<(PUYODIMX - 1)) && (c_color == (game->getPuyoCellAt(c_x+1,c_y))))
357 + {
358 +- PuyoState cColorA = (game->getPuyoAt(c_x+1,c_y+1))->getPuyoState();
359 +- if ((c_color!=cColorA) && (cColorA>5) && (cColorA<11) && (cColorA == (game->getPuyoAt(c_x+1,c_y-1))->getPuyoState()))
360 ++ PuyoState cColorA = (game->getPuyoCellAt(c_x+1,c_y+1));
361 ++ if ((c_color!=cColorA) && (cColorA>5) && (cColorA<11) && (cColorA == (game->getPuyoCellAt(c_x+1,c_y-1))))
362 + {
363 +@@ -120,6 +120,6 @@
364 +
365 +- if ((c_x>0) && (c_color == (game->getPuyoAt(c_x-1,c_y))->getPuyoState())) /* Test du pattern a gauche */
366 ++ if ((c_x>0) && (c_color == (game->getPuyoCellAt(c_x-1,c_y))))
367 + {
368 +- PuyoState cColorB = (game->getPuyoAt(c_x-1,c_y+1))->getPuyoState();
369 +- if ((c_color!=cColorB) && (cColorB>5) && (cColorB<11) && (cColorB == (game->getPuyoAt(c_x-1,c_y-1))->getPuyoState()))
370 ++ PuyoState cColorB = (game->getPuyoCellAt(c_x-1,c_y+1));
371 ++ if ((c_color!=cColorB) && (cColorB>5) && (cColorB<11) && (cColorB == (game->getPuyoCellAt(c_x-1,c_y-1))))
372 + {
373 +@@ -131,3 +131,3 @@
374 + {
375 +- if (c_color == (game->getPuyoAt(c_x,c_y+2))->getPuyoState())
376 ++ if (c_color == (game->getPuyoCellAt(c_x,c_y+2)))
377 + {
378 +@@ -140,6 +140,6 @@
379 + {
380 +- if ((f_x<(PUYODIMX - 1)) && (f_color == (game->getPuyoAt(f_x+1,f_y))->getPuyoState())) /* Test du pattern a droite */
381 ++ if ((f_x<(PUYODIMX - 1)) && (f_color == (game->getPuyoCellAt(f_x+1,f_y))))
382 + {
383 +- PuyoState fColorA = (game->getPuyoAt(f_x+1,f_y+1))->getPuyoState();
384 +- if ((f_color!=fColorA) && (fColorA>5) && (fColorA<11) && (fColorA == (game->getPuyoAt(f_x+1,f_y-1))->getPuyoState()))
385 ++ PuyoState fColorA = (game->getPuyoCellAt(f_x+1,f_y+1));
386 ++ if ((f_color!=fColorA) && (fColorA>5) && (fColorA<11) && (fColorA == (game->getPuyoCellAt(f_x+1,f_y-1))))
387 + {
388 +@@ -149,6 +149,6 @@
389 +
390 +- if ((f_x>0) && (f_color == (game->getPuyoAt(f_x-1,f_y))->getPuyoState())) /* Test du pattern a gauche */
391 ++ if ((f_x>0) && (f_color == (game->getPuyoCellAt(f_x-1,f_y))))
392 + {
393 + PuyoState fColorB = (game->getPuyoAt(f_x-1,f_y+1))->getPuyoState();
394 +- if ((f_color!=fColorB) && (fColorB>5) && (fColorB<11) && (fColorB == (game->getPuyoAt(f_x-1,f_y-1))->getPuyoState()))
395 ++ if ((f_color!=fColorB) && (fColorB>5) && (fColorB<11) && (fColorB == (game->getPuyoCellAt(f_x-1,f_y-1))))
396 + {
397 +@@ -160,3 +160,3 @@
398 + {
399 +- if (f_color == (game->getPuyoAt(f_x,f_y+2))->getPuyoState())
400 ++ if (f_color == (game->getPuyoCellAt(f_x,f_y+2)))
401 + {
402
403 diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
404 deleted file mode 100644
405 index 717a4ba609c..00000000000
406 --- a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
407 +++ /dev/null
408 @@ -1,50 +0,0 @@
409 -# Copyright 1999-2019 Gentoo Authors
410 -# Distributed under the terms of the GNU General Public License v2
411 -
412 -EAPI=6
413 -inherit desktop toolchain-funcs
414 -
415 -DESCRIPTION="Clone of the famous PuyoPuyo game"
416 -HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29"
417 -SRC_URI="http://www.ios-software.com/flobopuyo/${P}.tgz
418 - mirror://gentoo/${PN}.png"
419 -
420 -LICENSE="GPL-2"
421 -SLOT="0"
422 -KEYWORDS="~amd64 ~x86"
423 -IUSE="opengl"
424 -
425 -DEPEND="media-libs/libsdl
426 - media-libs/sdl-image[jpeg,png]
427 - media-libs/sdl-mixer[mod]
428 - opengl? ( virtual/opengl )
429 -"
430 -RDEPEND="${DEPEND}"
431 -
432 -src_prepare() {
433 - default
434 - eapply \
435 - "${FILESDIR}"/${P}-gcc4.patch \
436 - "${FILESDIR}"/${P}-gcc41.patch \
437 - "${FILESDIR}"/${P}-libs.patch
438 -
439 - find . -type f -name ".*" -exec rm -f \{\} \;
440 - sed -i \
441 - -e "s:^DATADIR=.*:DATADIR=\"/usr/share/${PN}\":" \
442 - -e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:/usr/bin:" \
443 - Makefile \
444 - || die
445 -}
446 -
447 -src_compile() {
448 - emake \
449 - CXX="$(tc-getCXX)" \
450 - ENABLE_OPENGL="$(use opengl && echo true || echo false)"
451 -}
452 -
453 -src_install() {
454 - default
455 - doman man/flobopuyo.6
456 - doicon "${DISTDIR}/${PN}.png"
457 - make_desktop_entry flobopuyo FloboPuyo
458 -}
459
460 diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild
461 new file mode 100644
462 index 00000000000..295962f0e66
463 --- /dev/null
464 +++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild
465 @@ -0,0 +1,56 @@
466 +# Copyright 1999-2021 Gentoo Authors
467 +# Distributed under the terms of the GNU General Public License v2
468 +
469 +EAPI=8
470 +
471 +inherit desktop toolchain-funcs
472 +
473 +DESCRIPTION="Clone of the famous PuyoPuyo game"
474 +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
475 +SRC_URI="
476 + mirror://gentoo/${P}.tgz
477 + mirror://gentoo/${PN}.png"
478 +
479 +LICENSE="GPL-2"
480 +SLOT="0"
481 +KEYWORDS="~amd64 ~x86"
482 +IUSE="opengl"
483 +
484 +RDEPEND="
485 + media-libs/libsdl[joystick,sound,video]
486 + media-libs/sdl-image[jpeg,png]
487 + media-libs/sdl-mixer[mod]
488 + opengl? ( media-libs/libglvnd )"
489 +DEPEND="${RDEPEND}"
490 +BDEPEND="
491 + sys-devel/bison
492 + sys-devel/flex
493 + virtual/pkgconfig"
494 +
495 +PATCHES=(
496 + "${FILESDIR}"/${P}-gcc41.patch
497 + "${FILESDIR}"/${P}-makefile.patch
498 + "${FILESDIR}"/${P}-segfault.patch
499 +)
500 +
501 +src_prepare() {
502 + default
503 +
504 + rm data/sfx/._bi || die
505 +}
506 +
507 +src_compile() {
508 + tc-export CC CXX PKG_CONFIG
509 +
510 + emake PREFIX="${EPREFIX}"/usr ENABLE_OPENGL=$(usex opengl true false)
511 +}
512 +
513 +src_install() {
514 + emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
515 +
516 + dodoc Changelog TODO
517 + doman man/flobopuyo.6
518 +
519 + doicon "${DISTDIR}"/${PN}.png
520 + make_desktop_entry flobopuyo FloboPuyo
521 +}
Report Message
Find on MARC Find on Google Groups