Skip to content

Commit 98a47fc

Browse files
committed
Emulation Station: update to 2.11.2
1 parent eb8da13 commit 98a47fc

File tree

3 files changed

+55
-13
lines changed

3 files changed

+55
-13
lines changed
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
From d083efb4ab45275940c02bc72e23d334fe596fe7 Mon Sep 17 00:00:00 2001
2+
From: Justin Kinnaird <[email protected]>
3+
Date: Sun, 17 Nov 2019 11:35:21 -0600
4+
Subject: [PATCH 1/2] feat: do resource lookups in standard directories
5+
6+
For Linux, this includes the following directories:
7+
* <HOME>/.local/share/<APPNAME>
8+
* /usr/local/share/<APPNAME>
9+
* /usr/share/<APPNAME>
10+
---
11+
es-core/src/resources/ResourceManager.cpp | 18 ++++++++++++++++++
12+
13+
diff --git a/es-core/src/resources/ResourceManager.cpp b/es-core/src/resources/ResourceManager.cpp
14+
index 9f5014e432..7fd54acea5 100644
15+
--- a/es-core/src/resources/ResourceManager.cpp
16+
+++ b/es-core/src/resources/ResourceManager.cpp
17+
@@ -3,6 +3,10 @@
18+
#include "utils/FileSystemUtil.h"
19+
#include <fstream>
20+
21+
+#ifndef APPDATANAME
22+
+#define APPDATANAME "EmulationStation"
23+
+#endif
24+
+
25+
auto array_deleter = [](unsigned char* p) { delete[] p; };
26+
auto nop_deleter = [](unsigned char* /*p*/) { };
27+
28+
@@ -27,6 +31,20 @@ std::string ResourceManager::getResourcePath(const std::string& path) const
29+
{
30+
std::string test;
31+
32+
+ // check in standard AppData locations
33+
+#if defined(__linux__)
34+
+ test = Utils::FileSystem::getHomePath() + "/.local/share/" + APPDATANAME + "/resources/" + &path[2];
35+
+ if (Utils::FileSystem::exists(test))
36+
+ return test;
37+
+
38+
+ test = std::string("/usr/local/share/") + APPDATANAME + "/resources/" + &path[2];
39+
+ if (Utils::FileSystem::exists(test))
40+
+ return test;
41+
+
42+
+ test = std::string("/usr/share/") + APPDATANAME + "/resources/" + &path[2];
43+
+ if (Utils::FileSystem::exists(test))
44+
+ return test;
45+
+#endif
46+
// check in homepath
47+
test = Utils::FileSystem::getHomePath() + "/.emulationstation/resources/" + &path[2];
48+
if(Utils::FileSystem::exists(test))
49+
50+

srcpkgs/EmulationStation/patches/missing-include.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

srcpkgs/EmulationStation/template

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'EmulationStation'
22
pkgname=EmulationStation
3-
version=2.9.4
3+
version=2.11.2
44
revision=1
55
_pugixml_version=1.10
66
create_wrksrc=yes
@@ -15,8 +15,8 @@ license="MIT"
1515
homepage="https://github.com/RetroPie/EmulationStation"
1616
distfiles="https://github.com/RetroPie/EmulationStation/archive/v${version}.tar.gz
1717
https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-${_pugixml_version}.tar.gz"
18-
checksum="79452f6c1e8aaebe98c19708b3587a0a45330bf20b3301d556285d5cd756fa4a
19-
55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a"
18+
checksum="6b632fe68bad5c3e0567e3bb171fe18ad7b2f8b1531d1297a7a91be95bf8734a
19+
55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a"
2020

2121
post_extract() {
2222
mv EmulationStation-$version/* .
@@ -25,5 +25,7 @@ post_extract() {
2525
}
2626

2727
post_install() {
28+
vmkdir /usr/share/EmulationStation/
29+
vcopy resources/ /usr/share/EmulationStation/resources
2830
vlicense LICENSE.md
2931
}

0 commit comments

Comments
 (0)