mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: Pull latest changes from upstream

Browse source
This commit is contained in:
robshape 2023-05-06 21:21:14 +02:00
parent 4f70063f6b
commit a0c9041547
3 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/create-release.yaml vendored
View file

@ -21,12 +21,12 @@ jobs:
cache-to: type=gha,mode=max cache-to: type=gha,mode=max
context: ./toolchain/ context: ./toolchain/
load: true load: true
tags: rg35xx-toolchain-new:latest tags: rg35xx-toolchain:latest
- name: Build project - name: Build project
uses: addnab/docker-run-action@v3 uses: addnab/docker-run-action@v3
with: with:
image: rg35xx-toolchain-new:latest image: rg35xx-toolchain:latest
options: -v ${{github.workspace}}:/root/workspace options: -v ${{github.workspace}}:/root/workspace
run: | run: |
export CROSS_COMPILE=/opt/rg35xx-toolchain/usr/bin/arm-buildroot-linux-gnueabihf- export CROSS_COMPILE=/opt/rg35xx-toolchain/usr/bin/arm-buildroot-linux-gnueabihf-

2
toolchain/makefile
View file

@ -1,7 +1,7 @@
.PHONY: shell .PHONY: shell
.PHONY: clean .PHONY: clean
TOOLCHAIN_NAME=rg35xx-toolchain-new TOOLCHAIN_NAME=rg35xx-toolchain
WORKSPACE_DIR := $(shell cd .. && pwd) WORKSPACE_DIR := $(shell cd .. && pwd)
CONTAINER_NAME=$(shell docker ps -f "ancestor=$(TOOLCHAIN_NAME)" --format "{{.Names}}") CONTAINER_NAME=$(shell docker ps -f "ancestor=$(TOOLCHAIN_NAME)" --format "{{.Names}}")

63
toolchain/support/patches/package/sdl/0003-rg35xx-sdlk-additions.patch
View file

@ -1,6 +1,28 @@
--- a/include/SDL_keysym.h diff --git forkSrcPrefix/src/video/fbcon/SDL_fbkeys.h forkDstPrefix/src/video/fbcon/SDL_fbkeys.h
+++ b/include/SDL_keysym.h index 2b01b6b2e3588426e50dbf109e09e0fdb8755091..4acd13df4302185d27964859a58f8b09c25f13f3 100644
@@ -296,6 +296,19 @@ --- 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 */ SDLK_UNDO = 322, /**< Atari keyboard has Undo */
/*@}*/ /*@}*/
@ -20,9 +42,11 @@
/* Add any other keys here */ /* Add any other keys here */
SDLK_LAST SDLK_LAST
--- a/src/video/fbcon/SDL_fbevents.c diff --git forkSrcPrefix/src/video/fbcon/SDL_fbevents.c forkDstPrefix/src/video/fbcon/SDL_fbevents.c
+++ b/src/video/fbcon/SDL_fbevents.c index 5e369a4a89c3157206abed1f4c4b8e27aef17024..c15d1b85b7f06757b24fb7f17dc73e6bab1c2148 100644
@@ -1133,6 +1133,38 @@ --- forkSrcPrefix/src/video/fbcon/SDL_fbevents.c
+++ forkDstPrefix/src/video/fbcon/SDL_fbevents.c
@@ -1133,6 +1133,41 @@ void FB_InitOSKeymap(_THIS)
case 127: case 127:
keymap[i] = SDLK_MENU; keymap[i] = SDLK_MENU;
break; break;
@ -55,26 +79,21 @@
+ case SCANCODE_CURSORBLOCKDOWN: + case SCANCODE_CURSORBLOCKDOWN:
+ keymap[i] = SDLK_CURSORBLOCKDOWN; + keymap[i] = SDLK_CURSORBLOCKDOWN;
+ break; + 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 */ /* this should take care of all standard ascii keys */
default: default:
keymap[i] = KVAL(vga_keymap[0][i]); keymap[i] = KVAL(vga_keymap[0][i]);
--- a/src/video/fbcon/SDL_fbkeys.h @@ -1208,6 +1243,8 @@ void FB_InitOSKeymap(_THIS)
+++ b/src/video/fbcon/SDL_fbkeys.h default: break;
@@ -114,6 +114,14 @@ }
#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_KEYPADENTER 96 + keymap[116] = SDLK_POWER; // requires hard override for some reason
#define SCANCODE_RIGHTCONTROL 97 }
#define SCANCODE_CONTROL 97
static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)