1
0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 11:20:46 +00:00

Ports: Remove gltron patch for glext.h

This is no longer necessary since we have resolved most conflicts with
SDL2's version of the GL constants.
This commit is contained in:
Jelle Raaijmakers 2023-01-04 00:00:16 +01:00 committed by Tim Flynn
parent c2b3a7a524
commit 215d68baf6
5 changed files with 4 additions and 39 deletions

View File

@ -8,7 +8,7 @@ Subject: [PATCH] Build: Replace `-lGL` with `-lgl` to reference our LibGL
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 226d00e..086139a 100755
index 226d00eb04f048a51cfbc742ccfe62cfb7ad6750..086139a0e045fe6ad914fc641625fc281ca630e7 100755
--- a/configure
+++ b/configure
@@ -3130,7 +3130,7 @@ if test "${ac_cv_lib_GL_main+set}" = set; then

View File

@ -9,7 +9,7 @@ Subject: [PATCH] Build: Remove `-ansi` build argument
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lua/src/Makefile.in b/lua/src/Makefile.in
index 22ee463..fa110ef 100644
index 22ee463cb777b50411a67b06612b277f7e570148..fa110efab1f7c0de1ca618221f2c29fc879e70d5 100644
--- a/lua/src/Makefile.in
+++ b/lua/src/Makefile.in
@@ -84,7 +84,7 @@ noinst_LIBRARIES = liblua.a
@ -22,7 +22,7 @@ index 22ee463..fa110ef 100644
LIBS = -lm
diff --git a/lua/src/lib/Makefile.in b/lua/src/lib/Makefile.in
index e2f256f..d2f4040 100644
index e2f256fca4e459bea5f4e551be6994e406a6b497..d2f4040302215d15b711aa000e092d1f2ab782ef 100644
--- a/lua/src/lib/Makefile.in
+++ b/lua/src/lib/Makefile.in
@@ -82,7 +82,7 @@ noinst_LIBRARIES = liblualib.a

View File

@ -10,7 +10,7 @@ compiler.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nebu/include/scripting/nebu_scripting.h b/nebu/include/scripting/nebu_scripting.h
index 867eada..f5d8084 100644
index 867eada85698197845f1bf500211f88fba286601..f5d80848390c13aa879cfa60127a5b140deb73d0 100644
--- a/nebu/include/scripting/nebu_scripting.h
+++ b/nebu/include/scripting/nebu_scripting.h
@@ -18,9 +18,9 @@ extern int scripting_GetStringResult(char **s);

View File

@ -1,26 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Grigoris Pavlakis <grigpavl@ece.auth.gr>
Date: Mon, 13 Jun 2022 16:04:43 +0300
Subject: [PATCH] Build: Disable nebu using SDL's glext.h constants
SerenityOS provides glext.h definitions inside GL/gl.h, but the
build process thinks that glext.h doesn't exist, therefore it attempts
to use SDL's definitions, which leads to a conflict. Therefore, disable
use of said definitions.
---
nebu/include/video/nebu_renderer_gl.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/nebu/include/video/nebu_renderer_gl.h b/nebu/include/video/nebu_renderer_gl.h
index 64bf0a4..b74e3db 100644
--- a/nebu/include/video/nebu_renderer_gl.h
+++ b/nebu/include/video/nebu_renderer_gl.h
@@ -1,6 +1,8 @@
#ifndef NEBU_RENDERER_GL_H
#define NEBU_RENDERER_GL_H
+#define NO_SDL_GLEXT
+
#include "SDL_opengl.h"
#include <stdio.h>
#include "video/nebu_quad.h"

View File

@ -17,12 +17,3 @@ Build: Fix `char*` vs. `const char*` arguments
These arguments are of the wrong constness, which will trip our
compiler.
## `0004-Build-Disable-nebu-using-SDL-s-glext.h-constants.patch`
Build: Disable nebu using SDL's glext.h constants
SerenityOS provides glext.h definitions inside GL/gl.h, but the
build process thinks that glext.h doesn't exist, therefore it attempts
to use SDL's definitions, which leads to a conflict. Therefore, disable
use of said definitions.