| 1 |
commit: b6f075cae0bd3a804fffb076fc803180830f4e03 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 31 07:52:07 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 31 07:52:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f075ca |
| 7 |
|
| 8 |
games-emulation/generator: tweak for gcc-9 |
| 9 |
|
| 10 |
Fixed-by: kleph |
| 11 |
Closes: https://bugs.gentoo.org/698944 |
| 12 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
.../generator/files/generator-0.35_p4-gcc-9.patch | 22 ++++++++++++++++++++++ |
| 16 |
.../generator/generator-0.35_p4-r1.ebuild | 16 +++++++--------- |
| 17 |
2 files changed, 29 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch b/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..7b8eeafb715 |
| 22 |
--- /dev/null |
| 23 |
+++ b/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch |
| 24 |
@@ -0,0 +1,22 @@ |
| 25 |
+https://bugs.gentoo.org/698944 |
| 26 |
+ |
| 27 |
+--- a/main/vdp.c |
| 28 |
++++ b/main/vdp.c |
| 29 |
+@@ -87,7 +87,7 @@ void vdp_describe(void); |
| 30 |
+ void vdp_eventinit(void); |
| 31 |
+ void vdp_layer_simple(unsigned int layer, unsigned int priority, |
| 32 |
+ uint8 *fielddata, unsigned int lineoffset); |
| 33 |
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags, |
| 34 |
++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags, |
| 35 |
+ uint8 *cellloc, unsigned int lineoffset); |
| 36 |
+ void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata); |
| 37 |
+ int vdp_sprite_simple(unsigned int priority, uint8 *framedata, |
| 38 |
+@@ -1733,7 +1733,7 @@ void vdp_endfield(void) |
| 39 |
+ vdp_event_endline); */ |
| 40 |
+ } |
| 41 |
+ |
| 42 |
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags, |
| 43 |
++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags, |
| 44 |
+ uint8 *cellloc, unsigned int lineoffset) |
| 45 |
+ { |
| 46 |
+ int y, x; |
| 47 |
|
| 48 |
diff --git a/games-emulation/generator/generator-0.35_p4-r1.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild |
| 49 |
index 3c6fe06f5de..54614d750d7 100644 |
| 50 |
--- a/games-emulation/generator/generator-0.35_p4-r1.ebuild |
| 51 |
+++ b/games-emulation/generator/generator-0.35_p4-r1.ebuild |
| 52 |
@@ -23,12 +23,15 @@ RDEPEND="${DEPEND}" |
| 53 |
|
| 54 |
S="${WORKDIR}/${MY_P}" |
| 55 |
|
| 56 |
+PATCHES=( |
| 57 |
+ "${FILESDIR}"/${P}-configure.patch |
| 58 |
+ "${FILESDIR}"/${P}-underlink.patch |
| 59 |
+ "${FILESDIR}"/${P}-inline.patch |
| 60 |
+ "${FILESDIR}"/${P}-gcc-9.patch |
| 61 |
+) |
| 62 |
+ |
| 63 |
src_prepare() { |
| 64 |
default |
| 65 |
- eapply \ |
| 66 |
- "${FILESDIR}"/${P}-configure.patch \ |
| 67 |
- "${FILESDIR}"/${P}-underlink.patch \ |
| 68 |
- "${FILESDIR}"/${P}-inline.patch |
| 69 |
|
| 70 |
sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die |
| 71 |
eautoreconf |
| 72 |
@@ -43,11 +46,6 @@ src_configure() { |
| 73 |
$(use_with sdlaudio sdl-audio) |
| 74 |
} |
| 75 |
|
| 76 |
-src_compile() { |
| 77 |
- [[ -f Makefile ]] && emake clean |
| 78 |
- emake -j1 |
| 79 |
-} |
| 80 |
- |
| 81 |
src_install() { |
| 82 |
dobin main/generator-sdl |
| 83 |
dodoc AUTHORS ChangeLog NEWS README TODO docs/* |
Archives