1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 01:17:35 +00:00

Ports: Update angband's patches to use git patches

This commit is contained in:
Ali Mohammad Pur 2022-05-16 19:21:28 +04:30 committed by Ali Mohammad Pur
parent cbd76e0531
commit 0880542d99
3 changed files with 50 additions and 16 deletions

View file

@ -1,7 +1,18 @@
diff -ur a/src/main-sdl2.c b/src/main-sdl2.c
--- a/src/main-sdl2.c 2021-08-01 01:29:20.000000000 +0200
+++ b/src/main-sdl2.c 2021-10-31 20:38:37.012720467 +0100
@@ -4863,7 +4863,7 @@
From 03f7c6e9c77b5084fd5a2b32b3c6f13c152a52b5 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sun, 17 Oct 2021 15:44:23 +0200
Subject: [PATCH 1/2] Disable hardware acceleration
We don't support this, so disable it.
---
src/main-sdl2.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main-sdl2.c b/src/main-sdl2.c
index a678c29..51a343c 100644
--- a/src/main-sdl2.c
+++ b/src/main-sdl2.c
@@ -4867,7 +4867,7 @@ static void start_window(struct window *window)
if (window->config == NULL) {
window->renderer = SDL_CreateRenderer(window->window,
@ -10,7 +21,7 @@ diff -ur a/src/main-sdl2.c b/src/main-sdl2.c
} else {
/* this is necessary for subwindows to have their own textures */
window->config->renderer_flags |= SDL_RENDERER_TARGETTEXTURE;
@@ -5875,9 +5875,7 @@
@@ -5894,9 +5894,7 @@ static enum parser_error config_window_renderer(struct parser *parser)
WINDOW_INIT_OK;
const char *type = parser_getsym(parser, "type");
@ -21,3 +32,6 @@ diff -ur a/src/main-sdl2.c b/src/main-sdl2.c
window->config->renderer_flags = SDL_RENDERER_SOFTWARE;
} else {
return PARSE_ERROR_INVALID_VALUE;
--
2.36.1

View file

@ -1,7 +1,19 @@
diff -ur a/configure b/configure
--- a/configure 2022-02-21 23:23:13.000000000 +0100
+++ b/configure 2022-04-06 02:12:48.027633543 +0200
@@ -5863,14 +5863,14 @@
From dce25b95be530cb0d9c650fc93de34ac94161ee3 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Wed, 6 Apr 2022 02:25:34 +0200
Subject: [PATCH 2/2] Fix up SDL path handling
Fix up some copy-paste and logic mistakes in the configure script that
prevent us from setting a prefix for the SDL installation.
---
configure | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index c56ed42..d6e8e85 100755
--- a/configure
+++ b/configure
@@ -5863,14 +5863,14 @@ $as_echo_n "checking for SDL2 - version >= $min_sdl2_version... " >&6; }
if test "$SDL2_CONFIG" = "no" ; then
no_sdl2=yes
else
@ -19,7 +31,7 @@ diff -ur a/configure b/configure
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
if test "x$enable_sdl2test" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
@@ -6024,9 +6024,7 @@
@@ -6024,9 +6024,7 @@ rm -f core conftest.err conftest.$ac_objext \
if test "$SDL2_CONFIG" != "no"; then
hold_CPPFLAGS="${CPPFLAGS}"
hold_LIBS="${LIBS}"
@ -29,7 +41,7 @@ diff -ur a/configure b/configure
LIBS="${LIBS} ${SDL2_LIBS}"
if test "$enable_sdl2" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_LoadPNG_RW in -lSDL2_image" >&5
@@ -6278,14 +6276,14 @@
@@ -6278,14 +6276,14 @@ $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
else
@ -47,7 +59,7 @@ diff -ur a/configure b/configure
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
if test "x$enable_sdltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
@@ -6439,9 +6437,7 @@
@@ -6439,9 +6437,7 @@ rm -f core conftest.err conftest.$ac_objext \
if test "$SDL_CONFIG" != "no"; then
hold_CPPFLAGS="${CPPFLAGS}"
hold_LIBS="${LIBS}"
@ -57,3 +69,6 @@ diff -ur a/configure b/configure
LIBS="${LIBS} ${SDL_LIBS}"
if test "$enable_sdl" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_LoadPNG_RW in -lSDL_image" >&5
--
2.36.1

View file

@ -1,10 +1,15 @@
# Patches for angband
# Patches for angband on SerenityOS
## `disable-accelerated-rendering.patch`
## `0001-Disable-hardware-acceleration.patch`
Disable SDL2 hardware acceleration as we do not support that.
Disable hardware acceleration
## `fix-sdl-prefix-handling.patch`
We don't support this, so disable it.
## `0002-Fix-up-SDL-path-handling.patch`
Fix up SDL path handling
Fix up some copy-paste and logic mistakes in the configure script that
prevent us from setting a prefix for the SDL installation.