From 8ccb14c8efc993e3e69a2c2c381757a00dd422f4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 28 Apr 2023 10:25:15 +0200 Subject: [PATCH 1/4] ES-DE: new libgit dependency --- net.retrodeck.retrodeck.yml | 18 ++++++++---------- rd-submodules/retroarch | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 35184c81..425a75a8 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -236,18 +236,16 @@ modules: url: https://github.com/zeux/pugixml/releases/download/v1.11.4/pugixml-1.11.4.tar.gz sha256: 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 - - name: libgit2-glib - buildsystem: meson + - name: libgit2 + buildsystem: cmake-ninja config-opts: - - -Dssh=false + - -DCMAKE_BUILD_TYPE=Release + - -DBUILD_SHARED_LIBS:BOOL=ON + - -DTHREADSAFE=ON sources: - - type: archive - url: https://download.gnome.org/sources/libgit2-glib/1.1/libgit2-glib-1.1.0.tar.xz - sha256: c38dd7575daf8141e1e422333a575faf65f3c9210c08e83e981b88dd41bf1ef3 - x-checker-data: - type: gnome - name: libgit2-glib - stable-only: true + - type: git + url: https://github.com/libgit2/libgit2.git + branch: maint/v0.27 # When updating this module remember to check those: # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 0b1cfb79..717b7809 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 +Subproject commit 717b78093797270877ec416e58082f1c71d435d8 From 2845e40eff47ce8bffc22eb21b1bbda49b5a2cc7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 28 Apr 2023 10:28:11 +0200 Subject: [PATCH 2/4] Updated controller config + icons --- emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf diff --git a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf old mode 100644 new mode 100755 From 8322e5cd05d3b4c73ed598bef7bd8b73a8237837 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 28 Apr 2023 10:48:44 +0200 Subject: [PATCH 3/4] [skip ci] --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 425a75a8..2076902b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1127,4 +1127,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker-0.7.0b + branch: cooker-0.7.0b \ No newline at end of file From 3aba6bb6a1349a308a75a7fef40a0fee9759846f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 28 Apr 2023 11:40:15 +0200 Subject: [PATCH 4/4] ES-DE: libgit2 forced at 1.6.3 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2076902b..a4adf23f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -245,7 +245,7 @@ modules: sources: - type: git url: https://github.com/libgit2/libgit2.git - branch: maint/v0.27 + tag: v1.6.3 # When updating this module remember to check those: # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml