| 1 |
commit: 528761fd5aef6c134d4c069aee230adf50fcb922 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jul 22 22:18:45 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 30 09:09:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528761fd |
| 7 |
|
| 8 |
games-arcade/tecnoballz: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610974 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/5176 |
| 13 |
|
| 14 |
.../tecnoballz/files/tecnoballz-0.92-gcc6.patch | 45 ++++++++++++++++++++++ |
| 15 |
games-arcade/tecnoballz/tecnoballz-0.92.ebuild | 3 +- |
| 16 |
2 files changed, 47 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..f06a2ac2a0d |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch |
| 23 |
@@ -0,0 +1,45 @@ |
| 24 |
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=610974 |
| 25 |
+Commit: https://github.com/brunonymous/tecnoballz/commit/29c5f137555897c8fb73b4780295524b214b24a2 |
| 26 |
+ |
| 27 |
+--- a/include/tiles_background.h |
| 28 |
++++ b/include/tiles_background.h |
| 29 |
+@@ -47,7 +47,7 @@ |
| 30 |
+ static tiles_background* tiles_background_singleton; |
| 31 |
+ static Sint32 table_pos1[16]; |
| 32 |
+ static Sint32 table_pos2[16]; |
| 33 |
+- static char couleurs[448]; |
| 34 |
++ static unsigned char couleurs[448]; |
| 35 |
+ static const Sint32 TILES_32_WIDTH = 32; |
| 36 |
+ static const Sint32 TILES_32_HEIGHT = 32; |
| 37 |
+ static const Sint32 TILES_64_WIDTH = 64; |
| 38 |
+@@ -63,7 +63,7 @@ |
| 39 |
+ * or TILES_32x32_WITH_4_COLORS */ |
| 40 |
+ Uint32 type_of_tiles; |
| 41 |
+ /** 4 color palette index */ |
| 42 |
+- Uint32 palette_index; |
| 43 |
++ Sint32 palette_index; |
| 44 |
+ |
| 45 |
+ bitmap_data *current_tiles; |
| 46 |
+ Uint32 *map_tiles; |
| 47 |
+--- a/src/tiles_background.cc |
| 48 |
++++ b/src/tiles_background.cc |
| 49 |
+@@ -663,8 +663,8 @@ |
| 50 |
+ |
| 51 |
+ } |
| 52 |
+ palette_index = pal_index; |
| 53 |
+- char *color = &couleurs[0]; |
| 54 |
+- unsigned char *colPT = (unsigned char *) (color) + pal_index; |
| 55 |
++ unsigned char *color = &couleurs[0]; |
| 56 |
++ unsigned char *colPT = (color) + pal_index; |
| 57 |
+ SDL_Color *pal = display->get_palette (); |
| 58 |
+ SDL_Color *lighted = pal + 1; |
| 59 |
+ SDL_Color *dark = lighted + 128; |
| 60 |
+@@ -702,7 +702,7 @@ |
| 61 |
+ * 4 * 4 : 16 composantes by palette |
| 62 |
+ * 112 * 4 : 448 composantes |
| 63 |
+ */ |
| 64 |
+-char |
| 65 |
++unsigned char |
| 66 |
+ tiles_background::couleurs[448] = { |
| 67 |
+ 0x00, 0x40, 0x20, 0x40, 0x00, 0x60, 0x40, 0x60, 0x00, 0x80, 0x60, 0x80, |
| 68 |
+ 0x00, 0xA0, 0x80, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x00, 0x20, |
| 69 |
|
| 70 |
diff --git a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild |
| 71 |
index db2ecc4b5cb..9ac9105bdc1 100644 |
| 72 |
--- a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild |
| 73 |
+++ b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild |
| 74 |
@@ -1,4 +1,4 @@ |
| 75 |
-# Copyright 1999-2015 Gentoo Foundation |
| 76 |
+# Copyright 1999-2017 Gentoo Foundation |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
EAPI=5 |
| 80 |
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}" |
| 81 |
|
| 82 |
src_prepare() { |
| 83 |
epatch "${FILESDIR}"/${P}-gcc43.patch \ |
| 84 |
+ "${FILESDIR}"/${P}-gcc6.patch \ |
| 85 |
"${FILESDIR}"/${P}-automake.patch |
| 86 |
mv man/${PN}.fr.6 man/fr/${PN}.6 || die |
| 87 |
# don't combine explicit and implicit rules for make 3.82 (bug #334629) |
Archives