From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Thorsten Scherer <t.scherer@eckelmann.de>
Subject: Re: [ptxdist] [APPLIED] frodo: Remove after one year in staging
Date: Mon, 18 May 2026 09:53:47 +0200 [thread overview]
Message-ID: <20260518075347.50957-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20260504121331.57729-9-t.scherer@eckelmann.de>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 42163 bytes --]
Thanks, applied as 6fc3447706be77cc6c9f526c57e30a7bfa357eff.
Michael
[sent from post-receive hook]
On Mon, 18 May 2026 09:53:47 +0200, Thorsten Scherer <t.scherer@eckelmann.de> wrote:
> Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
> Message-Id: <20260504121331.57729-9-t.scherer@eckelmann.de>
> [mol: remove patches as well]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/Frodo-4.1b/0001-enable-sdl.diff.patch b/patches/Frodo-4.1b/0001-enable-sdl.diff.patch
> deleted file mode 100644
> index 2d83ea2221c8..000000000000
> --- a/patches/Frodo-4.1b/0001-enable-sdl.diff.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From 6e30f01c5dc810e943123f0b272a2299f194c94a Mon Sep 17 00:00:00 2001
> -From: unknown author <unknown.author@example.com>
> -Date: Thu, 16 Jun 2011 21:13:59 +0200
> -Subject: [PATCH 01/10] enable-sdl.diff
> -
> ----
> - Src/configure.in | 10 +++++-----
> - 1 files changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git a/Src/configure.in b/Src/configure.in
> -index cee913c..b439941 100644
> ---- a/Src/configure.in
> -+++ b/Src/configure.in
> -@@ -80,15 +80,15 @@ elif [[ x"$no_x" = "xyes" ]]; then
> - TARGET=svgalib
> - CFLAGS="$CFLAGS -D__svgalib__"
> - LIBS="$LIBS -lvga"
> -+ elif [[ x"$HAVE_SDL" = "xyes" ]]; then
> -+ AC_MSG_RESULT([SDL])
> -+ TARGET=sdl
> -+ CFLAGS="$CFLAGS $SDL_CFLAGS -DHAVE_SDL"
> -+ LIBS="$LIBS $SDL_LIBS"
> - else
> - AC_MSG_RESULT([Ummm...])
> - AC_MSG_ERROR([Neither X nor SVGAlib found, don't know what target to use.])
> - fi
> --elif [[ x"$HAVE_SDL" = "xyes" ]]; then
> -- AC_MSG_RESULT([SDL])
> -- TARGET=sdl
> -- CFLAGS="$CFLAGS $SDL_CFLAGS -DHAVE_SDL"
> -- LIBS="$LIBS $SDL_LIBS"
> - else
> - AC_MSG_RESULT([X Window System])
> - TARGET=x11
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0002-frodo-add-cppflags-support.patch b/patches/Frodo-4.1b/0002-frodo-add-cppflags-support.patch
> deleted file mode 100644
> index da4f2d1c591f..000000000000
> --- a/patches/Frodo-4.1b/0002-frodo-add-cppflags-support.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -From e9f6e3b31c6864f8defc0576a18e48485911dc56 Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Thu, 16 Jun 2011 21:29:06 +0200
> -Subject: [PATCH 02/10] frodo: add cppflags support
> -
> ----
> - Src/Makefile.in | 21 +++++++++++----------
> - 1 files changed, 11 insertions(+), 10 deletions(-)
> -
> -diff --git a/Src/Makefile.in b/Src/Makefile.in
> -index e848b47..f5b70f8 100644
> ---- a/Src/Makefile.in
> -+++ b/Src/Makefile.in
> -@@ -9,6 +9,7 @@ REVISION = 1
> - CXX = @CXX@
> - LIBS = @LIBS@
> - CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@
> -+CPPFLAGS = @CPPFLAGS@
> -
> - INSTALL = @INSTALL@
> - INSTALL_PROGRAM = @INSTALL_PROGRAM@
> -@@ -62,34 +63,34 @@ depend dep:
> - makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null
> -
> - .cpp.o:
> -- $(CC) $(INCLUDES) $(CFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -o $@ -c $*.cpp
> -
> - .cpp.s:
> -- $(CC) $(INCLUDES) $(CFLAGS) $(EXTRAFLAGS) -o $@ -S $*.cpp -g0
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRAFLAGS) -o $@ -S $*.cpp -g0
> -
> - C64_PC.o: C64.cpp C64.h C64_x.i CmdPipe.h CPUC64.h CPU1541.h VIC.h SID.h CIA.h REU.h IEC.h 1541job.h Display.h Prefs.h
> -- $(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
> -
> - CPUC64_PC.o: CPUC64.cpp CPUC64.h CPU_emulline.i C64.h VIC.h SID.h CIA.h REU.h IEC.h Display.h Version.h
> -- $(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
> -
> - CPU1541_PC.o: CPU1541.cpp CPU1541.h CPU_emulline.i 1541job.h C64.h CIA.h Display.h
> -- $(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
> -
> - C64_SC.o: C64_SC.cpp C64.h C64_x.i CmdPipe.h CPUC64.h CPU1541.h VIC.h SID.h CIA.h REU.h IEC.h 1541job.h Display.h Prefs.h
> -- $(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -
> - CPUC64_SC.o: CPUC64_SC.cpp CPUC64.h CPU_emulcycle.i CPU_common.h C64.h VIC.h SID.h CIA.h REU.h IEC.h Display.h Version.h
> -- $(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -
> - CPU1541_SC.o: CPU1541_SC.cpp CPU1541.h CPU_emulcycle.i CPU_common.h 1541job.h C64.h CIA.h Display.h
> -- $(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -
> - VIC_SC.o: VIC_SC.cpp VIC.h C64.h CPUC64.h Display.h Prefs.h
> -- $(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -
> - CIA_SC.o: CIA_SC.cpp CIA.h CPUC64.h CPU1541.h VIC.h Prefs.h
> -- $(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
> -
> - #-------------------------------------------------------------------------
> - # DO NOT DELETE THIS LINE -- make depend depends on it.
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0003-frodo-change-more-UBYTEs-into-int8.patch b/patches/Frodo-4.1b/0003-frodo-change-more-UBYTEs-into-int8.patch
> deleted file mode 100644
> index 2fc6e28b2ef8..000000000000
> --- a/patches/Frodo-4.1b/0003-frodo-change-more-UBYTEs-into-int8.patch
> +++ /dev/null
> @@ -1,72 +0,0 @@
> -From 464d0d3e0e19f3463ff3c3145dd479a938eec9f4 Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Fri, 17 Jun 2011 19:20:39 +0200
> -Subject: [PATCH 03/10] frodo: change more UBYTEs into int8
> -
> -This was obviously started but not done in all places.
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - Src/C64.h | 2 +-
> - Src/Display_svga.i | 10 +++++-----
> - 2 files changed, 6 insertions(+), 6 deletions(-)
> -
> -diff --git a/Src/C64.h b/Src/C64.h
> -index 83d8d16..0870c24 100644
> ---- a/Src/C64.h
> -+++ b/Src/C64.h
> -@@ -131,7 +131,7 @@ private:
> - struct IOStdReq *game_io;
> - struct GamePortTrigger game_trigger;
> - struct InputEvent game_event;
> -- UBYTE joy_state; // Current state of joystick
> -+ int8 joy_state; // Current state of joystick
> - bool game_open, port_allocated; // Flags: gameport.device opened, game port allocated
> - #endif
> -
> -diff --git a/Src/Display_svga.i b/Src/Display_svga.i
> -index 29f0874..37f2194 100644
> ---- a/Src/Display_svga.i
> -+++ b/Src/Display_svga.i
> -@@ -137,7 +137,7 @@ static int keystate[256];
> - static int f11pressed = 0, f12pressed = 0, quit = 0;
> - static int joystate = 0xFF;
> - static int numlock = 0;
> --static UBYTE rev_matrix[8], key_matrix[8];
> -+static int8 rev_matrix[8], key_matrix[8];
> -
> - /*
> - C64 keyboard matrix:
> -@@ -487,9 +487,9 @@ void C64Display::Update(void)
> - }
> -
> -
> --UBYTE *C64Display::BitmapBase(void)
> -+int8 *C64Display::BitmapBase(void)
> - {
> -- return (UBYTE *)bufmem;
> -+ return (int8 *)bufmem;
> - }
> -
> -
> -@@ -499,7 +499,7 @@ int C64Display::BitmapXMod(void)
> - }
> -
> -
> --void C64Display::PollKeyboard(UBYTE *CIA_key_matrix, UBYTE *CIA_rev_matrix, UBYTE *joystick)
> -+void C64Display::PollKeyboard(int8 *CIA_key_matrix, int8 *CIA_rev_matrix, int8 *joystick)
> - {
> - keyboard_update();
> - *joystick = joystate;
> -@@ -534,7 +534,7 @@ static int colorval(int v)
> - return ((v & 255)*0x01010101) >> 26;
> - }
> -
> --void C64Display::InitColors(UBYTE *colors)
> -+void C64Display::InitColors(int8 *colors)
> - {
> - int i;
> -
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0004-frodo-AmigaGUI-change-UBYTE-into-int8.patch b/patches/Frodo-4.1b/0004-frodo-AmigaGUI-change-UBYTE-into-int8.patch
> deleted file mode 100644
> index 263ebdae12a9..000000000000
> --- a/patches/Frodo-4.1b/0004-frodo-AmigaGUI-change-UBYTE-into-int8.patch
> +++ /dev/null
> @@ -1,178 +0,0 @@
> -From 23b341c7bd872cceb385283b0d18c16ffc2f68d2 Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Fri, 17 Jun 2011 19:21:38 +0200
> -Subject: [PATCH 04/10] frodo: AmigaGUI: change UBYTE into int8
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - Src/AmigaGUI.c | 112 ++++++++++++++++++++++++++++----------------------------
> - 1 files changed, 56 insertions(+), 56 deletions(-)
> -
> -diff --git a/Src/AmigaGUI.c b/Src/AmigaGUI.c
> -index eef5cb7..fb6f041 100644
> ---- a/Src/AmigaGUI.c
> -+++ b/Src/AmigaGUI.c
> -@@ -23,7 +23,7 @@
> - #include "AmigaGUI.h"
> -
> - struct Screen *Scr = NULL;
> --UBYTE *PubScreenName = NULL;
> -+int8 *PubScreenName = NULL;
> - APTR VisualInfo = NULL;
> - struct Window *PrefsWnd = NULL;
> - struct Gadget *PrefsGList = NULL;
> -@@ -35,50 +35,50 @@ UWORD PrefsLeft = 0;
> - UWORD PrefsTop = 16;
> - UWORD PrefsWidth = 561;
> - UWORD PrefsHeight = 238;
> --UBYTE *PrefsWdt = (UBYTE *)"Frodo Preferences";
> -+int8 *PrefsWdt = (int8 *)"Frodo Preferences";
> - struct TextAttr *Font, Attr;
> - UWORD FontX, FontY;
> - UWORD OffX, OffY;
> -
> --UBYTE *SIDType0Labels[] = {
> -- (UBYTE *)"None",
> -- (UBYTE *)"Digital (AHI)",
> -- (UBYTE *)"SID Card",
> -+int8 *SIDType0Labels[] = {
> -+ (int8 *)"None",
> -+ (int8 *)"Digital (AHI)",
> -+ (int8 *)"SID Card",
> - NULL };
> -
> --UBYTE *REUSize0Labels[] = {
> -- (UBYTE *)"None",
> -- (UBYTE *)"128K",
> -- (UBYTE *)"256K",
> -- (UBYTE *)"512K",
> -+int8 *REUSize0Labels[] = {
> -+ (int8 *)"None",
> -+ (int8 *)"128K",
> -+ (int8 *)"256K",
> -+ (int8 *)"512K",
> - NULL };
> -
> --UBYTE *DriveType80Labels[] = {
> -- (UBYTE *)"DIR",
> -- (UBYTE *)"D64",
> -- (UBYTE *)"T64",
> -+int8 *DriveType80Labels[] = {
> -+ (int8 *)"DIR",
> -+ (int8 *)"D64",
> -+ (int8 *)"T64",
> - NULL };
> -
> --UBYTE *DriveType90Labels[] = {
> -- (UBYTE *)"DIR",
> -- (UBYTE *)"D64",
> -- (UBYTE *)"T64",
> -+int8 *DriveType90Labels[] = {
> -+ (int8 *)"DIR",
> -+ (int8 *)"D64",
> -+ (int8 *)"T64",
> - NULL };
> -
> --UBYTE *DriveType100Labels[] = {
> -- (UBYTE *)"DIR",
> -- (UBYTE *)"D64",
> -- (UBYTE *)"T64",
> -+int8 *DriveType100Labels[] = {
> -+ (int8 *)"DIR",
> -+ (int8 *)"D64",
> -+ (int8 *)"T64",
> - NULL };
> -
> --UBYTE *DriveType110Labels[] = {
> -- (UBYTE *)"DIR",
> -- (UBYTE *)"D64",
> -- (UBYTE *)"T64",
> -+int8 *DriveType110Labels[] = {
> -+ (int8 *)"DIR",
> -+ (int8 *)"D64",
> -+ (int8 *)"T64",
> - NULL };
> -
> - struct IntuiText PrefsIText[] = {
> -- 2, 0, JAM1,34, 115, NULL, (UBYTE *)"Drive", NULL };
> -+ 2, 0, JAM1,34, 115, NULL, (int8 *)"Drive", NULL };
> -
> - #define Prefs_TNUM 1
> -
> -@@ -128,37 +128,37 @@ UWORD PrefsGTypes[] = {
> - };
> -
> - struct NewGadget PrefsNGad[] = {
> -- 8, 4, 26, 11, (UBYTE *)"Sprite display", NULL, GD_SpritesOn, PLACETEXT_RIGHT, NULL, (APTR)SpritesOnClicked,
> -- 8, 16, 26, 11, (UBYTE *)"Sprite collisions", NULL, GD_SpriteCollisions, PLACETEXT_RIGHT, NULL, (APTR)SpriteCollisionsClicked,
> -- 8, 28, 26, 11, (UBYTE *)"Joystick connected", NULL, GD_Joystick2On, PLACETEXT_RIGHT, NULL, (APTR)Joystick2OnClicked,
> -- 8, 40, 26, 11, (UBYTE *)"Map joystick to port 1", NULL, GD_JoystickSwap, PLACETEXT_RIGHT, NULL, (APTR)JoystickSwapClicked,
> -- 8, 52, 26, 11, (UBYTE *)"Limit speed", NULL, GD_LimitSpeed, PLACETEXT_RIGHT, NULL, (APTR)LimitSpeedClicked,
> -- 8, 64, 26, 11, (UBYTE *)"Fast reset", NULL, GD_FastReset, PLACETEXT_RIGHT, NULL, (APTR)FastResetClicked,
> -- 8, 76, 26, 11, (UBYTE *)"Clear CIA ICR on write", NULL, GD_CIAIRQHack, PLACETEXT_RIGHT, NULL, (APTR)CIAIRQHackClicked,
> -- 8, 88, 26, 11, (UBYTE *)"SID filters", NULL, GD_SIDFilters, PLACETEXT_RIGHT, NULL, (APTR)SIDFiltersClicked,
> -- 490, 4, 65, 14, (UBYTE *)"Cycles per line (CPU)", NULL, GD_NormalCycles, PLACETEXT_LEFT, NULL, (APTR)NormalCyclesClicked,
> -- 490, 19, 65, 14, (UBYTE *)"Cycles per Bad Line (CPU)", NULL, GD_BadLineCycles, PLACETEXT_LEFT, NULL, (APTR)BadLineCyclesClicked,
> -- 490, 34, 65, 14, (UBYTE *)"Cycles per line (CIA)", NULL, GD_CIACycles, PLACETEXT_LEFT, NULL, (APTR)CIACyclesClicked,
> -- 490, 49, 65, 14, (UBYTE *)"Cycles per line (1541)", NULL, GD_FloppyCycles, PLACETEXT_LEFT, NULL, (APTR)FloppyCyclesClicked,
> -- 490, 64, 65, 14, (UBYTE *)"Draw every n-th frame", NULL, GD_SkipFrames, PLACETEXT_LEFT, NULL, (APTR)SkipFramesClicked,
> -- 426, 79, 129, 14, (UBYTE *)"SID emulation type", NULL, GD_SIDType, PLACETEXT_LEFT, NULL, (APTR)SIDTypeClicked,
> -- 426, 94, 129, 14, (UBYTE *)"REU size", NULL, GD_REUSize, PLACETEXT_LEFT, NULL, (APTR)REUSizeClicked,
> -- 47, 123, 401, 14, (UBYTE *)"8", NULL, GD_DrivePath8, PLACETEXT_LEFT, NULL, (APTR)DrivePath8Clicked,
> -+ 8, 4, 26, 11, (int8 *)"Sprite display", NULL, GD_SpritesOn, PLACETEXT_RIGHT, NULL, (APTR)SpritesOnClicked,
> -+ 8, 16, 26, 11, (int8 *)"Sprite collisions", NULL, GD_SpriteCollisions, PLACETEXT_RIGHT, NULL, (APTR)SpriteCollisionsClicked,
> -+ 8, 28, 26, 11, (int8 *)"Joystick connected", NULL, GD_Joystick2On, PLACETEXT_RIGHT, NULL, (APTR)Joystick2OnClicked,
> -+ 8, 40, 26, 11, (int8 *)"Map joystick to port 1", NULL, GD_JoystickSwap, PLACETEXT_RIGHT, NULL, (APTR)JoystickSwapClicked,
> -+ 8, 52, 26, 11, (int8 *)"Limit speed", NULL, GD_LimitSpeed, PLACETEXT_RIGHT, NULL, (APTR)LimitSpeedClicked,
> -+ 8, 64, 26, 11, (int8 *)"Fast reset", NULL, GD_FastReset, PLACETEXT_RIGHT, NULL, (APTR)FastResetClicked,
> -+ 8, 76, 26, 11, (int8 *)"Clear CIA ICR on write", NULL, GD_CIAIRQHack, PLACETEXT_RIGHT, NULL, (APTR)CIAIRQHackClicked,
> -+ 8, 88, 26, 11, (int8 *)"SID filters", NULL, GD_SIDFilters, PLACETEXT_RIGHT, NULL, (APTR)SIDFiltersClicked,
> -+ 490, 4, 65, 14, (int8 *)"Cycles per line (CPU)", NULL, GD_NormalCycles, PLACETEXT_LEFT, NULL, (APTR)NormalCyclesClicked,
> -+ 490, 19, 65, 14, (int8 *)"Cycles per Bad Line (CPU)", NULL, GD_BadLineCycles, PLACETEXT_LEFT, NULL, (APTR)BadLineCyclesClicked,
> -+ 490, 34, 65, 14, (int8 *)"Cycles per line (CIA)", NULL, GD_CIACycles, PLACETEXT_LEFT, NULL, (APTR)CIACyclesClicked,
> -+ 490, 49, 65, 14, (int8 *)"Cycles per line (1541)", NULL, GD_FloppyCycles, PLACETEXT_LEFT, NULL, (APTR)FloppyCyclesClicked,
> -+ 490, 64, 65, 14, (int8 *)"Draw every n-th frame", NULL, GD_SkipFrames, PLACETEXT_LEFT, NULL, (APTR)SkipFramesClicked,
> -+ 426, 79, 129, 14, (int8 *)"SID emulation type", NULL, GD_SIDType, PLACETEXT_LEFT, NULL, (APTR)SIDTypeClicked,
> -+ 426, 94, 129, 14, (int8 *)"REU size", NULL, GD_REUSize, PLACETEXT_LEFT, NULL, (APTR)REUSizeClicked,
> -+ 47, 123, 401, 14, (int8 *)"8", NULL, GD_DrivePath8, PLACETEXT_LEFT, NULL, (APTR)DrivePath8Clicked,
> - 470, 123, 65, 14, NULL, NULL, GD_DriveType8, 0, NULL, (APTR)DriveType8Clicked,
> -- 47, 138, 401, 14, (UBYTE *)"9", NULL, GD_DrivePath9, PLACETEXT_LEFT, NULL, (APTR)DrivePath9Clicked,
> -+ 47, 138, 401, 14, (int8 *)"9", NULL, GD_DrivePath9, PLACETEXT_LEFT, NULL, (APTR)DrivePath9Clicked,
> - 470, 138, 65, 14, NULL, NULL, GD_DriveType9, 0, NULL, (APTR)DriveType9Clicked,
> -- 47, 153, 401, 14, (UBYTE *)"10", NULL, GD_DrivePath10, PLACETEXT_LEFT, NULL, (APTR)DrivePath10Clicked,
> -+ 47, 153, 401, 14, (int8 *)"10", NULL, GD_DrivePath10, PLACETEXT_LEFT, NULL, (APTR)DrivePath10Clicked,
> - 470, 153, 65, 14, NULL, NULL, GD_DriveType10, 0, NULL, (APTR)DriveType10Clicked,
> -- 47, 168, 401, 14, (UBYTE *)"11", NULL, GD_DrivePath11, PLACETEXT_LEFT, NULL, (APTR)DrivePath11Clicked,
> -+ 47, 168, 401, 14, (int8 *)"11", NULL, GD_DrivePath11, PLACETEXT_LEFT, NULL, (APTR)DrivePath11Clicked,
> - 470, 168, 65, 14, NULL, NULL, GD_DriveType11, 0, NULL, (APTR)DriveType11Clicked,
> -- 20, 186, 26, 11, (UBYTE *)"Map '/'<->'\' in filenames", NULL, GD_MapSlash, PLACETEXT_RIGHT, NULL, (APTR)MapSlashClicked,
> -- 20, 198, 26, 11, (UBYTE *)"Enable 1541 processor emulation", NULL, GD_Emul1541Proc, PLACETEXT_RIGHT, NULL, (APTR)Emul1541ProcClicked,
> -- 61, 218, 81, 16, (UBYTE *)"_OK", NULL, GD_OK, PLACETEXT_IN, NULL, (APTR)OKClicked,
> -- 416, 218, 81, 16, (UBYTE *)"_Cancel", NULL, GD_Cancel, PLACETEXT_IN, NULL, (APTR)CancelClicked,
> -- 448, 123, 20, 14, (UBYTE *)"·", NULL, GD_GetDrive8, PLACETEXT_IN, NULL, (APTR)GetDrive8Clicked,
> -- 448, 138, 20, 14, (UBYTE *)"·", NULL, GD_GetDrive9, PLACETEXT_IN, NULL, (APTR)GetDrive9Clicked,
> -- 448, 153, 20, 14, (UBYTE *)"·", NULL, GD_GetDrive10, PLACETEXT_IN, NULL, (APTR)GetDrive10Clicked,
> -- 448, 168, 20, 14, (UBYTE *)"·", NULL, GD_GetDrive11, PLACETEXT_IN, NULL, (APTR)GetDrive11Clicked
> -+ 20, 186, 26, 11, (int8 *)"Map '/'<->'\' in filenames", NULL, GD_MapSlash, PLACETEXT_RIGHT, NULL, (APTR)MapSlashClicked,
> -+ 20, 198, 26, 11, (int8 *)"Enable 1541 processor emulation", NULL, GD_Emul1541Proc, PLACETEXT_RIGHT, NULL, (APTR)Emul1541ProcClicked,
> -+ 61, 218, 81, 16, (int8 *)"_OK", NULL, GD_OK, PLACETEXT_IN, NULL, (APTR)OKClicked,
> -+ 416, 218, 81, 16, (int8 *)"_Cancel", NULL, GD_Cancel, PLACETEXT_IN, NULL, (APTR)CancelClicked,
> -+ 448, 123, 20, 14, (int8 *)"·", NULL, GD_GetDrive8, PLACETEXT_IN, NULL, (APTR)GetDrive8Clicked,
> -+ 448, 138, 20, 14, (int8 *)"·", NULL, GD_GetDrive9, PLACETEXT_IN, NULL, (APTR)GetDrive9Clicked,
> -+ 448, 153, 20, 14, (int8 *)"·", NULL, GD_GetDrive10, PLACETEXT_IN, NULL, (APTR)GetDrive10Clicked,
> -+ 448, 168, 20, 14, (int8 *)"·", NULL, GD_GetDrive11, PLACETEXT_IN, NULL, (APTR)GetDrive11Clicked
> - };
> -
> - ULONG PrefsGTags[] = {
> -@@ -359,7 +359,7 @@ int OpenPrefsWindow( void )
> -
> - PrefsZoom[0] = PrefsZoom[1] = 0;
> - if ( PrefsWdt )
> -- PrefsZoom[2] = TextLength( &Scr->RastPort, (UBYTE *)PrefsWdt, strlen((char *)PrefsWdt )) + 80;
> -+ PrefsZoom[2] = TextLength( &Scr->RastPort, (int8 *)PrefsWdt, strlen((char *)PrefsWdt )) + 80;
> - else
> - PrefsZoom[2] = 80L;
> - PrefsZoom[3] = Scr->WBorTop + Scr->RastPort.TxHeight + 1;
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0005-frodo-more-changes-from-UBYTE-to-int8.patch b/patches/Frodo-4.1b/0005-frodo-more-changes-from-UBYTE-to-int8.patch
> deleted file mode 100644
> index 68a9b7fafb54..000000000000
> --- a/patches/Frodo-4.1b/0005-frodo-more-changes-from-UBYTE-to-int8.patch
> +++ /dev/null
> @@ -1,199 +0,0 @@
> -From 30876f26f9dcd707df11ef409b6b95d93d33f64d Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Fri, 17 Jun 2011 19:23:22 +0200
> -Subject: [PATCH 05/10] frodo: more changes from UBYTE to int8
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - Src/AmigaGUI.h | 16 ++++++++--------
> - Src/Display.h | 2 +-
> - Src/Display_Acorn.i | 2 +-
> - Src/Display_Amiga.i | 8 ++++----
> - Src/Display_WIN32.i | 12 ++++++------
> - Src/SID_Amiga.i | 4 ++--
> - 6 files changed, 22 insertions(+), 22 deletions(-)
> -
> -diff --git a/Src/AmigaGUI.h b/Src/AmigaGUI.h
> -index 3009b45..8d4af69 100644
> ---- a/Src/AmigaGUI.h
> -+++ b/Src/AmigaGUI.h
> -@@ -78,7 +78,7 @@ extern struct IntuitionBase *IntuitionBase;
> - extern struct Library *GadToolsBase;
> -
> - extern struct Screen *Scr;
> --extern UBYTE *PubScreenName;
> -+extern int8 *PubScreenName;
> - extern APTR VisualInfo;
> - extern struct Window *PrefsWnd;
> - extern struct Gadget *PrefsGList;
> -@@ -90,16 +90,16 @@ extern UWORD PrefsLeft;
> - extern UWORD PrefsTop;
> - extern UWORD PrefsWidth;
> - extern UWORD PrefsHeight;
> --extern UBYTE *PrefsWdt;
> -+extern int8 *PrefsWdt;
> - extern struct TextAttr *Font, Attr;
> - extern UWORD FontX, FontY;
> - extern UWORD OffX, OffY;
> --extern UBYTE *SIDType0Labels[];
> --extern UBYTE *REUSize0Labels[];
> --extern UBYTE *DriveType80Labels[];
> --extern UBYTE *DriveType90Labels[];
> --extern UBYTE *DriveType100Labels[];
> --extern UBYTE *DriveType110Labels[];
> -+extern int8 *SIDType0Labels[];
> -+extern int8 *REUSize0Labels[];
> -+extern int8 *DriveType80Labels[];
> -+extern int8 *DriveType90Labels[];
> -+extern int8 *DriveType100Labels[];
> -+extern int8 *DriveType110Labels[];
> - extern struct IntuiText PrefsIText[];
> - extern struct NewMenu PrefsNewMenu[];
> - extern UWORD PrefsGTypes[];
> -diff --git a/Src/Display.h b/Src/Display.h
> -index 4a3c228..da2bee3 100644
> ---- a/Src/Display.h
> -+++ b/Src/Display.h
> -@@ -183,7 +183,7 @@ private:
> - BOOL FileNameDialog(char *prefs_path, BOOL save = false);
> - void OfferSave(); // Offer chance to save changes
> -
> -- UBYTE *chunky_buf; // Chunky buffer for drawing
> -+ int8 *chunky_buf; // Chunky buffer for drawing
> - BOOL active; // is application active?
> - BOOL paused; // is application paused?
> - BOOL waiting; // is application waiting?
> -diff --git a/Src/Display_Acorn.i b/Src/Display_Acorn.i
> -index 14f558c..bf609c0 100644
> ---- a/Src/Display_Acorn.i
> -+++ b/Src/Display_Acorn.i
> -@@ -203,7 +203,7 @@ void C64Display::PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joyst
> - int status;
> - uint8 kjoy, kjoy2;
> - uint32 newkeys[8];
> -- UBYTE kjoy, kjoy2;
> -+ int8 kjoy, kjoy2;
> -
> - // Clear keyboard
> - for (code=0; code<8; code++) {key_matrix[code] = 0xff; rev_matrix[code] = 0xff; newkeys[code] = 0;}
> -diff --git a/Src/Display_Amiga.i b/Src/Display_Amiga.i
> -index c846b68..f8ecc56 100644
> ---- a/Src/Display_Amiga.i
> -+++ b/Src/Display_Amiga.i
> -@@ -132,7 +132,7 @@ C64Display::C64Display(C64 *the_c64) : TheC64(the_c64)
> - led_state[i] = old_led_state[i] = LED_OFF;
> -
> - // Allocate chunky buffer to draw into
> -- chunky_buf = new UBYTE[DISPLAY_X * DISPLAY_Y];
> -+ chunky_buf = new int8[DISPLAY_X * DISPLAY_Y];
> -
> - // Open fonts
> - led_font = OpenDiskFont(&led_font_attr);
> -@@ -360,7 +360,7 @@ void C64Display::Speedometer(int speed)
> - * Return pointer to bitmap data
> - */
> -
> --UBYTE *C64Display::BitmapBase(void)
> -+int8 *C64Display::BitmapBase(void)
> - {
> - return chunky_buf;
> - }
> -@@ -380,7 +380,7 @@ int C64Display::BitmapXMod(void)
> - * Handle IDCMP messages
> - */
> -
> --void C64Display::PollKeyboard(UBYTE *key_matrix, UBYTE *rev_matrix, UBYTE *joystick)
> -+void C64Display::PollKeyboard(int8 *key_matrix, int8 *rev_matrix, int8 *joystick)
> - {
> - struct IntuiMessage *msg;
> -
> -@@ -594,7 +594,7 @@ bool C64Display::NumLock(void)
> - * Allocate C64 colors
> - */
> -
> --void C64Display::InitColors(UBYTE *colors)
> -+void C64Display::InitColors(int8 *colors)
> - {
> - // Spread pens into colors array
> - for (int i=0; i<256; i++)
> -diff --git a/Src/Display_WIN32.i b/Src/Display_WIN32.i
> -index c6cccf4..f55b88d 100644
> ---- a/Src/Display_WIN32.i
> -+++ b/Src/Display_WIN32.i
> -@@ -117,7 +117,7 @@ private:
> -
> - static C64Display *TheDisplay;
> - static int keystate[256];
> --static UBYTE rev_matrix[8], key_matrix[8];
> -+static int8 rev_matrix[8], key_matrix[8];
> - static int quit = 0;
> - static int numlock = 0;
> - static int joystate = 0xff;
> -@@ -223,7 +223,7 @@ C64Display::C64Display(C64 *the_c64) : TheC64(the_c64)
> - led_state[i] = old_led_state[i] = LED_OFF;
> -
> - // Allocate chunky buffer to draw into.
> -- chunky_buf = new UBYTE[DISPLAY_X * DISPLAY_Y];
> -+ chunky_buf = new int8[DISPLAY_X * DISPLAY_Y];
> -
> - CalcViewPort();
> -
> -@@ -447,7 +447,7 @@ void C64Display::Speedometer(int speed)
> - * Return pointer to bitmap data
> - */
> -
> --UBYTE *C64Display::BitmapBase()
> -+int8 *C64Display::BitmapBase()
> - {
> - #ifdef WORKBUFFER_BITMAP
> - if (colors_depth == 8 && pWork) {
> -@@ -465,7 +465,7 @@ UBYTE *C64Display::BitmapBase()
> - if (ddrval == DD_OK) {
> - workbuffer_locked = TRUE;
> - workbuffer_bitmap = TRUE;
> -- return (UBYTE *) bitmap_ddsd.lpSurface;
> -+ return (int8 *) bitmap_ddsd.lpSurface;
> - }
> - }
> - workbuffer_bitmap = FALSE;
> -@@ -492,7 +492,7 @@ int C64Display::BitmapXMod()
> - * Freshen keyboard state
> - */
> -
> --void C64Display::PollKeyboard(UBYTE *CIA_key_matrix, UBYTE *CIA_rev_matrix, UBYTE *joystick)
> -+void C64Display::PollKeyboard(int8 *CIA_key_matrix, int8 *CIA_rev_matrix, int8 *joystick)
> - {
> - //Debug("Display::PollKeyboard\n");
> -
> -@@ -532,7 +532,7 @@ bool C64Display::NumLock()
> - * Allocate C64 colors
> - */
> -
> --void C64Display::InitColors(UBYTE *array)
> -+void C64Display::InitColors(int8 *array)
> - {
> - if (colors_depth == 8) {
> - for (int i = 0; i < 256; i++)
> -diff --git a/Src/SID_Amiga.i b/Src/SID_Amiga.i
> -index 7ef993d..6467e7a 100644
> ---- a/Src/SID_Amiga.i
> -+++ b/Src/SID_Amiga.i
> -@@ -252,13 +252,13 @@ public:
> - virtual void Resume(void) {}
> -
> - private:
> -- UBYTE *sid_base; // SID card base pointer
> -+ int8 *sid_base; // SID card base pointer
> - };
> -
> - // Constructor: Reset SID
> - SIDCardRenderer::SIDCardRenderer()
> - {
> -- sid_base = (UBYTE *)0xa00001;
> -+ sid_base = (int8 *)0xa00001;
> - Reset();
> - }
> -
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0006-frodo-remove-duplicated-defines.patch b/patches/Frodo-4.1b/0006-frodo-remove-duplicated-defines.patch
> deleted file mode 100644
> index 0af3118ef969..000000000000
> --- a/patches/Frodo-4.1b/0006-frodo-remove-duplicated-defines.patch
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -From b71409de528a660b25f96a788c9b5b236706472f Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Fri, 17 Jun 2011 20:02:27 +0200
> -Subject: [PATCH 06/10] frodo: remove duplicated defines
> -
> -We currently get these warnings:
> -
> -In file included from Display.cpp:79:0:
> -Display_svga.i:156:0: warning: "KEY_F10" redefined
> -/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:186:0: note: this is the location of the previous definition
> -Display_svga.i:157:0: warning: "KEY_F11" redefined
> -/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:205:0: note: this is the location of the previous definition
> -Display_svga.i:158:0: warning: "KEY_F12" redefined
> -/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:206:0: note: this is the location of the previous definition
> -Display_svga.i:166:0: warning: "KEY_NUMLOCK" redefined
> -/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:187:0: note: this is the location of the previous definition
> -Display_svga.i:168:0: warning: "KEY_KPPLUS" redefined
> -/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:196:0: note: this is the location of the previous definition
> -Display_svga.i:169:0: warning: "KEY_KPMINUS" redefined
> -/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:192:0: note: this is the location of the previous definition
> -
> -Remove duplicate definitions.
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - Src/Display_svga.i | 7 -------
> - 1 files changed, 0 insertions(+), 7 deletions(-)
> -
> -diff --git a/Src/Display_svga.i b/Src/Display_svga.i
> -index 37f2194..75fd1b4 100644
> ---- a/Src/Display_svga.i
> -+++ b/Src/Display_svga.i
> -@@ -153,9 +153,6 @@ static int8 rev_matrix[8], key_matrix[8];
> - 7 R/S Q C= SPC 2 CTL <- 1
> - */
> - #define MATRIX(a,b) (((a) << 3) | (b))
> --#define KEY_F10 512
> --#define KEY_F11 513
> --#define KEY_F12 514
> -
> - #define KEY_FIRE 515
> - #define KEY_JUP 516
> -@@ -163,10 +160,6 @@ static int8 rev_matrix[8], key_matrix[8];
> - #define KEY_JLF 518
> - #define KEY_JRT 519
> -
> --#define KEY_NUMLOCK 520
> --
> --#define KEY_KPPLUS 521
> --#define KEY_KPMINUS 522
> - #define KEY_KPMULT 523
> - #define KEY_KPDIV 524
> -
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0007-frodo-fix-cast.patch b/patches/Frodo-4.1b/0007-frodo-fix-cast.patch
> deleted file mode 100644
> index 4797fab1174e..000000000000
> --- a/patches/Frodo-4.1b/0007-frodo-fix-cast.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From b1ee6659eb8a897badaf8f88842faf68511c8e3c Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Fri, 17 Jun 2011 20:04:11 +0200
> -Subject: [PATCH 07/10] frodo: fix cast
> -
> -Fix this error:
> -
> -In file included from Display.cpp:79:0:
> -Display_svga.i: In member function 'void C64Display::Update()':
> -Display_svga.i:478:40: error: invalid conversion from 'char*' to 'unsigned char*'
> -Display_svga.i:478:40: error: initializing argument 2 of 'int vga_drawscanline(int, unsigned char*)'
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - Src/Display_svga.i | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/Src/Display_svga.i b/Src/Display_svga.i
> -index 75fd1b4..7dd201b 100644
> ---- a/Src/Display_svga.i
> -+++ b/Src/Display_svga.i
> -@@ -475,7 +475,7 @@ void C64Display::Update(void)
> - return;
> -
> - for (y = 0; y < DISPLAY_Y; y++) {
> -- vga_drawscanline(y, bufmem + hsize * y);
> -+ vga_drawscanline(y, (unsigned char*) bufmem + hsize * y);
> - }
> - }
> -
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0008-frodo-fix-type.patch b/patches/Frodo-4.1b/0008-frodo-fix-type.patch
> deleted file mode 100644
> index 3443b66b00c4..000000000000
> --- a/patches/Frodo-4.1b/0008-frodo-fix-type.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 169e2be56169efbe4f0e84f5c4bff9edf7dd9447 Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Fri, 17 Jun 2011 20:07:53 +0200
> -Subject: [PATCH 08/10] frodo: fix type
> -
> -Display_svga.i: In member function 'uint8* C64Display::BitmapBase()':
> -Display_svga.i:485:23: error: invalid conversion from 'int8*' to 'uint8*'
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - Src/Display_svga.i | 4 ++--
> - 1 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/Src/Display_svga.i b/Src/Display_svga.i
> -index 7dd201b..68bb104 100644
> ---- a/Src/Display_svga.i
> -+++ b/Src/Display_svga.i
> -@@ -480,9 +480,9 @@ void C64Display::Update(void)
> - }
> -
> -
> --int8 *C64Display::BitmapBase(void)
> -+uint8 *C64Display::BitmapBase(void)
> - {
> -- return (int8 *)bufmem;
> -+ return (uint8 *)bufmem;
> - }
> -
> -
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0009-frodo-fix-types.patch b/patches/Frodo-4.1b/0009-frodo-fix-types.patch
> deleted file mode 100644
> index ae6c028935cb..000000000000
> --- a/patches/Frodo-4.1b/0009-frodo-fix-types.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From 3b9eb870e8cebd1ddf7f8162495013bc2adee83f Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Fri, 17 Jun 2011 20:08:52 +0200
> -Subject: [PATCH 09/10] frodo: fix types
> -
> -Display_svga.i:495:6: error: prototype for 'void C64Display::PollKeyboard(int8*, int8*, int8*)' does not match any in class 'C64Display'
> -Display.h:60:7: error: candidate is: void C64Display::PollKeyboard(uint8*, uint8*, uint8*)
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - Src/Display_svga.i | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/Src/Display_svga.i b/Src/Display_svga.i
> -index 68bb104..a60ba80 100644
> ---- a/Src/Display_svga.i
> -+++ b/Src/Display_svga.i
> -@@ -492,7 +492,7 @@ int C64Display::BitmapXMod(void)
> - }
> -
> -
> --void C64Display::PollKeyboard(int8 *CIA_key_matrix, int8 *CIA_rev_matrix, int8 *joystick)
> -+void C64Display::PollKeyboard(uint8 *CIA_key_matrix, uint8 *CIA_rev_matrix, uint8 *joystick)
> - {
> - keyboard_update();
> - *joystick = joystate;
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/0010-frodo-fix-type.patch b/patches/Frodo-4.1b/0010-frodo-fix-type.patch
> deleted file mode 100644
> index 653a3c1b4bd1..000000000000
> --- a/patches/Frodo-4.1b/0010-frodo-fix-type.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From c9a969f6dfaed4590f75d0c969658c2261c4c86d Mon Sep 17 00:00:00 2001
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Fri, 17 Jun 2011 20:09:54 +0200
> -Subject: [PATCH 10/10] frodo: fix type
> -
> -Display_svga.i:530:6: error: prototype for 'void C64Display::InitColors(int8*)' does not match any in class 'C64Display'
> -Display.h:63:7: error: candidate is: void C64Display::InitColors(uint8*)
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - Src/Display_svga.i | 4 ++--
> - 1 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/Src/Display_svga.i b/Src/Display_svga.i
> -index a60ba80..e1e4a53 100644
> ---- a/Src/Display_svga.i
> -+++ b/Src/Display_svga.i
> -@@ -527,9 +527,9 @@ static int colorval(int v)
> - return ((v & 255)*0x01010101) >> 26;
> - }
> -
> --void C64Display::InitColors(int8 *colors)
> -+void C64Display::InitColors(uint8 *colors)
> - {
> -- int i;
> -+ uint8 i;
> -
> - for (i=0; i< 256; i++) {
> - vga_setpalette(i, colorval(palette_red[i & 0x0f]), colorval(palette_green[i & 0x0f]), colorval(palette_blue[i & 0x0f]));
> ---
> -1.7.5.3
> -
> diff --git a/patches/Frodo-4.1b/autogen.sh b/patches/Frodo-4.1b/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7ddcb..000000000000
> --- a/patches/Frodo-4.1b/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/Frodo-4.1b/hack-640x480-scale2.diff b/patches/Frodo-4.1b/hack-640x480-scale2.diff
> deleted file mode 100644
> index 3f0ca2a8127f..000000000000
> --- a/patches/Frodo-4.1b/hack-640x480-scale2.diff
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Subject: hard-code 640x480 and scale by 2 for fullscreen
> -
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ----
> - Src/Display_SDL.i | 21 ++++++++++++++++++---
> - 1 file changed, 18 insertions(+), 3 deletions(-)
> -
> -Index: Frodo-4.1b/Src/Display_SDL.i
> -===================================================================
> ---- Frodo-4.1b.orig/Src/Display_SDL.i
> -+++ Frodo-4.1b/Src/Display_SDL.i
> -@@ -15,6 +15,8 @@
> - // Display surface
> - static SDL_Surface *screen = NULL;
> -
> -+unsigned char *my_pixels = (unsigned char *)malloc(640 * 480);
> -+
> - // Keyboard
> - static bool num_locked = false;
> -
> -@@ -66,7 +68,7 @@ int init_graphics(void)
> -
> - // Open window
> - SDL_WM_SetCaption(VERSION_STRING, "Frodo");
> -- screen = SDL_SetVideoMode(DISPLAY_X, DISPLAY_Y + 17, 8, SDL_DOUBLEBUF);
> -+ screen = SDL_SetVideoMode(640, 480, 8, SDL_DOUBLEBUF);
> -
> - return 1;
> - }
> -@@ -124,7 +126,9 @@ void C64Display::NewPrefs(Prefs *prefs)
> -
> - void C64Display::Update(void)
> - {
> -+ int x, y;
> - // Draw speedometer/LEDs
> -+#if 0
> - SDL_Rect r = {0, DISPLAY_Y, DISPLAY_X, 15};
> - SDL_FillRect(screen, &r, fill_gray);
> - r.w = DISPLAY_X; r.h = 1;
> -@@ -175,8 +179,19 @@ void C64Display::Update(void)
> - draw_string(screen, DISPLAY_X * 3/5 + 8, DISPLAY_Y + 4, "D\x12 10", black, fill_gray);
> - draw_string(screen, DISPLAY_X * 4/5 + 8, DISPLAY_Y + 4, "D\x12 11", black, fill_gray);
> - draw_string(screen, 24, DISPLAY_Y + 4, speedometer_string, black, fill_gray);
> --
> -+#endif
> - // Update display
> -+
> -+ for (y = 0; y < 480/2 ; y++) {
> -+ for (x = 0; x < 640/2; x++) {
> -+ unsigned char val = *(my_pixels + x + (DISPLAY_X-320)/2 + (y + (DISPLAY_Y-240)/2)* 640);
> -+ *((unsigned char *)screen->pixels + x*2+0 + (y*2+0) * 640) = val;
> -+ *((unsigned char *)screen->pixels + x*2+0 + (y*2+1) * 640) = val;
> -+ *((unsigned char *)screen->pixels + x*2+1 + (y*2+0) * 640) = val;
> -+ *((unsigned char *)screen->pixels + x*2+1 + (y*2+1) * 640) = val;
> -+ }
> -+ }
> -+
> - SDL_Flip(screen);
> - }
> -
> -@@ -249,7 +264,7 @@ void C64Display::Speedometer(int speed)
> -
> - uint8 *C64Display::BitmapBase(void)
> - {
> -- return (uint8 *)screen->pixels;
> -+ return (uint8 *)my_pixels;
> - }
> -
> -
> diff --git a/patches/Frodo-4.1b/series b/patches/Frodo-4.1b/series
> deleted file mode 100644
> index a365944dacef..000000000000
> --- a/patches/Frodo-4.1b/series
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -0001-enable-sdl.diff.patch
> -0002-frodo-add-cppflags-support.patch
> -0003-frodo-change-more-UBYTEs-into-int8.patch
> -0004-frodo-AmigaGUI-change-UBYTE-into-int8.patch
> -0005-frodo-more-changes-from-UBYTE-to-int8.patch
> -0006-frodo-remove-duplicated-defines.patch
> -0007-frodo-fix-cast.patch
> -0008-frodo-fix-type.patch
> -0009-frodo-fix-types.patch
> -0010-frodo-fix-type.patch
> diff --git a/patches/Frodo-4.1b/series-640x480-hack b/patches/Frodo-4.1b/series-640x480-hack
> deleted file mode 100644
> index ed87e5a0fc99..000000000000
> --- a/patches/Frodo-4.1b/series-640x480-hack
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -enable-sdl.diff
> -autoreconfig.diff
> -hack-640x480-scale2.diff
> diff --git a/rules/frodo.in b/rules/frodo.in
> deleted file mode 100644
> index 00a955c8c562..000000000000
> --- a/rules/frodo.in
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=bytecode_engines
> -menuconfig FRODO
> - tristate
> - prompt "frodo "
> - select READLINE
> - select ALSA_LIB
> - select SDL if FRODO_SDL
> - select SVGALIB if FRODO_SVGALIB
> - select GCCLIBS_CXX
> - select GCCLIBS_GCC_S
> - help
> - A C64 emulator.
> -
> - STAGING: remove in PTXdist 2026.03.0
> - Unmaintained in PTXdist and the old version uses SDL (1.x).
> - Needs updating to the latest version.
> -
> -if FRODO
> -
> -choice
> - prompt "graphics backend "
> - default FRODO_SDL
> -
> - config FRODO_SDL
> - bool
> - prompt "sdl"
> - help
> - SDL Backend
> -
> - config FRODO_SVGALIB
> - bool
> - prompt "svgalib"
> - help
> - SVGALIB Backend
> -endchoice
> -
> -endif
> diff --git a/rules/frodo.make b/rules/frodo.make
> deleted file mode 100644
> index 53f666eda62c..000000000000
> --- a/rules/frodo.make
> +++ /dev/null
> @@ -1,91 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2007-2009 by Marc Kleine-Budde <mkl@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_FRODO) += frodo
> -
> -#
> -# Paths and names
> -#
> -FRODO_VERSION := 4.1b
> -FRODO_MD5 := 095b9f21c03204cc13f7f249e8866cd9
> -FRODO := Frodo-$(FRODO_VERSION)
> -FRODO_SUFFIX := Src.tar.gz
> -FRODO_URL := http://frodo.cebix.net/downloads/FrodoV4_1b.$(FRODO_SUFFIX)
> -FRODO_SOURCE := $(SRCDIR)/FrodoV4_1b.$(FRODO_SUFFIX)
> -FRODO_DIR := $(BUILDDIR)/$(FRODO)
> -FRODO_LICENSE := custom
> -FRODO_LICENSE_FILES := file://Docs/legalmush.html;md5=108f0874f3c2ef9b625501635c933d92
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -FRODO_CONF_ENV := $(CROSS_ENV)
> -ifdef PTXCONF_FRODO_SVGALIB
> -FRODO_CONF_ENV += ac_cv_lib_vga_vga_setmode=yes SDL_CONFIG=no
> -endif
> -FRODO_MAKE_ENV := $(CROSS_ENV)
> -FRODO_SUBDIR := Src
> -
> -#
> -# autoconf
> -#
> -FRODO_CONF_TOOL := autoconf
> -FRODO_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - --without-x
> -
> -# cpp files are built with gcc
> -FRODO_CFLAGS := -std=gnu++98
> -
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/frodo.install:
> - @$(call targetinfo)
> - install -D -m 755 "$(FRODO_DIR)/Src/Frodo" "$(FRODO_PKGDIR)/usr/bin/Frodo"
> -
> - install -D -m 644 "$(FRODO_DIR)/1541 ROM" "$(FRODO_PKGDIR)/home/1541 ROM"
> - install -D -m 644 "$(FRODO_DIR)/Basic ROM" "$(FRODO_PKGDIR)/home/Basic ROM"
> - install -D -m 644 "$(FRODO_DIR)/Char ROM" "$(FRODO_PKGDIR)/home/Char ROM"
> - install -D -m 644 "$(FRODO_DIR)/Kernal ROM" "$(FRODO_PKGDIR)/home/Kernal ROM"
> - @$(call touch)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/frodo.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, frodo)
> - @$(call install_fixup, frodo,PRIORITY,optional)
> - @$(call install_fixup, frodo,SECTION,base)
> - @$(call install_fixup, frodo,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> - @$(call install_fixup, frodo,DESCRIPTION,missing)
> -
> - @$(call install_copy, frodo, 0, 0, 0755, -, /usr/bin/Frodo)
> -
> - @$(call install_copy, frodo, 0, 0, 2775, /home)
> - @$(call install_copy, frodo, 0, 0, 0644, -, /home/1541 ROM)
> - @$(call install_copy, frodo, 0, 0, 0644, -, /home/Basic ROM)
> - @$(call install_copy, frodo, 0, 0, 0644, -, /home/Char ROM)
> - @$(call install_copy, frodo, 0, 0, 0644, -, /home/Kernal ROM)
> -
> - @$(call install_alternative, frodo, 0, 0, 0644, /etc/frodorc, n)
> - @$(call install_link, frodo, ../etc/frodorc, /home/.frodorc)
> -
> - @$(call install_finish, frodo)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
next prev parent reply other threads:[~2026-05-18 7:54 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-04 12:12 [ptxdist] [PATCH 00/42] treewide: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 01/42] archivemount: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:12 ` [ptxdist] [PATCH 02/42] argtable2: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:12 ` [ptxdist] [PATCH 03/42] bing: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:12 ` [ptxdist] [PATCH 04/42] calibrator: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:12 ` [ptxdist] [PATCH 05/42] daemonize: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:12 ` [ptxdist] [PATCH 06/42] dhex: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:12 ` [ptxdist] [PATCH 07/42] dialog: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:12 ` [ptxdist] [PATCH 08/42] frodo: " Thorsten Scherer
2026-05-18 7:53 ` Michael Olbrich [this message]
2026-05-04 12:12 ` [ptxdist] [PATCH 09/42] gnuplot: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:12 ` [ptxdist] [PATCH 10/42] latencytop: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 11/42] latrace: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 12/42] libcli: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 13/42] libgee: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 14/42] libiodbc: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 15/42] liblockfile: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 16/42] libmikmod: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 17/42] liburcu: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 18/42] links: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:13 ` [ptxdist] [PATCH 19/42] lsuio: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:52 ` [ptxdist] [PATCH 20/42] ltt-control: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:52 ` [ptxdist] [PATCH 21/42] lua-filesystem: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:52 ` [ptxdist] [PATCH 22/42] media-session: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:52 ` [ptxdist] [PATCH 23/42] mtd-oopslog: " Thorsten Scherer
2026-05-18 7:53 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 24/42] openct: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 25/42] pcmciautils: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 26/42] pslib: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 27/42] sched_switch: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 28/42] schedtool: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 29/42] sdl-gfx: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 30/42] sdl-ttf: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 31/42] sdl: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 32/42] sdl_image: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 33/42] sdl_mixer: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 34/42] setserial: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 35/42] smtpclient: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 36/42] ssmtp: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 37/42] supertux: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 38/42] utelnetd: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 39/42] wireshark: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 40/42] xerces: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 41/42] xterm: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-05-04 12:53 ` [ptxdist] [PATCH 42/42] zsync: " Thorsten Scherer
2026-05-18 7:54 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260518075347.50957-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
--cc=t.scherer@eckelmann.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox