From 852a72a70b0e0805d5a4a03a412cd1b63393c7e3 Mon Sep 17 00:00:00 2001 From: bb2020 Date: Sun, 9 May 2021 14:13:12 +0300 Subject: [PATCH] gimx: refactor --- pkgs/games/gimx/conf.patch | 26 +++++++ pkgs/games/gimx/custom/Dualshock4.xml | 104 ++++++++++++++++++++++++++ pkgs/games/gimx/default.nix | 34 +++++---- pkgs/games/gimx/env.patch | 30 -------- pkgs/games/gimx/variant.nix | 14 ---- pkgs/top-level/all-packages.nix | 1 - 6 files changed, 150 insertions(+), 59 deletions(-) create mode 100644 pkgs/games/gimx/conf.patch create mode 100644 pkgs/games/gimx/custom/Dualshock4.xml delete mode 100644 pkgs/games/gimx/env.patch delete mode 100644 pkgs/games/gimx/variant.nix diff --git a/pkgs/games/gimx/conf.patch b/pkgs/games/gimx/conf.patch new file mode 100644 index 000000000000..875cc68824ac --- /dev/null +++ b/pkgs/games/gimx/conf.patch @@ -0,0 +1,26 @@ +diff --git a/core/config_reader.c b/core/config_reader.c +index 451fc48..ed45f4d 100644 +--- a/core/config_reader.c ++++ b/core/config_reader.c +@@ -1355,7 +1355,7 @@ int read_config_file(const char* file) + char file_path[PATH_MAX]; + + snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); +- ++ if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", file); } + if(read_file(file_path) == -1) + { + gerror("read_file failed\n"); +diff --git a/core/gimx.c b/core/gimx.c +index 700cae9..9143d8b 100755 +--- a/core/gimx.c ++++ b/core/gimx.c +@@ -192,7 +192,7 @@ void show_config() + char file_path[PATH_MAX]; + + snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); +- ++ if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file); } + FILE * fp = gfile_fopen(file_path, "r"); + if (fp == NULL) + { diff --git a/pkgs/games/gimx/custom/Dualshock4.xml b/pkgs/games/gimx/custom/Dualshock4.xml new file mode 100644 index 000000000000..45ee5ed7c1c1 --- /dev/null +++ b/pkgs/games/gimx/custom/Dualshock4.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 0ae5a7917096..132169b711d7 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 -, ncurses5, bluez, libmhash, gimxAuth ? "" }: +, ncurses5, bluez, libmhash, gimxPDP ? false }: let gimx-config = fetchFromGitHub { @@ -21,15 +21,21 @@ in stdenv.mkDerivation rec { sha256 = "0265gg6q7ymg76fb4pjrfdwjd280b3zzry96qy92w0h411slph85"; }; + patches = [ ./conf.patch ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curl libusb1 bluez libxml2 ncurses5 libmhash xorg.libX11 xorg.libXi xorg.libXext ]; - patches = [ ./env.patch ]; - prePatch = (if gimxAuth == "afterglow" then (import ./variant.nix).afterglow - else ""); + postPatch = lib.optionals gimxPDP '' + substituteInPlace ./shared/gimxcontroller/include/x360.h \ + --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" + substituteInPlace ./loader/firmware/EMU360.hex \ + --replace "1B210001" "1B211001" \ + --replace "09210001" "09211001" \ + --replace "5E048E021001" "6F0E13020001" + ''; makeFlags = "build-core"; installPhase = '' @@ -51,19 +57,19 @@ in stdenv.mkDerivation rec { mkdir -p $out/share cp -r ./loader/firmware $out/share/firmware cp -r ${gimx-config}/Linux $out/share/config + cp -r ${./custom} $out/share/custom - makeWrapper $out/bin/gimx $out/bin/gimx-with-confs \ - --set GIMXCONF $out/share/config + makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4 \ + --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ + --add-flags "-c $out/share/config/Dualshock4.xml" - makeWrapper $out/bin/gimx $out/bin/gimx-test-ds4 \ - --set GIMXCONF $out/share/config \ - --add-flags "--nograb" --add-flags "--curses" \ - --add-flags "-p /dev/ttyUSB0" --add-flags "-c Dualshock4.xml" + makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4-noff \ + --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ + --add-flags "-c $out/share/custom/Dualshock4.xml" - makeWrapper $out/bin/gimx $out/bin/gimx-test-xone \ - --set GIMXCONF $out/share/config \ - --add-flags "--nograb" --add-flags "--curses" \ - --add-flags "-p /dev/ttyUSB0" --add-flags "-c XOnePadUsb.xml" + makeWrapper $out/bin/gimx $out/bin/gimx-xboxonepad \ + --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ + --add-flags "-c $out/share/config/XOnePadUsb.xml" ''; meta = with lib; { diff --git a/pkgs/games/gimx/env.patch b/pkgs/games/gimx/env.patch deleted file mode 100644 index e1f8ed8bb6f1..000000000000 --- a/pkgs/games/gimx/env.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/core/config_reader.c -+++ b/core/config_reader.c -@@ -1353,8 +1353,10 @@ static int read_file(char* file_path) - int read_config_file(const char* file) - { - char file_path[PATH_MAX]; -- -- snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); -+ char* e = getenv("GIMXCONF"); if (e) { snprintf(file_path, sizeof(file_path), "%s/%s", e, file); } -+ else { -+ snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); -+ } - - if(read_file(file_path) == -1) - { ---- a/core/gimx.c -+++ b/core/gimx.c -@@ -190,8 +190,10 @@ void show_config() - } - - char file_path[PATH_MAX]; -- -- snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); -+ char* e = getenv("GIMXCONF"); if (e) { snprintf(file_path, sizeof(file_path), "%s/%s", e, gimx_params.config_file); } -+ else { -+ snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); -+ } - - FILE * fp = gfile_fopen(file_path, "r"); - if (fp == NULL) diff --git a/pkgs/games/gimx/variant.nix b/pkgs/games/gimx/variant.nix deleted file mode 100644 index 8396f72b4e77..000000000000 --- a/pkgs/games/gimx/variant.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - afterglow = '' - substituteInPlace ./shared/gimxcontroller/include/x360.h \ - --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" - - HEX="./loader/firmware/EMU360.hex" - sed -i '34s|1B2100|1B2110|' "$HEX" - sed -i '38s|092100|092110|' "$HEX" - sed -i '40s|5E048E021001|6F0E13020001|' "$HEX" - sed -i '34s|1C\r|0C\r|' "$HEX" - sed -i '38s|FE\r|EE\r|' "$HEX" - sed -i '40s|6D\r|DD\r|' "$HEX" - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6b56bae6a7a..7d56d667140d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30012,7 +30012,6 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; gimx = callPackage ../games/gimx {}; - gimx-afterglow = lowPrio (gimx.override { gimxAuth = "afterglow"; }); gl117 = callPackage ../games/gl-117 {};