From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/tecnoballz-0.92-automake.patch | 116 +++++++++++++++++++++ .../tecnoballz/files/tecnoballz-0.92-gcc43.patch | 11 ++ .../tecnoballz/files/tecnoballz-0.92-gcc6.patch | 45 ++++++++ 3 files changed, 172 insertions(+) create mode 100644 games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch create mode 100644 games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch create mode 100644 games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch (limited to 'games-arcade/tecnoballz/files') diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch new file mode 100644 index 000000000000..b2f0379e4899 --- /dev/null +++ b/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch @@ -0,0 +1,116 @@ +--- Makefile.am.old 2008-10-07 10:42:11.000000000 +0200 ++++ Makefile.am 2008-10-07 10:49:35.000000000 +0200 +@@ -1,18 +1,6 @@ + +-gamesdir = $(prefix)/games +-scoredir = /var/games/tecnoballz +-score = tecnoballz.hi ++localstate_DATA = tecnoballz.hi + +-SUBDIRS = src ++SUBDIRS = src man + +-pkgdatadir = $(mandir)/man6 +-dist_pkgdata_DATA = man/tecnoballz.6 +- +-install-data-hook: +- -chown root:games "$(DESTDIR)/$(gamesdir)/tecnoballz" +- -chmod 2755 "$(DESTDIR)/$(gamesdir)/tecnoballz" +- $(INSTALL) -d $(DESTDIR)/$(scoredir) +- $(INSTALL) $(score) $(DESTDIR)/$(scoredir) +- -chown root:games "$(DESTDIR)/$(scoredir)/$(score)" +- -chmod 664 "$(DESTDIR)/$(scoredir)/$(score)" + +--- src/Makefile.am.old 2008-10-07 11:16:44.000000000 +0200 ++++ src/Makefile.am 2008-10-07 11:18:32.000000000 +0200 +@@ -1,14 +1,12 @@ + + NULL = +-gamesdir = $(prefix)/games +-scoredir = /var/games/tecnoballz + score = tecnoballz.hi + + SUBDIRS = TecnoballZ + +-games_PROGRAMS = tecnoballz ++bin_PROGRAMS = tecnoballz + tecnoballz_SOURCES = $(SOURCES_MAIN) +-tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ ++tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(localstatedir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ + tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -L. + + SOURCES_MAIN = \ +--- src/TecnoballZ/Makefile.am.old 2008-10-07 17:17:47.000000000 +0200 ++++ src/TecnoballZ/Makefile.am 2008-10-07 17:20:03.000000000 +0200 +@@ -1,6 +1,6 @@ + NULL = + +-SUBDIRS = lores hires textures sounds musics ++SUBDIRS = lores hires textures sounds musics texts + + pkgdatadir = $(datadir)/tecnoballz + dist_pkgdata_DATA = \ +@@ -14,4 +14,5 @@ + tilemap-guardians_40.data \ + tilemap-menu_20.data \ + tilemap-menu_40.data \ ++ levels-data.xml \ + $(NULL) +--- /dev/null 2008-09-26 15:07:13.448004290 +0200 ++++ src/TecnoballZ/texts/Makefile.am 2008-10-07 17:30:18.000000000 +0200 +@@ -0,0 +1,11 @@ ++textsdir = $(pkgdatadir)/texts ++texts_DATA = main_menu_en.txt \ ++ main_menu_fr.txt \ ++ popup_menu_en.txt \ ++ popup_menu_fr.txt \ ++ scrolltext_en.txt \ ++ scrolltext_fr.txt \ ++ shop_en.txt \ ++ shop_fr.txt \ ++ short_info_messages_en.txt \ ++ short_info_messages_fr.txt +--- configure.ac.old 2008-10-08 23:10:26.000000000 +0200 ++++ configure.ac 2008-10-08 23:11:08.000000000 +0200 +@@ -50,21 +50,6 @@ + + LDFLAGS_="${LDFLAGS_save}" + +-AC_CHECK_LIB(vorbisfile, ov_raw_seek, [ +- MM_LIBS="${MM_LIBS} -lvorbisfile" +-],[ +- AC_MSG_ERROR(Could not find the vorbisfile lib : -lvorbisfile) +-]) +-AC_CHECK_LIB(ogg, ogg_stream_packetin, [ +- MM_LIBS="${MM_LIBS} -logg" +-],[ +- AC_MSG_ERROR(Could not find the ogg lib : -logg) +-]) +-AC_CHECK_LIB(smpeg, SMPEG_play, [ +- MM_LIBS="${MM_LIBS} -lsmpeg" +-],[ +- AC_MSG_ERROR(Could not find the smpeg lib : -lsmpeg) +-]) + AC_SUBST(MM_LIBS) + + AC_CHECK_LIB(mikmod, Player_Stop, [ +@@ -81,5 +81,8 @@ + + + dnl Output makefiles +-AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile) ++AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile ++ src/TecnoballZ/texts/Makefile ++ man/Makefile ++ man/fr/Makefile) + +--- /dev/null 2008-09-26 15:07:13.448004290 +0200 ++++ man/Makefile.am 2008-10-08 10:36:15.000000000 +0200 +@@ -0,0 +1,2 @@ ++SUBDIRS = fr ++man_MANS = tecnoballz.6 +--- /dev/null 2008-09-26 15:07:13.448004290 +0200 ++++ man/fr/Makefile.am 2008-10-08 10:36:15.000000000 +0200 +@@ -0,0 +1,2 @@ ++mandir = @mandir@/fr ++man_MANS = tecnoballz.6 diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch new file mode 100644 index 000000000000..ae190abd64c6 --- /dev/null +++ b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch @@ -0,0 +1,11 @@ +--- include/surface_sdl.h.old 2008-10-07 10:16:25.000000000 +0200 ++++ include/surface_sdl.h 2008-10-07 10:16:38.000000000 +0200 +@@ -46,7 +46,7 @@ + ~surface_sdl (); + SDL_Surface* get_surface (); + char* get_pixel_data (); +- char* get_pixel_data (Uint32 coord_x, Uint32 coord_x); ++ char* get_pixel_data (Uint32 coord_x, Uint32 coord_y); + Uint32 get_row_size (); + Uint32 get_offset (Uint32 xcoord, Uint32 ycoord); + void clear (Uint32 color = 0); diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch new file mode 100644 index 000000000000..f06a2ac2a0db --- /dev/null +++ b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch @@ -0,0 +1,45 @@ +Bug: https://bugs.gentoo.org/show_bug.cgi?id=610974 +Commit: https://github.com/brunonymous/tecnoballz/commit/29c5f137555897c8fb73b4780295524b214b24a2 + +--- a/include/tiles_background.h ++++ b/include/tiles_background.h +@@ -47,7 +47,7 @@ + static tiles_background* tiles_background_singleton; + static Sint32 table_pos1[16]; + static Sint32 table_pos2[16]; +- static char couleurs[448]; ++ static unsigned char couleurs[448]; + static const Sint32 TILES_32_WIDTH = 32; + static const Sint32 TILES_32_HEIGHT = 32; + static const Sint32 TILES_64_WIDTH = 64; +@@ -63,7 +63,7 @@ + * or TILES_32x32_WITH_4_COLORS */ + Uint32 type_of_tiles; + /** 4 color palette index */ +- Uint32 palette_index; ++ Sint32 palette_index; + + bitmap_data *current_tiles; + Uint32 *map_tiles; +--- a/src/tiles_background.cc ++++ b/src/tiles_background.cc +@@ -663,8 +663,8 @@ + + } + palette_index = pal_index; +- char *color = &couleurs[0]; +- unsigned char *colPT = (unsigned char *) (color) + pal_index; ++ unsigned char *color = &couleurs[0]; ++ unsigned char *colPT = (color) + pal_index; + SDL_Color *pal = display->get_palette (); + SDL_Color *lighted = pal + 1; + SDL_Color *dark = lighted + 128; +@@ -702,7 +702,7 @@ + * 4 * 4 : 16 composantes by palette + * 112 * 4 : 448 composantes + */ +-char ++unsigned char + tiles_background::couleurs[448] = { + 0x00, 0x40, 0x20, 0x40, 0x00, 0x60, 0x40, 0x60, 0x00, 0x80, 0x60, 0x80, + 0x00, 0xA0, 0x80, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x00, 0x20, -- cgit v1.2.3