mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-01 11:15:37 +00:00
Ports/angband: Update to Angband 4.2.5
This commit is contained in:
Tim Schumacher
Andreas Kling
parent
5c744a9fb0
commit
fd157b9a71
|
|
@ -10,7 +10,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
|
|||
| [`aclock`](aclock/) | aclock | 2.3 | https://github.com/tenox7/aclock |
|
||||
| [`acpica-tools`](acpica-tools/) | ACPI Component Architecture Project Userspace Utilities | R06_28_23 | https://github.com/acpica/acpica |
|
||||
| [`alpine`](alpine/) | Alpine Email Client | 2.26 | https://alpineapp.email |
|
||||
| [`angband`](angband/) | Angband | 4.2.4 | https://rephial.org |
|
||||
| [`angband`](angband/) | Angband | 4.2.5 | https://rephial.org |
|
||||
| [`Another-World`](Another-World/) | Another World Bytecode Interpreter | | https://github.com/fabiensanglard/Another-World-Bytecode-Interpreter |
|
||||
| [`aria2`](aria2/) | aria2 | 1.36.0 | https://aria2.github.io |
|
||||
| [`awk`](awk/) | The One True Awk | 20220122 | https://github.com/onetrueawk/awk |
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
#!/usr/bin/env -S bash ../.port_include.sh
|
||||
port=angband
|
||||
version=4.2.4
|
||||
port='angband'
|
||||
version='4.2.5'
|
||||
workdir="Angband-${version}"
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
useconfigure='true'
|
||||
files=(
|
||||
"https://github.com/angband/angband/releases/download/${version}/Angband-${version}.tar.gz#a07c78c1dd05e48ddbe4d8ef5d1880fcdeab55fd05f1336d9cba5dd110b15ff3"
|
||||
"https://github.com/angband/angband/releases/download/${version}/Angband-${version}.tar.gz#c4cacbdf28f726fcb1a0b30b8763100fb06f88dbb570e955232e41d83e0718a6"
|
||||
)
|
||||
depends=(
|
||||
'ncurses'
|
||||
'SDL2'
|
||||
'SDL2_image'
|
||||
'SDL2_mixer'
|
||||
'SDL2_ttf'
|
||||
)
|
||||
depends=("ncurses" "SDL2" "SDL2_image" "SDL2_ttf" "SDL2_mixer")
|
||||
configopts=(
|
||||
"--prefix=/usr/local"
|
||||
"--bindir=/usr/local/bin"
|
||||
"--disable-x11"
|
||||
"--enable-curses"
|
||||
"--enable-sdl2"
|
||||
"--enable-sdl2-mixer"
|
||||
'--prefix=/usr/local'
|
||||
'--bindir=/usr/local/bin'
|
||||
'--disable-x11'
|
||||
'--enable-curses'
|
||||
'--enable-sdl2'
|
||||
'--enable-sdl2-mixer'
|
||||
"--with-ncurses-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
|
||||
"--with-sdl2-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
|
||||
"CFLAGS=--sysroot=${SERENITY_INSTALL_ROOT} -I${SERENITY_INSTALL_ROOT}/usr/local/include/ncursesw"
|
||||
"LIBS=-lncursesw"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ We don't support this, so disable it.
|
|||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/main-sdl2.c b/src/main-sdl2.c
|
||||
index a678c29..51a343c 100644
|
||||
index e3dd1c791cb2f78adf1d29ad7c26b2a91873750d..3356ff22481bcae78653940aa97f954bd811e3ee 100644
|
||||
--- a/src/main-sdl2.c
|
||||
+++ b/src/main-sdl2.c
|
||||
@@ -4867,7 +4867,7 @@ static void start_window(struct window *window)
|
||||
@@ -5298,7 +5298,7 @@ static void start_window(struct window *window)
|
||||
|
||||
if (window->config == NULL) {
|
||||
window->renderer = SDL_CreateRenderer(window->window,
|
||||
|
|
@ -21,7 +21,7 @@ index a678c29..51a343c 100644
|
|||
} else {
|
||||
/* this is necessary for subwindows to have their own textures */
|
||||
window->config->renderer_flags |= SDL_RENDERER_TARGETTEXTURE;
|
||||
@@ -5894,9 +5894,7 @@ static enum parser_error config_window_renderer(struct parser *parser)
|
||||
@@ -6386,9 +6386,7 @@ static enum parser_error config_window_renderer(struct parser *parser)
|
||||
WINDOW_INIT_OK;
|
||||
const char *type = parser_getsym(parser, "type");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Schumacher <timschumi@gmx.de>
|
||||
Date: Wed, 6 Apr 2022 02:25:34 +0200
|
||||
Subject: [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.
|
||||
---
|
||||
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
|
||||
- SDL2_CFLAGS=`$SDL2_CONFIG $sdl2conf_args --cflags`
|
||||
- SDL2_LIBS=`$SDL2_CONFIG $sdl2conf_args --libs`
|
||||
+ SDL2_CFLAGS=`$SDL2_CONFIG $sdl2_args --cflags`
|
||||
+ SDL2_LIBS=`$SDL2_CONFIG $sdl2_args --libs`
|
||||
|
||||
sdl2_major_version=`$SDL2_CONFIG $sdl2_args --version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
sdl2_minor_version=`$SDL2_CONFIG $sdl2_args --version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
||||
- sdl2_micro_version=`$SDL2_CONFIG $sdl2_config_args --version | \
|
||||
+ sdl2_micro_version=`$SDL2_CONFIG $sdl2_args --version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
||||
if test "x$enable_sdl2test" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
@@ -6024,9 +6024,7 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
if test "$SDL2_CONFIG" != "no"; then
|
||||
hold_CPPFLAGS="${CPPFLAGS}"
|
||||
hold_LIBS="${LIBS}"
|
||||
- SDL2_CFLAGS=`${SDL2_CONFIG} --cflags`
|
||||
CPPFLAGS="${CPPFLAGS} ${SDL2_CFLAGS}"
|
||||
- SDL2_LIBS=`${SDL2_CONFIG} --libs`
|
||||
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 @@ $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
|
||||
if test "$SDL_CONFIG" = "no" ; then
|
||||
no_sdl=yes
|
||||
else
|
||||
- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
|
||||
- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
|
||||
+ SDL_CFLAGS=`$SDL_CONFIG $sdl_args --cflags`
|
||||
+ SDL_LIBS=`$SDL_CONFIG $sdl_args --libs`
|
||||
|
||||
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
||||
- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
|
||||
+ sdl_micro_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
||||
if test "x$enable_sdltest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
@@ -6439,9 +6437,7 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
if test "$SDL_CONFIG" != "no"; then
|
||||
hold_CPPFLAGS="${CPPFLAGS}"
|
||||
hold_LIBS="${LIBS}"
|
||||
- SDL_CFLAGS=`${SDL_CONFIG} --cflags`
|
||||
CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
|
||||
- SDL_LIBS=`${SDL_CONFIG} --libs`
|
||||
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
|
||||
|
|
@ -6,10 +6,3 @@ Disable hardware acceleration
|
|||
|
||||
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.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user