From a0c90415479be53dd230f1d6f8594d7996f9a37e Mon Sep 17 00:00:00 2001
From: robshape <robshape@users.noreply.github.com>
Date: Sat, 6 May 2023 21:21:14 +0200
Subject: [PATCH] chore: Pull latest changes from upstream

---
 .github/workflows/create-release.yaml         |  4 +-
 toolchain/makefile                            |  2 +-
 .../sdl/0003-rg35xx-sdlk-additions.patch      | 63 ++++++++++++-------
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
index 129cd61..1227269 100644
--- a/.github/workflows/create-release.yaml
+++ b/.github/workflows/create-release.yaml
@@ -21,12 +21,12 @@ jobs:
           cache-to: type=gha,mode=max
           context: ./toolchain/
           load: true
-          tags: rg35xx-toolchain-new:latest
+          tags: rg35xx-toolchain:latest
 
       - name: Build project
         uses: addnab/docker-run-action@v3
         with:
-          image: rg35xx-toolchain-new:latest
+          image: rg35xx-toolchain:latest
           options: -v ${{github.workspace}}:/root/workspace
           run: |
             export CROSS_COMPILE=/opt/rg35xx-toolchain/usr/bin/arm-buildroot-linux-gnueabihf-
diff --git a/toolchain/makefile b/toolchain/makefile
index 8763da2..102a27e 100644
--- a/toolchain/makefile
+++ b/toolchain/makefile
@@ -1,7 +1,7 @@
 .PHONY: shell
 .PHONY: clean
 
-TOOLCHAIN_NAME=rg35xx-toolchain-new
+TOOLCHAIN_NAME=rg35xx-toolchain
 WORKSPACE_DIR := $(shell cd .. && pwd)
 
 CONTAINER_NAME=$(shell docker ps -f "ancestor=$(TOOLCHAIN_NAME)" --format "{{.Names}}")
diff --git a/toolchain/support/patches/package/sdl/0003-rg35xx-sdlk-additions.patch b/toolchain/support/patches/package/sdl/0003-rg35xx-sdlk-additions.patch
index 979525e..60ecf64 100644
--- a/toolchain/support/patches/package/sdl/0003-rg35xx-sdlk-additions.patch
+++ b/toolchain/support/patches/package/sdl/0003-rg35xx-sdlk-additions.patch
@@ -1,6 +1,28 @@
---- a/include/SDL_keysym.h
-+++ b/include/SDL_keysym.h
-@@ -296,6 +296,19 @@
+diff --git forkSrcPrefix/src/video/fbcon/SDL_fbkeys.h forkDstPrefix/src/video/fbcon/SDL_fbkeys.h
+index 2b01b6b2e3588426e50dbf109e09e0fdb8755091..4acd13df4302185d27964859a58f8b09c25f13f3 100644
+--- forkSrcPrefix/src/video/fbcon/SDL_fbkeys.h
++++ forkDstPrefix/src/video/fbcon/SDL_fbkeys.h
+@@ -114,6 +114,15 @@
+ #define SCANCODE_F11			87
+ #define SCANCODE_F12			88
+ 
++/* RG35XX */
++#define SCANCODE_KATAKANA		90
++#define SCANCODE_HIRAGANA		91
++#define SCANCODE_HENKAN			92
++#define SCANCODE_KATAKANAHIRAGANA	93
++#define SCANCODE_MUHENKAN		94
++#define SCANCODE_KPJPCOMMA		95
++#define SCANCODE_POWER			116
++
+ #define SCANCODE_KEYPADENTER		96
+ #define SCANCODE_RIGHTCONTROL		97
+ #define SCANCODE_CONTROL		97
+diff --git forkSrcPrefix/include/SDL_keysym.h forkDstPrefix/include/SDL_keysym.h
+index f2ad12b81ef5725e3d975c9ad3a775fa50aa6cb6..7c348322a4d0434f4cd7349fdbd62026d4e65911 100644
+--- forkSrcPrefix/include/SDL_keysym.h
++++ forkDstPrefix/include/SDL_keysym.h
+@@ -296,6 +296,19 @@ typedef enum {
  	SDLK_UNDO		= 322,		/**< Atari keyboard has Undo */
          /*@}*/
  
@@ -20,9 +42,11 @@
  	/* Add any other keys here */
  
  	SDLK_LAST
---- a/src/video/fbcon/SDL_fbevents.c
-+++ b/src/video/fbcon/SDL_fbevents.c
-@@ -1133,6 +1133,38 @@
+diff --git forkSrcPrefix/src/video/fbcon/SDL_fbevents.c forkDstPrefix/src/video/fbcon/SDL_fbevents.c
+index 5e369a4a89c3157206abed1f4c4b8e27aef17024..c15d1b85b7f06757b24fb7f17dc73e6bab1c2148 100644
+--- forkSrcPrefix/src/video/fbcon/SDL_fbevents.c
++++ forkDstPrefix/src/video/fbcon/SDL_fbevents.c
+@@ -1133,6 +1133,41 @@ void FB_InitOSKeymap(_THIS)
  	  case 127:
  	    keymap[i] = SDLK_MENU;
  	    break;
@@ -55,26 +79,21 @@
 +	  case SCANCODE_CURSORBLOCKDOWN:
 +	  	keymap[i] = SDLK_CURSORBLOCKDOWN;
 +		break;
++	  case SCANCODE_POWER: // this doesn't stick so we override below
++	  	keymap[i] = SDLK_POWER; // leaving this in just in case
++		break;
 +			
 +		
 +		
  	  /* this should take care of all standard ascii keys */
  	  default:
  	    keymap[i] = KVAL(vga_keymap[0][i]);
---- a/src/video/fbcon/SDL_fbkeys.h
-+++ b/src/video/fbcon/SDL_fbkeys.h
-@@ -114,6 +114,14 @@
- #define SCANCODE_F11			87
- #define SCANCODE_F12			88
+@@ -1208,6 +1243,8 @@ void FB_InitOSKeymap(_THIS)
+ 	    default: break;
+ 	  }
+ 	}
++	
++	keymap[116] = SDLK_POWER; // requires hard override for some reason
+ }
  
-+/* RG35XX */
-+#define SCANCODE_KATAKANA		90
-+#define SCANCODE_HIRAGANA		91
-+#define SCANCODE_HENKAN			92
-+#define SCANCODE_KATAKANAHIRAGANA	93
-+#define SCANCODE_MUHENKAN		94
-+#define SCANCODE_KPJPCOMMA		95
-+
- #define SCANCODE_KEYPADENTER		96
- #define SCANCODE_RIGHTCONTROL		97
- #define SCANCODE_CONTROL		97
+ static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)