From 0de014563e7fbcd09c8e9216e6e36745b7e9e445 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Wed, 26 Apr 2023 20:48:53 +0200 Subject: [PATCH 1/5] Update io.mrarm.mcpelauncher.json --- io.mrarm.mcpelauncher.json | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/io.mrarm.mcpelauncher.json b/io.mrarm.mcpelauncher.json index 4179501..fc85f38 100644 --- a/io.mrarm.mcpelauncher.json +++ b/io.mrarm.mcpelauncher.json @@ -53,6 +53,17 @@ "--env=QML_IMPORT_PATH=/app/qml/" ], "modules": [ + { + "name": "libevdev", + "sources": [ + { + "type": "git", + "url": "https://gitlab.freedesktop.org/libevdev/libevdev.git", + "tag": "libevdev-1.13.0", + "commit": "ff4276398c9474f04bb1b8cb9f27e6163c5e040e" + } + ] + }, { "name": "protobuf", "sources": [ @@ -157,7 +168,7 @@ "CXX": "clang++" }, "config-opts": [ - "-DGAMEWINDOW_SYSTEM=GLFW", + "-DGAMEWINDOW_SYSTEM=EGLUT", "-DENABLE_DEV_PATHS=OFF", "-DFETCHCONTENT_SOURCE_DIR_NLOHMANN_JSON_EXT=nlohmann_json_ext", "-DFETCHCONTENT_SOURCE_DIR_GLFW3_EXT=glfw3_ext", @@ -201,6 +212,12 @@ "commit": "b16d1fa8ee567b52c09a0f89940b07d8491b881d", "dest": "curl_ext" }, + { + "type": "git", + "url": "https://github.com/ChristopherHX/linux-gamepad", + "commit": "f1f53c11ead86c89ac9c6f5df3554e4e1a391b6b", + "dest": "linux-gamepad" + }, { "type": "file", "url": "https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip", @@ -241,4 +258,4 @@ ] } ] -} \ No newline at end of file +} From 268d678e1fe58f3a5fe287f4504ec84a32d17973 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Wed, 26 Apr 2023 21:06:44 +0200 Subject: [PATCH 2/5] Update io.mrarm.mcpelauncher.json --- io.mrarm.mcpelauncher.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/io.mrarm.mcpelauncher.json b/io.mrarm.mcpelauncher.json index fc85f38..c8781a0 100644 --- a/io.mrarm.mcpelauncher.json +++ b/io.mrarm.mcpelauncher.json @@ -212,6 +212,12 @@ "commit": "b16d1fa8ee567b52c09a0f89940b07d8491b881d", "dest": "curl_ext" }, + { + "type": "shell", + "commands": [ + "rm -r linux-gamepad", + ] + } { "type": "git", "url": "https://github.com/ChristopherHX/linux-gamepad", From 2349f2d56585176a581df7b8c64a9aaa97cd278d Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Wed, 26 Apr 2023 21:09:12 +0200 Subject: [PATCH 3/5] Update io.mrarm.mcpelauncher.json --- io.mrarm.mcpelauncher.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io.mrarm.mcpelauncher.json b/io.mrarm.mcpelauncher.json index c8781a0..199c2db 100644 --- a/io.mrarm.mcpelauncher.json +++ b/io.mrarm.mcpelauncher.json @@ -215,9 +215,9 @@ { "type": "shell", "commands": [ - "rm -r linux-gamepad", + "rm -r linux-gamepad" ] - } + }, { "type": "git", "url": "https://github.com/ChristopherHX/linux-gamepad", From fa4c08b66c09cb02416c1e1e9e0eab3d12a2bda5 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Thu, 27 Apr 2023 18:19:48 +0200 Subject: [PATCH 4/5] Try to fix crash --- io.mrarm.mcpelauncher.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.mrarm.mcpelauncher.json b/io.mrarm.mcpelauncher.json index 199c2db..6ddb910 100644 --- a/io.mrarm.mcpelauncher.json +++ b/io.mrarm.mcpelauncher.json @@ -221,7 +221,7 @@ { "type": "git", "url": "https://github.com/ChristopherHX/linux-gamepad", - "commit": "f1f53c11ead86c89ac9c6f5df3554e4e1a391b6b", + "commit": "edddfbaec59e6f2a198f7cae1c7962643c249fa9", "dest": "linux-gamepad" }, { From c45cae80ad2263367660361866f91659c960f977 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Thu, 27 Apr 2023 19:29:14 +0200 Subject: [PATCH 5/5] Fix this code used udev --- io.mrarm.mcpelauncher.json | 1 + 1 file changed, 1 insertion(+) diff --git a/io.mrarm.mcpelauncher.json b/io.mrarm.mcpelauncher.json index 6ddb910..a7d3e80 100644 --- a/io.mrarm.mcpelauncher.json +++ b/io.mrarm.mcpelauncher.json @@ -169,6 +169,7 @@ }, "config-opts": [ "-DGAMEWINDOW_SYSTEM=EGLUT", + "-DLINUX_GAMEPAD_INOTIFY=ON", "-DENABLE_DEV_PATHS=OFF", "-DFETCHCONTENT_SOURCE_DIR_NLOHMANN_JSON_EXT=nlohmann_json_ext", "-DFETCHCONTENT_SOURCE_DIR_GLFW3_EXT=glfw3_ext",