mirror of
https://github.com/RGBCube/serenity
synced 2025-07-29 10:37:34 +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
|
@ -10,7 +10,6 @@ depends=("libpng" "glu" "SDL_sound" "sdl12-compat" "zlib")
|
|||
configopts=(
|
||||
"--disable-warn"
|
||||
"--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
|
||||
"CPPFLAGS=-I${SERENITY_INSTALL_ROOT}/usr/include/LibGL"
|
||||
"LIBS=-lm -lSDL_sound"
|
||||
)
|
||||
launcher_name='GLTron'
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jelle Raaijmakers <jelle@gmta.nl>
|
||||
Date: Mon, 9 May 2022 00:30:04 +0200
|
||||
Subject: [PATCH] Build: Replace `-lGL` with `-lgl` to reference our LibGL
|
||||
|
||||
---
|
||||
configure | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 226d00eb04f048a51cfbc742ccfe62cfb7ad6750..086139a0e045fe6ad914fc641625fc281ca630e7 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3130,7 +3130,7 @@ if test "${ac_cv_lib_GL_main+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lGL $LIBS"
|
||||
+LIBS="-lgl $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 3135 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -3171,7 +3171,7 @@ if test $ac_cv_lib_GL_main = yes; then
|
||||
#define HAVE_LIBGL 1
|
||||
EOF
|
||||
|
||||
- LIBS="-lGL $LIBS"
|
||||
+ LIBS="-lgl $LIBS"
|
||||
|
||||
else
|
||||
{ { echo "$as_me:3177: error: OpenGL is not installed" >&5
|
|
@ -1,23 +1,18 @@
|
|||
# Patches for gltron on SerenityOS
|
||||
|
||||
## `0001-Build-Replace-lGL-with-lgl-to-reference-our-LibGL.patch`
|
||||
|
||||
Build: Replace `-lGL` with `-lgl` to reference our LibGL
|
||||
|
||||
|
||||
## `0002-Build-Remove-ansi-build-argument.patch`
|
||||
## `0001-Build-Remove-ansi-build-argument.patch`
|
||||
|
||||
Build: Remove `-ansi` build argument
|
||||
|
||||
|
||||
## `0003-Build-Fix-char-vs.-const-char-arguments.patch`
|
||||
## `0002-Build-Fix-char-vs.-const-char-arguments.patch`
|
||||
|
||||
Build: Fix `char*` vs. `const char*` arguments
|
||||
|
||||
These arguments are of the wrong constness, which will trip our
|
||||
compiler.
|
||||
|
||||
## `0004-System-Make-sure-to-exit-the-loop-on-receiving-SDL_Q.patch`
|
||||
## `0003-System-Make-sure-to-exit-the-loop-on-receiving-SDL_Q.patch`
|
||||
|
||||
System: Make sure to exit the loop on receiving SDL_QUIT
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue