From fd32181a3b271a5ad70eeb58d8f79104e5e102a4 Mon Sep 17 00:00:00 2001
From: Konstantin Koshelev <42102568+kkoshelev@users.noreply.github.com>
Date: Wed, 25 May 2022 09:47:55 -0700
Subject: [PATCH 1/3] Add EMULATIONSTATION_SRC support for local compile

---
 packages/ui/emulationstation/package.mk | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk
index 45ebcb87a..1473c5323 100644
--- a/packages/ui/emulationstation/package.mk
+++ b/packages/ui/emulationstation/package.mk
@@ -23,6 +23,48 @@ PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} es-theme-art-book-next"
 
 PKG_CMAKE_OPTS_TARGET=" -DENABLE_EMUELEC=1 -DGLES2=1 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0"
 
+##########################################################################################################
+# The following allows building Emulation station from local copy by using EMULATIONSTATION_SRC.
+# The built makes symlinks to a local repository.
+#
+# One time setup:
+# ---------------
+# cd ~
+# git clone https://github.com/JustEnoughLinuxOS/emulationstation.git
+# cd emulationstation
+# git submodule update --init
+#
+# Cleanup old files:
+# ------------------
+# DEVICE=RG351V ARCH=aarch64 ./scripts/clean emulationstation
+#
+# Build from local copy:
+# ----------------------
+# EMULATIONSTATION_SRC=~/emulationstation DEVICE=RG351V ARCH=aarch64 ./scripts/build emulationstation
+#
+# Run from the device:
+# --------------------
+# Copy ./emulationstation binary found in build.JELOS-<device>.aarch64/emulationstation-*/.install_pkg/usr/bin/ 
+# Via ssh, run emulationstation with
+# systemctl stop emustation
+# chmod +x ./emulationstation
+# ./emulationstation
+##########################################################################################################
+if [ -n "$EMULATIONSTATION_SRC" ]; then
+unpack() {
+	echo cp -PRf ${EMULATIONSTATION_SRC} ${PKG_BUILD}
+  cp -PRf ${EMULATIONSTATION_SRC} ${PKG_BUILD}
+}
+# add some symbolic links to point to a code in local source folder
+post_unpack() {
+	rm -rf "${PKG_BUILD}/es-app"
+	ln -sf "${EMULATIONSTATION_SRC}/es-app" "${PKG_BUILD}"
+
+	rm -rf "${PKG_BUILD}/es-core"
+	ln -sf "${EMULATIONSTATION_SRC}/es-core" "${PKG_BUILD}"
+}
+fi
+
 pre_configure_target() {
   if [ -f ~/developer_settings.conf ]; then
     . ~/developer_settings.conf

From 008be17148bbee18fe2be53c034a7caa8a4fbd10 Mon Sep 17 00:00:00 2001
From: Konstantin Koshelev <42102568+kkoshelev@users.noreply.github.com>
Date: Wed, 25 May 2022 10:59:35 -0700
Subject: [PATCH 2/3] Change path to .config folder

---
 packages/jelos/sources/autostart/common/098-wireguard | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/jelos/sources/autostart/common/098-wireguard

diff --git a/packages/jelos/sources/autostart/common/098-wireguard b/packages/jelos/sources/autostart/common/098-wireguard
new file mode 100644
index 000000000..8ef2c907d
--- /dev/null
+++ b/packages/jelos/sources/autostart/common/098-wireguard
@@ -0,0 +1,10 @@
+#!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present kkoshelev (https://github.com/kkoshelev)
+
+. /etc/profile
+
+if [ "$(get_setting wireguard.up)" == "1" ]
+then
+  nohup wg-quick up /storage/.config/wireguard/wg0.conf &
+fi

From 02ec10fcb1a6306b8babe04b1f5b26a296000038 Mon Sep 17 00:00:00 2001
From: Konstantin Koshelev <42102568+kkoshelev@users.noreply.github.com>
Date: Thu, 26 May 2022 10:59:40 -0700
Subject: [PATCH 3/3] Pick newest emulation station package version

---
 packages/ui/emulationstation/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk
index 1473c5323..c0d9d990a 100644
--- a/packages/ui/emulationstation/package.mk
+++ b/packages/ui/emulationstation/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="emulationstation"
-PKG_VERSION="481a471"
+PKG_VERSION="6d3fd4b"
 PKG_GIT_CLONE_BRANCH="main"
 PKG_REV="1"
 PKG_ARCH="any"