SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

Ports: Update RetroArch to 1.22.2

Browse Source
This commit is contained in:
Linus Groh authored and Nico Weber committed 2026-10-15 06:53:41 -04:00
1 parent e844bc9cf1
commit 7a05ced1a6
10 files changed
+87 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Ports/AvailablePorts.md
+1 -1
View File
@@ -292,7 +292,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`r0`](r0/) | r0 (minimalistic commandline hexadecimal editor) | 0.9 | https://github.com/radareorg/r0 |
| [`radare2`](radare2/) | radare2 reverse engineering framework | 5.7.6 | https://github.com/radareorg/radare2 |
| [`readline`](readline/) | GNU Readline Library | 8.3 | https://tiswww.case.edu/php/chet/readline/rltop.html |
| [`RetroArch`](RetroArch/) | RetroArch | 1.19.1 | https://www.retroarch.com |
| [`RetroArch`](RetroArch/) | RetroArch | 1.22.2 | https://www.retroarch.com |
| [`RISCVEmu`](RISCVEmu/) | A Basic C++ RISC-V Emulator | ad8ad6a | https://github.com/IdanHo/RISCVEmu |
| [`rizin`](rizin/) | Rizin | 0.9.0-dev.515+20769ea | https://rizin.re/ |
| [`rsync`](rsync/) | rsync | 3.5.1 | https://rsync.samba.org/ |
Ports/RetroArch/package.sh
+4 -3
View File
@@ -1,10 +1,9 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=RetroArch
useconfigure="true"
version="1.19.1"
archive_hash="504a3a8a6e5861eb43a61be8339f61183e7ea940c1ff68ac2a2f57d35c67f8ff"
version="1.22.2"
files=(
"https://github.com/libretro/${port}/archive/refs/tags/v${version}.tar.gz#$archive_hash"
"https://github.com/libretro/${port}/archive/refs/tags/v${version}.tar.gz#245ef18c8fa8fbd9fbb5eb25cf43e17c6aace2f95c1ed99873cbd794012bb232"
)
depends=("freetype" "SDL2" "zlib")
@@ -26,6 +25,8 @@ launcher_command=/usr/local/bin/retroarch
icon_file=media/retroarch.ico
export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2"
# We don't have '<arch>-serenity-pkg-config', so just use the "normal" one.
export PKG_CONF_PATH='pkg-config'
post_install() {
echo "==== Post installation instructions ===="
Ports/RetroArch/patches/0002-Add-strlcat.patch
-24
View File
@@ -1,24 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: gouchi <[email protected]>
Date: Sat, 7 May 2022 18:20:35 +0200
Subject: [PATCH] Add strlcat()
---
Makefile.common | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile.common b/Makefile.common
index 2a715f4786a2714f32cb127691e6ed1a390b5188..3b0b4ca0b8f63d3ab79938005934df178e9c446f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -184,6 +184,10 @@ ifneq ($(findstring Linux,$(OS)),)
HAVE_UNIX = 1
endif
+ifneq ($(findstring SerenityOS,$(OS)),)
+ OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_strl.o
+endif
+
ifeq ($(HAVE_UNIX), 1)
OBJ += frontend/drivers/platform_unix.o
Ports/RetroArch/patches/0002-Check-strlcat-for-HAVE_STRL.patch
+23
View File
@@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Linus Groh <[email protected]>
Date: Thu, 15 Oct 2026 00:29:47 +0200
Subject: [PATCH] Check strlcat() for HAVE_STRL
We have strlcpy() but not strlcat().
---
qb/config.libs.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index d5315b83acc963b62d7298416e5118ba7c0e4776..27a405c3fccc4979ef2bd955210accb2c97ec1e6 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -586,7 +586,7 @@ check_header '' PARPORT linux/parport.h
check_header '' PARPORT linux/ppdev.h
if [ "$OS" != 'Win32' ] && [ "$OS" != 'Linux' ]; then
- check_lib '' STRL "$CLIB" strlcpy
+ check_lib '' STRL "$CLIB" strlcat
fi
check_lib '' STRCASESTR "$CLIB" strcasestr
Ports/RetroArch/patches/0003-Disable-pthread_attr_setschedpolicy.patch
+1 -1
View File
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable pthread_attr_setschedpolicy()
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libretro-common/rthreads/rthreads.c b/libretro-common/rthreads/rthreads.c
index 2a748edd53a19304de81faade4bd28e3014df713..2660345dfb76688922c1300630d603f90d9164cd 100644
index 224d30088cd21cfe6e8e293b8638870c4f4cdc92..ed55233a523dcfd25903f7f8317180519d6b62e4 100644
--- a/libretro-common/rthreads/rthreads.c
+++ b/libretro-common/rthreads/rthreads.c
@@ -158,7 +158,7 @@ sthread_t *sthread_create(void (*thread_func)(void*), void *userdata)
Ports/RetroArch/patches/0004-Use-SDL-software-instead-of-hardware-rendering.patch
+1 -1
View File
@@ -8,7 +8,7 @@ Subject: [PATCH] Use SDL software instead of hardware rendering
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 9168a0e77d38f2f6dda991a6f15df294ceba4ba5..4f11b7a3e727f4d632c0dd77ef67c719b740c637 100644
index d33a762921d4ec43d163c5364258f66e37899f4e..9085ac8ceab32286c646baea43a635bf2518df3f 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -186,7 +186,7 @@ static void sdl2_render_msg(sdl2_video_t *vid, const char *msg)
Ports/RetroArch/patches/0005-Set-default-options-for-SerenityOS.patch
+4 -4
View File
@@ -16,17 +16,17 @@ Set some config paths to home directory
create mode 100644 pkg/serenityos/retroarch.cfg
diff --git a/Makefile b/Makefile
index c0c3a6c1d3f6351235a1cdc0afa0e17b1328465b..f7ab2104baa8a41b4243d685acb76d75dc3518c4 100644
index e17bb145f3df2781253559352a4be24e42baab40..8981cb9238ebf35f00e311698c5ec951c5495286 100644
--- a/Makefile
+++ b/Makefile
@@ -238,7 +238,7 @@ install: $(TARGET)
@@ -265,7 +265,7 @@ install: $(TARGET)
mkdir -p $(DESTDIR)$(DATA_DIR)/pixmaps 2>/dev/null || /bin/true
cp $(TARGET) $(DESTDIR)$(BIN_DIR)
cp tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
- cp retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
+ cp pkg/serenityos/retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
cp com.libretro.RetroArch.appdata.xml $(DESTDIR)$(DATA_DIR)/metainfo
cp org.libretro.RetroArch.desktop $(DESTDIR)$(DATA_DIR)/applications
cp com.libretro.RetroArch.metainfo.xml $(DESTDIR)$(DATA_DIR)/metainfo
cp com.libretro.RetroArch.desktop $(DESTDIR)$(DATA_DIR)/applications
cp docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
diff --git a/pkg/serenityos/retroarch.cfg b/pkg/serenityos/retroarch.cfg
new file mode 100644
Ports/RetroArch/patches/0006-Enable-unix-platform.patch
+11 -9
View File
@@ -5,24 +5,26 @@ Subject: [PATCH] Enable unix platform
This will make arguments from shell (like `--help`) work
---
Makefile.common | 1 +
Makefile.common | 3 +++
frontend/frontend_driver.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile.common b/Makefile.common
index 3b0b4ca0b8f63d3ab79938005934df178e9c446f..7a6da1658a4a80da8733e9229a2dbd7393b6fdc0 100644
index 57dabf5eac07efae17758161b3f5605eb8d46ca6..8f96234844711ff1b31411d1c53a7011c7cf843e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -186,6 +186,7 @@ endif
ifneq ($(findstring SerenityOS,$(OS)),)
OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_strl.o
+ HAVE_UNIX = 1
@@ -186,6 +186,9 @@ ifneq ($(findstring Linux,$(OS)),)
HAVE_UNIX = 1
endif
+ifneq ($(findstring SerenityOS,$(OS)),)
+ HAVE_UNIX = 1
+endif
ifeq ($(HAVE_UNIX), 1)
OBJ += frontend/drivers/platform_unix.o
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 047d14218e229c65b365a2af68354ba9af61f251..01e2a5e500f4b575059ac9329b7344d7876b7dbf 100644
index 65463857960124c7fe025ec8f358384825f5ec7e..cca68ad39bcbe5c928a60ea427a8705518ef32a9 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -98,7 +98,7 @@ static frontend_ctx_driver_t *frontend_ctx_drivers[] = {
Ports/RetroArch/patches/0007-Add-missing-alloca.h-includes.patch
+34
View File
@@ -0,0 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Linus Groh <[email protected]>
Date: Thu, 15 Oct 2026 00:31:04 +0200
Subject: [PATCH] Add missing alloca.h includes
---
deps/stb/stb_vorbis.h | 1 +
libretro-db/rmsgpack_dom.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/deps/stb/stb_vorbis.h b/deps/stb/stb_vorbis.h
index f53f1dd47b016e05bb5be43cf725a65f5e28a0cc..5986d25013f2d3b6450376f543d0363b26636f4c 100644
--- a/deps/stb/stb_vorbis.h
+++ b/deps/stb/stb_vorbis.h
@@ -1,6 +1,7 @@
#ifndef STB_VORBIS_INCLUDE_STB_VORBIS_H
#define STB_VORBIS_INCLUDE_STB_VORBIS_H
+#include <alloca.h>
#include <assert.h>
#ifdef __cplusplus
diff --git a/libretro-db/rmsgpack_dom.c b/libretro-db/rmsgpack_dom.c
index 316c47cf9cdaaf5be4a648ebeebefa800e844266..0196a61383d72c35154cb03a33429101d7a00015 100644
--- a/libretro-db/rmsgpack_dom.c
+++ b/libretro-db/rmsgpack_dom.c
@@ -24,6 +24,7 @@
#include <stdint.h>
#include <stdio.h>
+#include <alloca.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
Ports/RetroArch/patches/ReadMe.md
+8 -2
View File
@@ -5,10 +5,11 @@
Add SerenityOS platform
## `0002-Add-strlcat.patch`
## `0002-Check-strlcat-for-HAVE_STRL.patch`
Add strlcat()
Check strlcat() for HAVE_STRL
We have strlcpy() but not strlcat().
## `0003-Disable-pthread_attr_setschedpolicy.patch`
@@ -37,3 +38,8 @@ Enable unix platform
This will make arguments from shell (like `--help`) work
## `0007-Add-missing-alloca.h-includes.patch`
Add missing alloca.h includes