Skip to content

Commit fb1ce21

Browse files
w1ndgw1ndg
authored
Merge branch 'RetroPie:master' into master
2 parents ad40cde + 8356731 commit fb1ce21

File tree

6 files changed

+478
-2
lines changed

6 files changed

+478
-2
lines changed

‎scriptmodules/emulators/ppsspp.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,15 @@ function sources_ppsspp() {
5353
# ensure Pi vendor libraries are available for linking of shared library
5454
sed -n -i "p; s/^set(CMAKE_EXE_LINKER_FLAGS/set(CMAKE_SHARED_LINKER_FLAGS/p" cmake/Toolchains/raspberry.armv?.cmake
5555

56-
# fix missing defines on opengles2
57-
applyPatch "$md_data/gles2_fix.diff"
56+
# fix missing defines on opengles2 on v1.16.6
57+
if [[ "$md_id" == "ppsspp" && "$(_get_release_ppsspp)" == "v1.16.6" ]]; then
58+
applyPatch "$md_data/gles2_fix.diff"
59+
fi
60+
61+
# fix missing exported symbol for libretro on v1.13.2
62+
if [[ "$md_id" == "lr-ppsspp" && "$(_get_release_ppsspp)" == "v1.13.2" ]]; then
63+
applyPatch "$md_data/v13-libretro_fix.diff"
64+
fi
5865

5966
if hasPackage cmake 3.6 lt; then
6067
cd ..

‎scriptmodules/libretrocores/lr-ppsspp/v13-libretro_fix.diff

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
diff --git a/Core/HLE/__sceAudio.cpp b/Core/HLE/__sceAudio.cpp
2+
index 3176d26..f05ad9d 100644
3+
--- a/Core/HLE/__sceAudio.cpp
4+
+++ b/Core/HLE/__sceAudio.cpp
5+
@@ -82,6 +82,11 @@ static bool m_logAudio;
6+
static int chanQueueMaxSizeFactor;
7+
static int chanQueueMinSizeFactor;
8+
9+
+// Accessor for libretro
10+
+int __AudioGetHostAttemptBlockSize() {
11+
+ return hostAttemptBlockSize;
12+
+}
13+
+
14+
static void hleAudioUpdate(u64 userdata, int cyclesLate) {
15+
// Schedule the next cycle first. __AudioUpdate() may consume cycles.
16+
CoreTiming::ScheduleEvent(audioIntervalCycles - cyclesLate, eventAudioUpdate, 0);
17+
diff --git a/Core/HLE/__sceAudio.h b/Core/HLE/__sceAudio.h
18+
index ae9ca35..f26ae0d 100644
19+
--- a/Core/HLE/__sceAudio.h
20+
+++ b/Core/HLE/__sceAudio.h
21+
@@ -50,6 +50,8 @@ int __AudioMix(short *outstereo, int numSamples, int sampleRate);
22+
void __AudioGetDebugStats(char *buf, size_t bufSize);
23+
void __PushExternalAudio(const s32 *audio, int numSamples); // Should not be used in-game, only at the menu!
24+
25+
+int __AudioGetHostAttemptBlockSize();
26+
+
27+
// Audio Dumping stuff
28+
void __StartLogAudio(const Path &filename);
29+
void __StopLogAudio();
30+
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
31+
index eacbca2..26f2cf6 100644
32+
--- a/libretro/libretro.cpp
33+
+++ b/libretro/libretro.cpp
34+
@@ -379,7 +379,7 @@ class LibretroHost : public Host
35+
void InitSound() override {}
36+
void UpdateSound() override
37+
{
38+
- extern int hostAttemptBlockSize;
39+
+ int hostAttemptBlockSize = __AudioGetHostAttemptBlockSize();
40+
const int blockSizeMax = 512;
41+
static int16_t audio[blockSizeMax * 2];
42+
assert(hostAttemptBlockSize <= blockSizeMax);

‎scriptmodules/supplementary/esthemes.sh

+7
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ function install_theme_esthemes() {
6161

6262
mkdir -p "/etc/emulationstation/themes"
6363
gitPullOrClone "/etc/emulationstation/themes/$name" "https://github.com/$repo/es-theme-$theme.git" "$branch"
64+
65+
# apply any patches for themes broken due to ES fixes
66+
if [[ "$pixel_pos" == 1 && -f "$md_data/patch-$repo-$theme.diff" ]]; then
67+
pushd "/etc/emulationstation/themes/$name"
68+
applyPatch "$md_data/patch-$repo-$theme.diff"
69+
popd
70+
fi
6471
}
6572

6673
function uninstall_theme_esthemes() {

‎scriptmodules/supplementary/esthemes/patch-ruckage-famicom-mini.diff

+161
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
diff -u -r famicom-mini-master/layouts/1024x768.xml famicom-mini-mod/layouts/1024x768.xml
2+
--- famicom-mini-master/layouts/1024x768.xml 2017-08-07 02:15:59.000000000 +0300
3+
+++ famicom-mini-mod/layouts/1024x768.xml 2023-11-19 20:50:59.665662200 +0200
4+
@@ -10,10 +10,10 @@
5+
<view name="basic, detailed,video">
6+
7+
<textlist name="gamelist">
8+
- <size>0.573 0.5481481481481481</size>
9+
- <pos>0.38 0.2185185185185185</pos>
10+
+ <size>0.5715 0.630208333333333</size>
11+
+ <pos>0.3807 0.1860</pos>
12+
<lineSpacing>1.39</lineSpacing>
13+
- <selectorHeight>0.0740740740740741</selectorHeight>
14+
+ <selectorHeight>0.0795</selectorHeight>
15+
<selectorOffsetY>0</selectorOffsetY>
16+
<horizontalMargin>0.0166666666666667</horizontalMargin>
17+
</textlist>
18+
diff -u -r famicom-mini-master/layouts/1280x720.xml famicom-mini-mod/layouts/1280x720.xml
19+
--- famicom-mini-master/layouts/1280x720.xml 2017-08-07 02:15:59.000000000 +0300
20+
+++ famicom-mini-mod/layouts/1280x720.xml 2023-11-19 20:18:09.217099000 +0200
21+
@@ -8,8 +8,8 @@
22+
<view name="basic, detailed,video">
23+
24+
<textlist name="gamelist">
25+
- <pos>0.2854166666666667 0.2185185185185185</pos>
26+
- <size>0.4291666666666667 0.5481481481481481</size>
27+
+ <pos>0.2854166666666667 0.1890</pos>
28+
+ <size>0.4291666666666667 0.629166666666667</size>
29+
<lineSpacing>1.3975</lineSpacing>
30+
<selectorHeight>0.0740740740740741</selectorHeight>
31+
<selectorOffsetY>0</selectorOffsetY>
32+
diff -u -r famicom-mini-master/layouts/1280x960.xml famicom-mini-mod/layouts/1280x960.xml
33+
--- famicom-mini-master/layouts/1280x960.xml 2017-08-07 02:15:59.000000000 +0300
34+
+++ famicom-mini-mod/layouts/1280x960.xml 2023-11-19 20:55:57.216498200 +0200
35+
@@ -10,10 +10,10 @@
36+
<view name="basic, detailed,video">
37+
38+
<textlist name="gamelist">
39+
- <size>0.5725 0.5481481481481481</size>
40+
- <pos>0.3805555555555556 0.2185185185185185</pos>
41+
+ <size>0.5715 0.630208333333333</size>
42+
+ <pos>0.3807 0.1860</pos>
43+
<lineSpacing>1.395</lineSpacing>
44+
- <selectorHeight>0.0740740740740741</selectorHeight>
45+
+ <selectorHeight>0.0795</selectorHeight>
46+
<selectorOffsetY>0</selectorOffsetY>
47+
<horizontalMargin>0.0166666666666667</horizontalMargin>
48+
</textlist>
49+
diff -u -r famicom-mini-master/layouts/1366x768.xml famicom-mini-mod/layouts/1366x768.xml
50+
--- famicom-mini-master/layouts/1366x768.xml 2017-08-07 02:15:59.000000000 +0300
51+
+++ famicom-mini-mod/layouts/1366x768.xml 2023-11-19 20:33:51.952952100 +0200
52+
@@ -8,8 +8,8 @@
53+
<view name="basic, detailed,video">
54+
55+
<textlist name="gamelist">
56+
- <pos>0.2854166666666667 0.2185185185185185</pos>
57+
- <size>0.4291666666666667 0.5481481481481481</size>
58+
+ <pos>0.2854166666666667 0.1890</pos>
59+
+ <size>0.4291666666666667 0.629166666666667</size>
60+
<lineSpacing>1.39</lineSpacing>
61+
<selectorHeight>0.0740740740740741</selectorHeight>
62+
<selectorOffsetY>0</selectorOffsetY>
63+
diff -u -r famicom-mini-master/layouts/1440x1080.xml famicom-mini-mod/layouts/1440x1080.xml
64+
--- famicom-mini-master/layouts/1440x1080.xml 2017-08-07 02:15:59.000000000 +0300
65+
+++ famicom-mini-mod/layouts/1440x1080.xml 2023-11-19 20:56:45.019045900 +0200
66+
@@ -10,10 +10,10 @@
67+
<view name="basic, detailed,video">
68+
69+
<textlist name="gamelist">
70+
- <size>0.5722222222222222 0.5481481481481481</size>
71+
- <pos>0.3805555555555556 0.2185185185185185</pos>
72+
+ <size>0.5715 0.630208333333333</size>
73+
+ <pos>0.3807 0.1860</pos>
74+
<lineSpacing>1.375</lineSpacing>
75+
- <selectorHeight>0.0740740740740741</selectorHeight>
76+
+ <selectorHeight>0.0795</selectorHeight>
77+
<selectorOffsetY>0</selectorOffsetY>
78+
<horizontalMargin>0.0166666666666667</horizontalMargin>
79+
</textlist>
80+
diff -u -r famicom-mini-master/layouts/1920x1080.xml famicom-mini-mod/layouts/1920x1080.xml
81+
--- famicom-mini-master/layouts/1920x1080.xml 2017-08-07 02:15:59.000000000 +0300
82+
+++ famicom-mini-mod/layouts/1920x1080.xml 2023-11-19 20:18:27.434632200 +0200
83+
@@ -8,8 +8,8 @@
84+
<view name="basic, detailed,video">
85+
86+
<textlist name="gamelist">
87+
- <pos>0.2854166666666667 0.2185185185185185</pos>
88+
- <size>0.4291666666666667 0.5481481481481481</size>
89+
+ <pos>0.2854166666666667 0.1890</pos>
90+
+ <size>0.4291666666666667 0.629166666666667</size>
91+
<lineSpacing>1.375</lineSpacing>
92+
<selectorHeight>0.0740740740740741</selectorHeight>
93+
<selectorOffsetY>0</selectorOffsetY>
94+
diff -u -r famicom-mini-master/layouts/320x240.xml famicom-mini-mod/layouts/320x240.xml
95+
--- famicom-mini-master/layouts/320x240.xml 2017-08-07 02:15:59.000000000 +0300
96+
+++ famicom-mini-mod/layouts/320x240.xml 2023-11-19 20:53:08.112267000 +0200
97+
@@ -10,10 +10,10 @@
98+
<view name="basic, detailed,video">
99+
100+
<textlist name="gamelist">
101+
- <size>0.5722222222222222 0.5481481481481481</size>
102+
- <pos>0.3805555555555556 0.2185185185185185</pos>
103+
+ <size>0.5715 0.6302</size>
104+
+ <pos>0.3807 0.1860</pos>
105+
<lineSpacing>1.395</lineSpacing>
106+
- <selectorHeight>0.0740740740740741</selectorHeight>
107+
+ <selectorHeight>0.0795</selectorHeight>
108+
<selectorOffsetY>0</selectorOffsetY>
109+
<horizontalMargin>0.0166666666666667</horizontalMargin>
110+
</textlist>
111+
diff -u -r famicom-mini-master/layouts/640x480.xml famicom-mini-mod/layouts/640x480.xml
112+
--- famicom-mini-master/layouts/640x480.xml 2017-08-07 02:15:59.000000000 +0300
113+
+++ famicom-mini-mod/layouts/640x480.xml 2023-11-19 20:53:09.551257200 +0200
114+
@@ -10,10 +10,10 @@
115+
<view name="basic, detailed,video">
116+
117+
<textlist name="gamelist">
118+
- <size>0.575 0.5481481481481481</size>
119+
- <pos>0.378 0.2185185185185185</pos>
120+
+ <size>0.5715 0.6302</size>
121+
+ <pos>0.3807 0.1860</pos>
122+
<lineSpacing>1.395</lineSpacing>
123+
- <selectorHeight>0.0740740740740741</selectorHeight>
124+
+ <selectorHeight>0.0795</selectorHeight>
125+
<selectorOffsetY>0</selectorOffsetY>
126+
<horizontalMargin>0.0166666666666667</horizontalMargin>
127+
</textlist>
128+
diff -u -r famicom-mini-master/layouts/800x600.xml famicom-mini-mod/layouts/800x600.xml
129+
--- famicom-mini-master/layouts/800x600.xml 2017-08-07 02:15:59.000000000 +0300
130+
+++ famicom-mini-mod/layouts/800x600.xml 2023-11-19 20:51:45.383240000 +0200
131+
@@ -10,10 +10,10 @@
132+
<view name="basic, detailed,video">
133+
134+
<textlist name="gamelist">
135+
- <size>0.5722222222222222 0.5481481481481481</size>
136+
- <pos>0.3805555555555556 0.2185185185185185</pos>
137+
+ <size>0.5715 0.6302</size>
138+
+ <pos>0.3807 0.1860</pos>
139+
<lineSpacing>1.395</lineSpacing>
140+
- <selectorHeight>0.0740740740740741</selectorHeight>
141+
+ <selectorHeight>0.0795</selectorHeight>
142+
<selectorOffsetY>0</selectorOffsetY>
143+
<horizontalMargin>0.0166666666666667</horizontalMargin>
144+
</textlist>
145+
diff -u -r famicom-mini-master/layouts/ntsc.xml famicom-mini-mod/layouts/ntsc.xml
146+
--- famicom-mini-master/layouts/ntsc.xml 2017-08-07 02:15:59.000000000 +0300
147+
+++ famicom-mini-mod/layouts/ntsc.xml 2023-11-19 20:59:02.098705000 +0200
148+
@@ -10,10 +10,10 @@
149+
<view name="basic, detailed,video">
150+
151+
<textlist name="gamelist">
152+
- <size>0.5722222222222222 0.5481481481481481</size>
153+
- <pos>0.3805555555555556 0.2185185185185185</pos>
154+
+ <size>0.5715 0.630208333333333</size>
155+
+ <pos>0.3807 0.1860</pos>
156+
<lineSpacing>1.395</lineSpacing>
157+
- <selectorHeight>0.0740740740740741</selectorHeight>
158+
+ <selectorHeight>0.0795</selectorHeight>
159+
<selectorOffsetY>0</selectorOffsetY>
160+
<horizontalMargin>0.0166666666666667</horizontalMargin>
161+
</textlist>

‎scriptmodules/supplementary/esthemes/patch-ruckage-nes-mini.diff

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
--- nes-mini/layouts/1024x768.xml Wed May 2 15:18:27 2018
2+
+++ nes-mini/layouts/1024x768.xml Mon Nov 20 16:04:57 2023
3+
@@ -10,8 +10,8 @@
4+
<view name="basic, detailed,video">
5+
6+
<textlist name="gamelist">
7+
- <size>0.544 0.5481481481481481</size>
8+
- <pos>0.3944444444444444 0.2185185185185185</pos>
9+
+ <size>0.5443 0.6302</size>
10+
+ <pos>0.3942 0.1890</pos>
11+
<lineSpacing>1.39</lineSpacing>
12+
<selectorHeight>0.0592592592592593</selectorHeight>
13+
<selectorOffsetY>0.0074074074074074</selectorOffsetY>
14+
--- nes-mini/layouts/1280x720.xml Wed May 2 15:18:27 2018
15+
+++ nes-mini/layouts/1280x720.xml Mon Nov 20 15:56:00 2023
16+
@@ -8,8 +8,8 @@
17+
<view name="basic, detailed,video">
18+
19+
<textlist name="gamelist">
20+
- <pos>0.2958333333333333 0.2185185185185185</pos>
21+
- <size>0.408 0.5481481481481481</size>
22+
+ <size>0.408 0.629166666666667</size>
23+
+ <pos>0.2960 0.1890</pos>
24+
<lineSpacing>1.3975</lineSpacing>
25+
<selectorHeight>0.0592592592592593</selectorHeight>
26+
<selectorOffsetY>0.0074074074074074</selectorOffsetY>
27+
--- nes-mini/layouts/1280x960.xml Wed May 2 15:18:27 2018
28+
+++ nes-mini/layouts/1280x960.xml Mon Nov 20 16:03:07 2023
29+
@@ -10,8 +10,8 @@
30+
<view name="basic, detailed,video">
31+
32+
<textlist name="gamelist">
33+
- <size>0.5444444444444444 0.5481481481481481</size>
34+
- <pos>0.3944444444444444 0.2185185185185185</pos>
35+
+ <size>0.5443 0.6302</size>
36+
+ <pos>0.3942 0.1890</pos>
37+
<lineSpacing>1.396</lineSpacing>
38+
<selectorHeight>0.0592592592592593</selectorHeight>
39+
<selectorOffsetY>0.0074074074074074</selectorOffsetY>
40+
--- nes-mini/layouts/1366x768.xml Wed May 2 15:18:27 2018
41+
+++ nes-mini/layouts/1366x768.xml Mon Nov 20 15:56:46 2023
42+
@@ -8,8 +8,8 @@
43+
<view name="basic, detailed,video">
44+
45+
<textlist name="gamelist">
46+
- <pos>0.2958333333333333 0.2185185185185185</pos>
47+
- <size>0.408 0.5481481481481481</size>
48+
+ <size>0.408 0.629166666666667</size>
49+
+ <pos>0.2960 0.1890</pos>
50+
<lineSpacing>1.39</lineSpacing>
51+
<selectorHeight>0.0592592592592593</selectorHeight>
52+
<selectorOffsetY>0.0074074074074074</selectorOffsetY>
53+
--- nes-mini/layouts/1920x1080.xml Wed May 2 15:18:27 2018
54+
+++ nes-mini/layouts/1920x1080.xml Mon Nov 20 15:57:24 2023
55+
@@ -8,8 +8,8 @@
56+
<view name="basic, detailed,video">
57+
58+
<textlist name="gamelist">
59+
- <pos>0.2958333333333333 0.2185185185185185</pos>
60+
- <size>0.4083333333333333 0.5481481481481481</size>
61+
+ <pos>0.2960 0.1890</pos>
62+
+ <size>0.408 0.629166666666667</size>
63+
<lineSpacing>1.375</lineSpacing>
64+
<selectorHeight>0.0592592592592593</selectorHeight>
65+
<selectorOffsetY>0.0074074074074074</selectorOffsetY>
66+
--- nes-mini/layouts/320x240.xml Wed May 2 15:18:27 2018
67+
+++ nes-mini/layouts/320x240.xml Tue Nov 21 14:08:33 2023
68+
@@ -10,11 +10,11 @@
69+
<view name="basic, detailed,video">
70+
71+
<textlist name="gamelist">
72+
- <size>0.546 0.5481481481481481</size>
73+
- <pos>0.3944444444444444 0.2185185185185185</pos>
74+
+ <size>0.5475 0.6310</size>
75+
+ <pos>0.3935 0.1878</pos>
76+
<lineSpacing>1.395</lineSpacing>
77+
- <selectorHeight>0.064</selectorHeight>
78+
- <selectorOffsetY>0.007</selectorOffsetY>
79+
+ <selectorHeight>0.060</selectorHeight>
80+
+ <selectorOffsetY>0.008</selectorOffsetY>
81+
</textlist>
82+
83+
</view>
84+
--- nes-mini/layouts/640x480.xml Wed May 2 15:18:27 2018
85+
+++ nes-mini/layouts/640x480.xml Tue Nov 21 08:39:50 2023
86+
@@ -10,10 +10,10 @@
87+
<view name="basic, detailed,video">
88+
89+
<textlist name="gamelist">
90+
- <size>0.546 0.5481481481481481</size>
91+
- <pos>0.394 0.2185185185185185</pos>
92+
+ <size>0.5452 0.6310</size>
93+
+ <pos>0.3941 0.1882</pos>
94+
<lineSpacing>1.395</lineSpacing>
95+
- <selectorHeight>0.06</selectorHeight>
96+
+ <selectorHeight>0.0615</selectorHeight>
97+
<selectorOffsetY>0.007</selectorOffsetY>
98+
</textlist>
99+
100+
--- nes-mini/layouts/800x600.xml Wed May 2 15:18:27 2018
101+
+++ nes-mini/layouts/800x600.xml Wed Nov 22 13:54:40 2023
102+
@@ -10,10 +10,10 @@
103+
<view name="basic, detailed,video">
104+
105+
<textlist name="gamelist">
106+
- <size>0.544 0.5481481481481481</size>
107+
- <pos>0.3944444444444444 0.2185185185185185</pos>
108+
+ <size>0.5443 0.6302</size>
109+
+ <pos>0.3954 0.1882</pos>
110+
<lineSpacing>1.4</lineSpacing>
111+
- <selectorHeight>0.06</selectorHeight>
112+
+ <selectorHeight>0.0592</selectorHeight>
113+
<selectorOffsetY>0.0074074074074074</selectorOffsetY>
114+
</textlist>
115+

0 commit comments

Comments
 (0)