From a913b6588fbaea343f91352b42ef261a02273021 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sun, 19 Apr 2026 12:05:55 -0400
Subject: [PATCH 1/2] use add repository and rebase to resolute

---
 Dockerfile         | 11 ++++-------
 Dockerfile.aarch64 | 12 +++++-------
 README.md          |  1 +
 readme-vars.yml    |  1 +
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1f28da9..43c75f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute
 
 # set version label
 ARG BUILD_DATE
@@ -18,12 +18,7 @@ RUN \
     /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/retroarch-logo.png && \
   echo "**** install packages ****" && \
-  apt-key adv \
-    --keyserver hkp://keyserver.ubuntu.com:80 \
-    --recv-keys 3B2BA0B6750986899B189AFF18DAAE7FECA3745F && \
-  echo \
-    "deb https://ppa.launchpadcontent.net/libretro/stable/ubuntu noble main" > \
-    /etc/apt/sources.list.d/retroarch.list && \
+  add-apt-repository ppa:libretro/stable && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     libretro-core-info \
@@ -44,6 +39,8 @@ RUN \
     > /build_version && \
   apt-get clean && \
   rm -rf \
+    /config/.cache \
+    /config/.launchpadlib \
     /tmp/* \
     /var/lib/apt/lists/* \
     /var/tmp/*
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 900182e..228b797 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubunturesolute
 
 # set version label
 ARG BUILD_DATE
@@ -18,12 +18,7 @@ RUN \
     /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/retroarch-logo.png && \
   echo "**** install packages ****" && \
-  apt-key adv \
-    --keyserver hkp://keyserver.ubuntu.com:80 \
-    --recv-keys 3B2BA0B6750986899B189AFF18DAAE7FECA3745F && \
-  echo \
-    "deb https://ppa.launchpadcontent.net/libretro/stable/ubuntu noble main" > \
-    /etc/apt/sources.list.d/retroarch.list && \
+  add-apt-repository ppa:libretro/stable && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     libretro-core-info \
@@ -43,7 +38,10 @@ RUN \
     "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" \
     > /build_version && \
   apt-get clean && \
+  apt-get clean && \
   rm -rf \
+    /config/.cache \
+    /config/.launchpadlib \
     /tmp/* \
     /var/lib/apt/lists/* \
     /var/tmp/*
diff --git a/README.md b/README.md
index 3f2f761..a927667 100644
--- a/README.md
+++ b/README.md
@@ -641,6 +641,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.04.26:** - Rebase to Resolute.
 * **05.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **20.12.25:** - Add Wayland init logic.
 * **25.05.25:** - Initial Version.
diff --git a/readme-vars.yml b/readme-vars.yml
index 014dfde..5b24aac 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -109,6 +109,7 @@ init_diagram: |
   "retroarch:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "19.04.26:", desc: "Rebase to Resolute."}
   - {date: "05.03.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "20.12.25:", desc: "Add Wayland init logic."}
   - {date: "25.05.25:", desc: "Initial Version."}

From 216c303f436c6a7192299898f460fecedfd293b9 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sun, 19 Apr 2026 12:50:41 -0400
Subject: [PATCH 2/2] remove copy paste error

---
 Dockerfile.aarch64 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 228b797..9456b96 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -38,7 +38,6 @@ RUN \
     "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" \
     > /build_version && \
   apt-get clean && \
-  apt-get clean && \
   rm -rf \
     /config/.cache \
     /config/.launchpadlib \