mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 05:07:35 +00:00
Ports: Remove LibGL workarounds
Now that ports can find our OpenGL headers and shared library, remove all configuration and patches that was previously needed to make ports compile with LibGL.
This commit is contained in:
parent
857ab2e06d
commit
b2eaed43e9
24 changed files with 48 additions and 157 deletions
|
@ -25,7 +25,7 @@ launcher_category='&Games'
|
|||
launcher_command=/usr/local/bin/retroarch
|
||||
icon_file=media/retroarch.ico
|
||||
|
||||
export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/include/LibGL -I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2"
|
||||
export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2"
|
||||
|
||||
post_install() {
|
||||
echo "==== Post installation instructions ===="
|
||||
|
|
|
@ -8,7 +8,7 @@ Subject: [PATCH] Add SerenityOS platform
|
|||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qb/qb.system.sh b/qb/qb.system.sh
|
||||
index c7ac141..f7f198d 100644
|
||||
index c7ac14110bafc0c1715a5b02fc933dc7c45dc449..f7f198dc9c290d5c46079cedd13c5cbb42bb678b 100644
|
||||
--- a/qb/qb.system.sh
|
||||
+++ b/qb/qb.system.sh
|
||||
@@ -1,5 +1,5 @@
|
||||
|
|
|
@ -8,7 +8,7 @@ Subject: [PATCH] Add strlcat()
|
|||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Makefile.common b/Makefile.common
|
||||
index 580beba..dbfbd39 100644
|
||||
index 40c3ad2d5a077dc8f84932506d4253c7d98e326f..f2d6bcf526a1c7d3aba90bdd4ef6cd1ebc3ca91c 100644
|
||||
--- a/Makefile.common
|
||||
+++ b/Makefile.common
|
||||
@@ -186,6 +186,10 @@ ifneq ($(findstring Linux,$(OS)),)
|
|
@ -1,22 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: gouchi <gouchi@free.fr>
|
||||
Date: Sat, 7 May 2022 18:20:09 +0200
|
||||
Subject: [PATCH] Find libgl
|
||||
|
||||
---
|
||||
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 19cd2a6..672fb02 100644
|
||||
--- a/qb/config.libs.sh
|
||||
+++ b/qb/config.libs.sh
|
||||
@@ -402,7 +402,7 @@ if [ "$HAVE_OPENGL" != 'no' ] && [ "$HAVE_OPENGLES" != 'yes' ]; then
|
||||
check_lib '' OPENGL -lopengl32
|
||||
else
|
||||
check_header '' OPENGL "GL/gl.h"
|
||||
- check_lib '' OPENGL -lGL
|
||||
+ check_lib '' OPENGL -lgl
|
||||
fi
|
||||
|
||||
if [ "$HAVE_OPENGL" = 'yes' ]; then
|
|
@ -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 30ec6ff..08c8a96 100644
|
||||
index b611a3e443148f1471d3de7aa6f11b4a62e9ba4a..76800cbdaedf31fcc409456b69ae366a58026163 100644
|
||||
--- a/libretro-common/rthreads/rthreads.c
|
||||
+++ b/libretro-common/rthreads/rthreads.c
|
||||
@@ -161,7 +161,7 @@ sthread_t *sthread_create(void (*thread_func)(void*), void *userdata)
|
|
@ -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 4dbe33f..dd67b4a 100644
|
||||
index 4dbe33f446815aa212daf0dbb58c3d2e183e88ec..dd67b4aaec550cf375ea3da088363e266dc5aa31 100644
|
||||
--- a/gfx/drivers/sdl2_gfx.c
|
||||
+++ b/gfx/drivers/sdl2_gfx.c
|
||||
@@ -182,7 +182,7 @@ static void sdl2_render_msg(sdl2_video_t *vid, const char *msg)
|
|
@ -16,7 +16,7 @@ Set some config paths to home directory
|
|||
create mode 100644 pkg/serenityos/retroarch.cfg
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 63c7eda..2aed29f 100644
|
||||
index 63c7eda4aa9ac2acf7ec7dfe9c04fcd5d8919a74..2aed29f89cf3709186fcd7c13400e34f1c90c299 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -235,7 +235,7 @@ install: $(TARGET)
|
||||
|
@ -30,7 +30,7 @@ index 63c7eda..2aed29f 100644
|
|||
cp docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
|
||||
diff --git a/pkg/serenityos/retroarch.cfg b/pkg/serenityos/retroarch.cfg
|
||||
new file mode 100644
|
||||
index 0000000..088e883
|
||||
index 0000000000000000000000000000000000000000..3fc7d7ac0fbb3330e5a359593ae3acfc88112540
|
||||
--- /dev/null
|
||||
+++ b/pkg/serenityos/retroarch.cfg
|
||||
@@ -0,0 +1,1021 @@
|
|
@ -5,27 +5,22 @@
|
|||
Add SerenityOS platform
|
||||
|
||||
|
||||
## `0002-Find-libgl.patch`
|
||||
|
||||
Find libgl
|
||||
|
||||
|
||||
## `0003-Add-strlcat.patch`
|
||||
## `0002-Add-strlcat.patch`
|
||||
|
||||
Add strlcat()
|
||||
|
||||
|
||||
## `0004-Disable-pthread_attr_setschedpolicy.patch`
|
||||
## `0003-Disable-pthread_attr_setschedpolicy.patch`
|
||||
|
||||
Disable pthread_attr_setschedpolicy()
|
||||
|
||||
|
||||
## `0005-Use-SDL-software-instead-of-hardware-rendering.patch`
|
||||
## `0004-Use-SDL-software-instead-of-hardware-rendering.patch`
|
||||
|
||||
Use SDL software instead of hardware rendering
|
||||
|
||||
|
||||
## `0006-Set-default-options-for-SerenityOS.patch`
|
||||
## `0005-Set-default-options-for-SerenityOS.patch`
|
||||
|
||||
Set default options for SerenityOS
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue