Merge remote-tracking branch 'upstream/cooker-0.7.1b' into cooker-0.7.1b-icenine451

emu-configs/ppssppsdl/controls.ini

@@ -9,8 +9,8 @@ Square = 1-29,10-191
 Triangle = 1-47,10-188
 Start = 1-62,10-197
 Select = 1-66,10-196
-L = 1-45,10-194
-R = 1-51,10-195
+L = 1-45,10-193
+R = 1-51,10-192
 An.Up = 1-37,10-4003
 An.Down = 1-39,10-4002
 An.Left = 1-38,10-4001

net.retrodeck.retrodeck.yml

@@ -290,6 +290,21 @@ modules:
         url: https://github.com/libgit2/libgit2.git
         tag: v1.6.3
 
+  # Needed from ES-DE 2.1.0+
+  # - name: libpoppler-glib
+  #   buildsystem: cmake-ninja
+  #   config-opts:
+  #     - -DENABLE_BOOST=OFF
+  #   sources:
+  #     - type: archive
+  #       url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2
+  #       sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81
+  #   cleanup:
+  #     - /lib/pkgconfig
+  #     - /include
+  #     - '*.a'
+  #     - '*.la'
+
   # When updating this module remember to check those:
   # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml
   # But we don't include them 1:1 as RetroDECK got some specific configs in some cases

rd-submodules/es-de/es-de-retrodeck-mods.patch

@@ -165,4 +165,4 @@ diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-cor
      progressBarRect.barPosY += borderThickness;
 -    progressBarRect.color = 0x79010FFF;
 +    progressBarRect.color = 0xC858E6FF;
-     mProgressBarRectangles.emplace_back(progressBarRect);
+     mProgressBarRectangles.emplace_back(progressBarRect);