* [gentoo-commits] repo/gentoo:master commit in: games-emulation/fbzx/, games-emulation/fbzx/files/
@ 2016-04-01 18:13 Michael Sterrett
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett @ 2016-04-01 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 9e5f28f69690bc045441205bf81e0b9112931e55
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 1 18:13:15 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 18:13:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5f28f6
games-emulation/fbzx: version bump
Package-Manager: portage-2.2.26
games-emulation/fbzx/Manifest | 1 +
games-emulation/fbzx/fbzx-3.0.0.ebuild | 36 +++++++
games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch | 118 +++++++++++++++++++++
3 files changed, 155 insertions(+)
diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest
index 6fc69fb..63db381 100644
--- a/games-emulation/fbzx/Manifest
+++ b/games-emulation/fbzx/Manifest
@@ -1 +1,2 @@
DIST fbzx-2.10.0.tar.bz2 326352 SHA256 deed3d37247e4154bb10325d014461c8caf0c55ca23a611c62035e491a4f960f SHA512 b96ae4029e4ef73d15c851a54c8e057131ba6e0acf03820222aa4d4bc91e8ad497556cce41c5faef230939f1c88423e09e435f9ce91c0e0f183f6eac7843bb36 WHIRLPOOL 97bb0fcbb9d1c5921b7c6f9d4873fd620d2219b71abbaece2453f4417bace91c1b1fab44382f2d63b5aa8c3225f5f865150b51ce534a228712a39543912ea908
+DIST fbzx-3.0.0.tar.gz 435239 SHA256 8c739edd3de599943daea0078220b5c7774fc04b62a24a7a33854e5ee24056f3 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083 WHIRLPOOL d56d7c54458f75de135b4e675bc7980ca72bebebbd0461c52db5d9be34faae1000c9d7e52dea6a5a199133edb2a5b9974979ee27dc30d811235c90fca83c908f
diff --git a/games-emulation/fbzx/fbzx-3.0.0.ebuild b/games-emulation/fbzx/fbzx-3.0.0.ebuild
new file mode 100644
index 0000000..24cde33
--- /dev/null
+++ b/games-emulation/fbzx/fbzx-3.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A Sinclair Spectrum emulator, designed to work at full screen using the FrameBuffer"
+HOMEPAGE="https://github.com/rastersoft/fbzx"
+SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[video]
+ media-sound/pulseaudio
+ media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i -e "s|/usr/share/|${GAMES_DATADIR}/${PN}/|g" src/llscreen.cpp || die
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+ dogamesbin src/fbzx
+ insinto "${GAMES_DATADIR}/${PN}"
+ doins -r data/{keymap.bmp,spectrum-roms}
+ dodoc AMSTRAD CAPABILITIES FAQ PORTING README* TODO VERSIONS
+ doicon data/fbzx.svg
+ make_desktop_entry fbzx FBZX
+ prepgamesdirs
+}
diff --git a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
new file mode 100644
index 0000000..0e1f023
--- /dev/null
+++ b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
@@ -0,0 +1,118 @@
+diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
+--- fbzx-3.0.0.orig/src/Makefile 2015-04-01 17:22:47.000000000 -0400
++++ fbzx-3.0.0/src/Makefile 2016-04-01 13:15:27.230190807 -0400
+@@ -1,78 +1,74 @@
+-CC=g++ -c -O2
+-CPP=g++ -c -O2
+-LN=g++ -O2
+-
+ CFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
+-CPPFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
++CXXFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
+ LDFLAGS += `pkg-config --libs sdl libpulse-simple alsa`
+
+
+ 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
+- $(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)
++ $(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)
+
+ Z80free.o: z80free/Z80free.c z80free/Z80free.h
+- $(CC) -o Z80free.o z80free/Z80free.c
++ $(CXX) -c $(CFLAGS) -o Z80free.o z80free/Z80free.c
+
+ Z80free_codes.o: z80free/Z80free_codes.c z80free/Z80free.h
+- $(CC) -o Z80free_codes.o z80free/Z80free_codes.c
++ $(CXX) -c $(CFLAGS) -o Z80free_codes.o z80free/Z80free_codes.c
+
+ Z80free_codesCB.o: z80free/Z80free_codesCB.c z80free/Z80free.h
+- $(CC) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
++ $(CXX) -c $(CFLAGS) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
+
+ Z80free_codesED.o: z80free/Z80free_codesED.c z80free/Z80free.h
+- $(CC) -o Z80free_codesED.o z80free/Z80free_codesED.c
++ $(CXX) -c $(CFLAGS) -o Z80free_codesED.o z80free/Z80free_codesED.c
+
+ Z80free_codesDD.o: z80free/Z80free_codesDD.c z80free/Z80free.h
+- $(CC) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
++ $(CXX) -c $(CFLAGS) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
+
+ Z80free_codesFD.o: z80free/Z80free_codesFD.c z80free/Z80free.h
+- $(CC) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
++ $(CXX) -c $(CFLAGS) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
+
+ Z80free_codesDDCB.o: z80free/Z80free_codesDDCB.c z80free/Z80free.h
+- $(CC) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
++ $(CXX) -c $(CFLAGS) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
+
+ Z80free_codesFDCB.o: z80free/Z80free_codesFDCB.c z80free/Z80free.h
+- $(CC) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
++ $(CXX) -c $(CFLAGS) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
+
+ 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
+- $(CPP) $(CPPFLAGS) -o cargador.o cargador.cpp
++ $(CXX) -c $(CXXFLAGS) -o cargador.o cargador.cpp
+
+ cmdline.o: cmdline.cpp cmdline.hh
+- $(CPP) $(CPPFLAGS) -o cmdline.o cmdline.cpp
++ $(CXX) -c $(CXXFLAGS) -o cmdline.o cmdline.cpp
+
+ 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
+- $(CPP) $(CPPFLAGS) -o computer.o computer.cpp
++ $(CXX) -c $(CXXFLAGS) -o computer.o computer.cpp
+
+ 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
+- $(CPP) $(CPPFLAGS) -o emulator.o emulator.cpp
++ $(CXX) -c $(CXXFLAGS) -o emulator.o emulator.cpp
+
+ 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
+- $(CPP) $(CPPFLAGS) -o keyboard.o keyboard.cpp
++ $(CXX) -c $(CXXFLAGS) -o keyboard.o keyboard.cpp
+
+ llscreen.o: llscreen.cpp osd.hh font.h llscreen.hh
+- $(CPP) $(CPPFLAGS) -o llscreen.o llscreen.cpp
++ $(CXX) -c $(CXXFLAGS) -o llscreen.o llscreen.cpp
+
+ llsound.o: llsound.cpp emulator.hh screen.hh osd.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh llsound.hh
+- $(CPP) $(CPPFLAGS) -o llsound.o llsound.cpp
++ $(CXX) -c $(CXXFLAGS) -o llsound.o llsound.cpp
+
+ 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
+- $(CPP) $(CPPFLAGS) -o menus.o menus.cpp
++ $(CXX) -c $(CXXFLAGS) -o menus.o menus.cpp
+
+ microdrive.o: microdrive.cpp osd.hh emulator.hh screen.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh microdrive.hh
+- $(CPP) $(CPPFLAGS) -o microdrive.o microdrive.cpp
++ $(CXX) -c $(CXXFLAGS) -o microdrive.o microdrive.cpp
+
+ osd.o: osd.cpp osd.hh
+- $(CPP) $(CPPFLAGS) -o osd.o osd.cpp
++ $(CXX) -c $(CXXFLAGS) -o osd.o osd.cpp
+
+ screen.o: screen.cpp keyboard.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh
+- $(CPP) $(CPPFLAGS) -o screen.o screen.cpp
++ $(CXX) -c $(CXXFLAGS) -o screen.o screen.cpp
+
+ signals.o: signals.cpp signals.hh
+- $(CPP) $(CPPFLAGS) -o signals.o signals.cpp
++ $(CXX) -c $(CXXFLAGS) -o signals.o signals.cpp
+
+ 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
+- $(CPP) $(CPPFLAGS) -o spk_ay.o spk_ay.cpp
++ $(CXX) -c $(CXXFLAGS) -o spk_ay.o spk_ay.cpp
+
+ tape.o: tape.cpp z80free/Z80free.h tape.hh signals.hh emulator.hh screen.hh osd.hh computer.hh llscreen.hh
+- $(CPP) $(CPPFLAGS) -o tape.o tape.cpp
++ $(CXX) -c $(CXXFLAGS) -o tape.o tape.cpp
+
+diff -ru fbzx-3.0.0.orig/src/menus.cpp fbzx-3.0.0/src/menus.cpp
+--- fbzx-3.0.0.orig/src/menus.cpp 2015-04-01 17:22:47.000000000 -0400
++++ fbzx-3.0.0/src/menus.cpp 2016-04-01 13:15:33.213974823 -0400
+@@ -1691,7 +1691,7 @@
+
+ void keyboard_menu() {
+
+- llscreen->paint_picture("fbzx/keymap.bmp");
++ llscreen->paint_picture("keymap.bmp");
+ print_copy();
+ wait_key();
+ llscreen->clear_screen();
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/fbzx/, games-emulation/fbzx/files/
@ 2021-06-13 12:55 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2021-06-13 12:55 UTC (permalink / raw
To: gentoo-commits
commit: bce5cbdfaacc8aa45495ec0dd29c1d265f061fae
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 12:53:28 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 12:53:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce5cbdf
games-emulation/fbzx: drop 4.6.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/fbzx/Manifest | 1 -
games-emulation/fbzx/fbzx-4.6.0.ebuild | 53 ----------
games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch | 116 ---------------------
.../fbzx/files/fbzx-4.6.0-joystick-invert.patch | 32 ------
4 files changed, 202 deletions(-)
diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest
index 42b8ab9facc..ae6084270c0 100644
--- a/games-emulation/fbzx/Manifest
+++ b/games-emulation/fbzx/Manifest
@@ -1,2 +1 @@
-DIST fbzx_4.6.0.tar.bz2 307308 BLAKE2B 0cf6e9bf3e01c5a03e0925707aab46829ed8e3f0e4c0791d362ab8972d5d0175e35635e5ad6f895db369b4cb543efc40561fa41ec1cfd739c7252762250bdb7e SHA512 4644038c615e2487361e8a7a72d69ae2e136945160d4cc8ed982365243a7e016edff6165ae86a3f50e3f0f4d45540bfd933353ca17596f9d8e10153c492f15d9
DIST fbzx_4.8.0.tar.bz2 307530 BLAKE2B 465bac143e034604b9f7fb8cf87ef4dcdcec09e7208873350c0c2c63b560c2fc130fa1a665e91156e88563600222a1dc801fcc02c532009f2ebccb5e7946ca14 SHA512 f56a9083a741f98a77e2b9673e569341816cef943973c65c1aa6cb01ad6c2bcd5b663d3db35193196770c3eb046e8a8c15d83c2c122700d2116ad34c5d796cdc
diff --git a/games-emulation/fbzx/fbzx-4.6.0.ebuild b/games-emulation/fbzx/fbzx-4.6.0.ebuild
deleted file mode 100644
index 6b5e1d62f6b..00000000000
--- a/games-emulation/fbzx/fbzx-4.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Full Screen Sinclair Spectrum emulator"
-HOMEPAGE="http://www.rastersoft.com/programas/fbzx.html"
-SRC_URI="http://www.rastersoft.com/descargas/fbzx/${PN}_${PV}.tar.bz2"
-S="${WORKDIR}/${PN}_${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa pulseaudio"
-
-RDEPEND="
- media-libs/libsdl2[joystick,video]
- alsa? ( media-libs/alsa-lib )
- pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-joystick-invert.patch
- "${FILESDIR}"/${P}-makefile.patch
-)
-
-src_prepare() {
- default
-
- sed -i "s|/usr/share|${EPREFIX}/usr/share/${PN}|" src/llscreen.cpp || die
-}
-
-src_compile() {
- tc-export CXX PKG_CONFIG
-
- emake ALSA=$(usex alsa) PULSE=$(usex pulseaudio)
-}
-
-src_install() {
- dobin src/${PN}
- dodoc AMSTRAD CAPABILITIES FAQ HISTORY.md README.{TZX,md} TODO
- doicon data/${PN}.svg
- domenu data/${PN}.desktop
-
- insinto /usr/share/${PN}
- doins -r data/spectrum-roms
-
- insinto /usr/share/${PN}/${PN}
- doins data/keymap.bmp
-}
diff --git a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
deleted file mode 100644
index f9751d7486d..00000000000
--- a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,78 +1,74 @@
--CC=g++ -c -O2
--CPP=g++ -c -O2
--LN=g++ -O2
--
- CFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
--CPPFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
-+CXXFLAGS += `${PKG_CONFIG} --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
- LDFLAGS += `pkg-config --libs sdl libpulse-simple alsa`
-
-
- 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
-- $(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)
-+ $(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)
-
- Z80free.o: z80free/Z80free.c z80free/Z80free.h
-- $(CC) -o Z80free.o z80free/Z80free.c
-+ $(CXX) -c $(CFLAGS) -o Z80free.o z80free/Z80free.c
-
- Z80free_codes.o: z80free/Z80free_codes.c z80free/Z80free.h
-- $(CC) -o Z80free_codes.o z80free/Z80free_codes.c
-+ $(CXX) -c $(CFLAGS) -o Z80free_codes.o z80free/Z80free_codes.c
-
- Z80free_codesCB.o: z80free/Z80free_codesCB.c z80free/Z80free.h
-- $(CC) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
-+ $(CXX) -c $(CFLAGS) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
-
- Z80free_codesED.o: z80free/Z80free_codesED.c z80free/Z80free.h
-- $(CC) -o Z80free_codesED.o z80free/Z80free_codesED.c
-+ $(CXX) -c $(CFLAGS) -o Z80free_codesED.o z80free/Z80free_codesED.c
-
- Z80free_codesDD.o: z80free/Z80free_codesDD.c z80free/Z80free.h
-- $(CC) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
-+ $(CXX) -c $(CFLAGS) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
-
- Z80free_codesFD.o: z80free/Z80free_codesFD.c z80free/Z80free.h
-- $(CC) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
-+ $(CXX) -c $(CFLAGS) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
-
- Z80free_codesDDCB.o: z80free/Z80free_codesDDCB.c z80free/Z80free.h
-- $(CC) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
-+ $(CXX) -c $(CFLAGS) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
-
- Z80free_codesFDCB.o: z80free/Z80free_codesFDCB.c z80free/Z80free.h
-- $(CC) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
-+ $(CXX) -c $(CFLAGS) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
-
- 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
-- $(CPP) $(CPPFLAGS) -o cargador.o cargador.cpp
-+ $(CXX) -c $(CXXFLAGS) -o cargador.o cargador.cpp
-
- cmdline.o: cmdline.cpp cmdline.hh
-- $(CPP) $(CPPFLAGS) -o cmdline.o cmdline.cpp
-+ $(CXX) -c $(CXXFLAGS) -o cmdline.o cmdline.cpp
-
- 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
-- $(CPP) $(CPPFLAGS) -o computer.o computer.cpp
-+ $(CXX) -c $(CXXFLAGS) -o computer.o computer.cpp
-
- 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
-- $(CPP) $(CPPFLAGS) -o emulator.o emulator.cpp
-+ $(CXX) -c $(CXXFLAGS) -o emulator.o emulator.cpp
-
- 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
-- $(CPP) $(CPPFLAGS) -o keyboard.o keyboard.cpp
-+ $(CXX) -c $(CXXFLAGS) -o keyboard.o keyboard.cpp
-
- llscreen.o: llscreen.cpp osd.hh font.h llscreen.hh
-- $(CPP) $(CPPFLAGS) -o llscreen.o llscreen.cpp
-+ $(CXX) -c $(CXXFLAGS) -o llscreen.o llscreen.cpp
-
- llsound.o: llsound.cpp emulator.hh screen.hh osd.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh llsound.hh
-- $(CPP) $(CPPFLAGS) -o llsound.o llsound.cpp
-+ $(CXX) -c $(CXXFLAGS) -o llsound.o llsound.cpp
-
- 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
-- $(CPP) $(CPPFLAGS) -o menus.o menus.cpp
-+ $(CXX) -c $(CXXFLAGS) -o menus.o menus.cpp
-
- microdrive.o: microdrive.cpp osd.hh emulator.hh screen.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh microdrive.hh
-- $(CPP) $(CPPFLAGS) -o microdrive.o microdrive.cpp
-+ $(CXX) -c $(CXXFLAGS) -o microdrive.o microdrive.cpp
-
- osd.o: osd.cpp osd.hh
-- $(CPP) $(CPPFLAGS) -o osd.o osd.cpp
-+ $(CXX) -c $(CXXFLAGS) -o osd.o osd.cpp
-
- screen.o: screen.cpp keyboard.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh
-- $(CPP) $(CPPFLAGS) -o screen.o screen.cpp
-+ $(CXX) -c $(CXXFLAGS) -o screen.o screen.cpp
-
- signals.o: signals.cpp signals.hh
-- $(CPP) $(CPPFLAGS) -o signals.o signals.cpp
-+ $(CXX) -c $(CXXFLAGS) -o signals.o signals.cpp
-
- 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
-- $(CPP) $(CPPFLAGS) -o spk_ay.o spk_ay.cpp
-+ $(CXX) -c $(CXXFLAGS) -o spk_ay.o spk_ay.cpp
-
- tape.o: tape.cpp z80free/Z80free.h tape.hh signals.hh emulator.hh screen.hh osd.hh computer.hh llscreen.hh
-- $(CPP) $(CPPFLAGS) -o tape.o tape.cpp
-+ $(CXX) -c $(CXXFLAGS) -o tape.o tape.cpp
-
---- a/src/menus.cpp
-+++ b/src/menus.cpp
-@@ -1691,7 +1691,7 @@
-
- void keyboard_menu() {
-
-- llscreen->paint_picture("fbzx/keymap.bmp");
-+ llscreen->paint_picture("keymap.bmp");
- print_copy();
- wait_key();
- llscreen->clear_screen();
diff --git a/games-emulation/fbzx/files/fbzx-4.6.0-joystick-invert.patch b/games-emulation/fbzx/files/fbzx-4.6.0-joystick-invert.patch
deleted file mode 100644
index c596a1efd65..00000000000
--- a/games-emulation/fbzx/files/fbzx-4.6.0-joystick-invert.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fixed in 4.7.0 but, while marked as released for some time,
-it hasn't been tagged nor given a tarball (yet), so backport
-fix to this troublesome issue for now.
-
-https://gitlab.com/rastersoft/fbzx/-/commit/7bd47e2
-From: Sergio Costas <raster@rastersoft.com>
-Date: Sat, 17 Apr 2021 14:15:32 +0200
-Subject: [PATCH] Fixed the SINCLAIR joystick emulation
-
-The horizontal movements were inverted.
---- a/src/keyboard.cpp
-+++ b/src/keyboard.cpp
-@@ -386,3 +386,3 @@
- case 2: // sinclair 1
-- temporal_io = SDLK_1;
-+ temporal_io = SDLK_2;
- break;
-@@ -390,3 +390,3 @@
- case 3: // sinclair 2
-- temporal_io = SDLK_6;
-+ temporal_io = SDLK_7;
- break;
-@@ -406,3 +406,3 @@
- case 2: // sinclair 1
-- temporal_io = SDLK_2;
-+ temporal_io = SDLK_1;
- break;
-@@ -410,3 +410,3 @@
- case 3: // sinclair 2
-- temporal_io = SDLK_7;
-+ temporal_io = SDLK_6;
- break;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-13 12:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-13 12:55 [gentoo-commits] repo/gentoo:master commit in: games-emulation/fbzx/, games-emulation/fbzx/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2016-04-01 18:13 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox