Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Emulation Station: update to 2.11.2 #46412

Closed
wants to merge 1 commit into from
Closed

Emulation Station: update to 2.11.2 #46412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions srcpkgs/EmulationStation/patches/find-data-files.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
From d083efb4ab45275940c02bc72e23d334fe596fe7 Mon Sep 17 00:00:00 2001
From: Justin Kinnaird <[email protected]>
Date: Sun, 17 Nov 2019 11:35:21 -0600
Subject: [PATCH 1/2] feat: do resource lookups in standard directories

For Linux, this includes the following directories:
* <HOME>/.local/share/<APPNAME>
* /usr/local/share/<APPNAME>
* /usr/share/<APPNAME>
---
es-core/src/resources/ResourceManager.cpp | 18 ++++++++++++++++++

diff --git a/es-core/src/resources/ResourceManager.cpp b/es-core/src/resources/ResourceManager.cpp
index 9f5014e432..7fd54acea5 100644
--- a/es-core/src/resources/ResourceManager.cpp
+++ b/es-core/src/resources/ResourceManager.cpp
@@ -3,6 +3,10 @@
#include "utils/FileSystemUtil.h"
#include <fstream>

+#ifndef APPDATANAME
+#define APPDATANAME "EmulationStation"
+#endif
+
auto array_deleter = [](unsigned char* p) { delete[] p; };
auto nop_deleter = [](unsigned char* /*p*/) { };

@@ -27,6 +31,20 @@ std::string ResourceManager::getResourcePath(const std::string& path) const
{
std::string test;

+ // check in standard AppData locations
+#if defined(__linux__)
+ test = Utils::FileSystem::getHomePath() + "/.local/share/" + APPDATANAME + "/resources/" + &path[2];
+ if (Utils::FileSystem::exists(test))
+ return test;
+
+ test = std::string("/usr/local/share/") + APPDATANAME + "/resources/" + &path[2];
+ if (Utils::FileSystem::exists(test))
+ return test;
+
+ test = std::string("/usr/share/") + APPDATANAME + "/resources/" + &path[2];
+ if (Utils::FileSystem::exists(test))
+ return test;
+#endif
// check in homepath
test = Utils::FileSystem::getHomePath() + "/.emulationstation/resources/" + &path[2];
if(Utils::FileSystem::exists(test))


10 changes: 0 additions & 10 deletions srcpkgs/EmulationStation/patches/missing-include.patch
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions srcpkgs/EmulationStation/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'EmulationStation'
pkgname=EmulationStation
version=2.9.4
version=2.11.2
revision=1
_pugixml_version=1.10
create_wrksrc=yes
Expand All @@ -15,8 +15,8 @@ license="MIT"
homepage="https://github.com/RetroPie/EmulationStation"
distfiles="https://github.com/RetroPie/EmulationStation/archive/v${version}.tar.gz
https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-${_pugixml_version}.tar.gz"
checksum="79452f6c1e8aaebe98c19708b3587a0a45330bf20b3301d556285d5cd756fa4a
55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a"
checksum="6b632fe68bad5c3e0567e3bb171fe18ad7b2f8b1531d1297a7a91be95bf8734a
55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a"

post_extract() {
mv EmulationStation-$version/* .
Expand All @@ -25,5 +25,7 @@ post_extract() {
}

post_install() {
vmkdir /usr/share/EmulationStation/
vcopy resources/ /usr/share/EmulationStation/resources
vlicense LICENSE.md
}