From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch | 118 --------------------- 1 file changed, 118 deletions(-) delete mode 100644 games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch (limited to 'games-emulation/fbzx/files') 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 0e1f02337146..000000000000 --- a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch +++ /dev/null @@ -1,118 +0,0 @@ -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(); -- cgit v1.2.3