Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/fbzx/, games-emulation/fbzx/files/
Date: Fri, 01 Apr 2016 18:13:51
Message-Id: 1459534413.9e5f28f69690bc045441205bf81e0b9112931e55.mr_bones_@gentoo
1 commit: 9e5f28f69690bc045441205bf81e0b9112931e55
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 1 18:13:15 2016 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 1 18:13:33 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5f28f6
7
8 games-emulation/fbzx: version bump
9
10 Package-Manager: portage-2.2.26
11
12 games-emulation/fbzx/Manifest | 1 +
13 games-emulation/fbzx/fbzx-3.0.0.ebuild | 36 +++++++
14 games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch | 118 +++++++++++++++++++++
15 3 files changed, 155 insertions(+)
16
17 diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest
18 index 6fc69fb..63db381 100644
19 --- a/games-emulation/fbzx/Manifest
20 +++ b/games-emulation/fbzx/Manifest
21 @@ -1 +1,2 @@
22 DIST fbzx-2.10.0.tar.bz2 326352 SHA256 deed3d37247e4154bb10325d014461c8caf0c55ca23a611c62035e491a4f960f SHA512 b96ae4029e4ef73d15c851a54c8e057131ba6e0acf03820222aa4d4bc91e8ad497556cce41c5faef230939f1c88423e09e435f9ce91c0e0f183f6eac7843bb36 WHIRLPOOL 97bb0fcbb9d1c5921b7c6f9d4873fd620d2219b71abbaece2453f4417bace91c1b1fab44382f2d63b5aa8c3225f5f865150b51ce534a228712a39543912ea908
23 +DIST fbzx-3.0.0.tar.gz 435239 SHA256 8c739edd3de599943daea0078220b5c7774fc04b62a24a7a33854e5ee24056f3 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083 WHIRLPOOL d56d7c54458f75de135b4e675bc7980ca72bebebbd0461c52db5d9be34faae1000c9d7e52dea6a5a199133edb2a5b9974979ee27dc30d811235c90fca83c908f
24
25 diff --git a/games-emulation/fbzx/fbzx-3.0.0.ebuild b/games-emulation/fbzx/fbzx-3.0.0.ebuild
26 new file mode 100644
27 index 0000000..24cde33
28 --- /dev/null
29 +++ b/games-emulation/fbzx/fbzx-3.0.0.ebuild
30 @@ -0,0 +1,36 @@
31 +# Copyright 1999-2016 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +# $Id$
34 +
35 +EAPI=5
36 +inherit eutils games
37 +
38 +DESCRIPTION="A Sinclair Spectrum emulator, designed to work at full screen using the FrameBuffer"
39 +HOMEPAGE="https://github.com/rastersoft/fbzx"
40 +SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
41 +
42 +LICENSE="GPL-3+"
43 +SLOT="0"
44 +KEYWORDS="~amd64 ~ppc ~x86"
45 +IUSE=""
46 +
47 +RDEPEND="media-libs/libsdl[video]
48 + media-sound/pulseaudio
49 + media-libs/alsa-lib"
50 +DEPEND="${RDEPEND}
51 + virtual/pkgconfig"
52 +
53 +src_prepare() {
54 + sed -i -e "s|/usr/share/|${GAMES_DATADIR}/${PN}/|g" src/llscreen.cpp || die
55 + epatch "${FILESDIR}"/${P}-gentoo.patch
56 +}
57 +
58 +src_install() {
59 + dogamesbin src/fbzx
60 + insinto "${GAMES_DATADIR}/${PN}"
61 + doins -r data/{keymap.bmp,spectrum-roms}
62 + dodoc AMSTRAD CAPABILITIES FAQ PORTING README* TODO VERSIONS
63 + doicon data/fbzx.svg
64 + make_desktop_entry fbzx FBZX
65 + prepgamesdirs
66 +}
67
68 diff --git a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
69 new file mode 100644
70 index 0000000..0e1f023
71 --- /dev/null
72 +++ b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
73 @@ -0,0 +1,118 @@
74 +diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
75 +--- fbzx-3.0.0.orig/src/Makefile 2015-04-01 17:22:47.000000000 -0400
76 ++++ fbzx-3.0.0/src/Makefile 2016-04-01 13:15:27.230190807 -0400
77 +@@ -1,78 +1,74 @@
78 +-CC=g++ -c -O2
79 +-CPP=g++ -c -O2
80 +-LN=g++ -O2
81 +-
82 + CFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
83 +-CPPFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
84 ++CXXFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
85 + LDFLAGS += `pkg-config --libs sdl libpulse-simple alsa`
86 +
87 +
88 + fbzx: cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o
89 +- $(LN) -o fbzx cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o $(LDFLAGS)
90 ++ $(CXX) -o fbzx cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o $(LDFLAGS)
91 +
92 + Z80free.o: z80free/Z80free.c z80free/Z80free.h
93 +- $(CC) -o Z80free.o z80free/Z80free.c
94 ++ $(CXX) -c $(CFLAGS) -o Z80free.o z80free/Z80free.c
95 +
96 + Z80free_codes.o: z80free/Z80free_codes.c z80free/Z80free.h
97 +- $(CC) -o Z80free_codes.o z80free/Z80free_codes.c
98 ++ $(CXX) -c $(CFLAGS) -o Z80free_codes.o z80free/Z80free_codes.c
99 +
100 + Z80free_codesCB.o: z80free/Z80free_codesCB.c z80free/Z80free.h
101 +- $(CC) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
102 ++ $(CXX) -c $(CFLAGS) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
103 +
104 + Z80free_codesED.o: z80free/Z80free_codesED.c z80free/Z80free.h
105 +- $(CC) -o Z80free_codesED.o z80free/Z80free_codesED.c
106 ++ $(CXX) -c $(CFLAGS) -o Z80free_codesED.o z80free/Z80free_codesED.c
107 +
108 + Z80free_codesDD.o: z80free/Z80free_codesDD.c z80free/Z80free.h
109 +- $(CC) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
110 ++ $(CXX) -c $(CFLAGS) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
111 +
112 + Z80free_codesFD.o: z80free/Z80free_codesFD.c z80free/Z80free.h
113 +- $(CC) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
114 ++ $(CXX) -c $(CFLAGS) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
115 +
116 + Z80free_codesDDCB.o: z80free/Z80free_codesDDCB.c z80free/Z80free.h
117 +- $(CC) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
118 ++ $(CXX) -c $(CFLAGS) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
119 +
120 + Z80free_codesFDCB.o: z80free/Z80free_codesFDCB.c z80free/Z80free.h
121 +- $(CC) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
122 ++ $(CXX) -c $(CFLAGS) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
123 +
124 + cargador.o: cargador.cpp spk_ay.hh keyboard.hh emulator.hh screen.hh osd.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh cargador.hh
125 +- $(CPP) $(CPPFLAGS) -o cargador.o cargador.cpp
126 ++ $(CXX) -c $(CXXFLAGS) -o cargador.o cargador.cpp
127 +
128 + cmdline.o: cmdline.cpp cmdline.hh
129 +- $(CPP) $(CPPFLAGS) -o cmdline.o cmdline.cpp
130 ++ $(CXX) -c $(CXXFLAGS) -o cmdline.o cmdline.cpp
131 +
132 + computer.o: computer.cpp z80free/Z80free.h llsound.hh keyboard.hh computer.hh screen.hh signals.hh llscreen.hh tape.hh emulator.hh osd.hh spk_ay.hh microdrive.hh menus.hh
133 +- $(CPP) $(CPPFLAGS) -o computer.o computer.cpp
134 ++ $(CXX) -c $(CXXFLAGS) -o computer.o computer.cpp
135 +
136 + emulator.o: emulator.cpp spk_ay.hh keyboard.hh llsound.hh cmdline.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh microdrive.hh menus.hh cargador.hh
137 +- $(CPP) $(CPPFLAGS) -o emulator.o emulator.cpp
138 ++ $(CXX) -c $(CXXFLAGS) -o emulator.o emulator.cpp
139 +
140 + keyboard.o: keyboard.cpp menus.hh llscreen.hh llsound.hh computer.hh screen.hh signals.hh z80free/Z80free.h tape.hh emulator.hh osd.hh keyboard.hh
141 +- $(CPP) $(CPPFLAGS) -o keyboard.o keyboard.cpp
142 ++ $(CXX) -c $(CXXFLAGS) -o keyboard.o keyboard.cpp
143 +
144 + llscreen.o: llscreen.cpp osd.hh font.h llscreen.hh
145 +- $(CPP) $(CPPFLAGS) -o llscreen.o llscreen.cpp
146 ++ $(CXX) -c $(CXXFLAGS) -o llscreen.o llscreen.cpp
147 +
148 + llsound.o: llsound.cpp emulator.hh screen.hh osd.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh llsound.hh
149 +- $(CPP) $(CPPFLAGS) -o llsound.o llsound.cpp
150 ++ $(CXX) -c $(CXXFLAGS) -o llsound.o llsound.cpp
151 +
152 + menus.o: menus.cpp spk_ay.hh microdrive.hh z80free/Z80free.h keyboard.hh llsound.hh llscreen.hh menus.hh tape.hh signals.hh emulator.hh screen.hh osd.hh computer.hh cargador.hh
153 +- $(CPP) $(CPPFLAGS) -o menus.o menus.cpp
154 ++ $(CXX) -c $(CXXFLAGS) -o menus.o menus.cpp
155 +
156 + microdrive.o: microdrive.cpp osd.hh emulator.hh screen.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh microdrive.hh
157 +- $(CPP) $(CPPFLAGS) -o microdrive.o microdrive.cpp
158 ++ $(CXX) -c $(CXXFLAGS) -o microdrive.o microdrive.cpp
159 +
160 + osd.o: osd.cpp osd.hh
161 +- $(CPP) $(CPPFLAGS) -o osd.o osd.cpp
162 ++ $(CXX) -c $(CXXFLAGS) -o osd.o osd.cpp
163 +
164 + screen.o: screen.cpp keyboard.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh
165 +- $(CPP) $(CPPFLAGS) -o screen.o screen.cpp
166 ++ $(CXX) -c $(CXXFLAGS) -o screen.o screen.cpp
167 +
168 + signals.o: signals.cpp signals.hh
169 +- $(CPP) $(CPPFLAGS) -o signals.o signals.cpp
170 ++ $(CXX) -c $(CXXFLAGS) -o signals.o signals.cpp
171 +
172 + spk_ay.o: spk_ay.cpp spk_ay.hh llsound.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh
173 +- $(CPP) $(CPPFLAGS) -o spk_ay.o spk_ay.cpp
174 ++ $(CXX) -c $(CXXFLAGS) -o spk_ay.o spk_ay.cpp
175 +
176 + tape.o: tape.cpp z80free/Z80free.h tape.hh signals.hh emulator.hh screen.hh osd.hh computer.hh llscreen.hh
177 +- $(CPP) $(CPPFLAGS) -o tape.o tape.cpp
178 ++ $(CXX) -c $(CXXFLAGS) -o tape.o tape.cpp
179 +
180 +diff -ru fbzx-3.0.0.orig/src/menus.cpp fbzx-3.0.0/src/menus.cpp
181 +--- fbzx-3.0.0.orig/src/menus.cpp 2015-04-01 17:22:47.000000000 -0400
182 ++++ fbzx-3.0.0/src/menus.cpp 2016-04-01 13:15:33.213974823 -0400
183 +@@ -1691,7 +1691,7 @@
184 +
185 + void keyboard_menu() {
186 +
187 +- llscreen->paint_picture("fbzx/keymap.bmp");
188 ++ llscreen->paint_picture("keymap.bmp");
189 + print_copy();
190 + wait_key();
191 + llscreen->clear_screen();