mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 12:07:45 +00:00
Ports: Update angband to 4.2.4
This commit is contained in:
Tim Schumacher
Linus Groh
parent
654075ab48
commit
b884c5746d
5 changed files with 66 additions and 86 deletions
|
|
@ -5,7 +5,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
|
||||||
| Port | Name | Version | Website |
|
| Port | Name | Version | Website |
|
||||||
|----------------------------------------|-----------------------------------------------------------------|--------------------------|--------------------------------------------------------------------------------|
|
|----------------------------------------|-----------------------------------------------------------------|--------------------------|--------------------------------------------------------------------------------|
|
||||||
| [`Another-World`](Another-World/) | Another World Bytecode Interpreter | | https://github.com/fabiensanglard/Another-World-Bytecode-Interpreter |
|
| [`Another-World`](Another-World/) | Another World Bytecode Interpreter | | https://github.com/fabiensanglard/Another-World-Bytecode-Interpreter |
|
||||||
| [`angband`](angband/) | Angband | 4.2.3 | https://rephial.org |
|
| [`angband`](angband/) | Angband | 4.2.4 | https://rephial.org |
|
||||||
| [`bash`](bash/) | GNU Bash | 5.1.16 | https://www.gnu.org/software/bash/ |
|
| [`bash`](bash/) | GNU Bash | 5.1.16 | https://www.gnu.org/software/bash/ |
|
||||||
| [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games |
|
| [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games |
|
||||||
| [`bc`](bc/) | bc | 5.1.1 | https://github.com/gavinhoward/bc |
|
| [`bc`](bc/) | bc | 5.1.1 | https://github.com/gavinhoward/bc |
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
#!/usr/bin/env -S bash ../.port_include.sh
|
#!/usr/bin/env -S bash ../.port_include.sh
|
||||||
port=angband
|
port=angband
|
||||||
version=4.2.3
|
version=4.2.4
|
||||||
workdir="Angband-${version}"
|
workdir="Angband-${version}"
|
||||||
useconfigure=true
|
useconfigure=true
|
||||||
use_fresh_config_sub=true
|
use_fresh_config_sub=true
|
||||||
files="https://github.com/angband/angband/releases/download/${version}/Angband-${version}.tar.gz Angband-${version}.tar.gz 833c4f8cff2aee61ad015f9346fceaa4a8c739fe2dbe5bd1acd580c91818e6bb"
|
files="https://github.com/angband/angband/releases/download/${version}/Angband-${version}.tar.gz Angband-${version}.tar.gz a07c78c1dd05e48ddbe4d8ef5d1880fcdeab55fd05f1336d9cba5dd110b15ff3"
|
||||||
auth_type=sha256
|
auth_type=sha256
|
||||||
depends=("ncurses" "SDL2" "SDL2_image" "SDL2_ttf" "SDL2_mixer")
|
depends=("ncurses" "SDL2" "SDL2_image" "SDL2_ttf" "SDL2_mixer")
|
||||||
configopts=(
|
configopts=(
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
# Patches for angband
|
# Patches for angband
|
||||||
|
|
||||||
## `use-sdl2-config.patch`
|
|
||||||
|
|
||||||
Replaces uses of the system `sdl2-config` with the one from serenity.
|
|
||||||
|
|
||||||
## `disable-accelerated-rendering.patch`
|
## `disable-accelerated-rendering.patch`
|
||||||
|
|
||||||
Disable SDL2 hardware acceleration as we do not support that.
|
Disable SDL2 hardware acceleration as we do not support that.
|
||||||
|
|
||||||
|
## `fix-sdl-prefix-handling.patch`
|
||||||
|
|
||||||
|
Fix up some copy-paste and logic mistakes in the configure script that
|
||||||
|
prevent us from setting a prefix for the SDL installation.
|
||||||
|
|
|
||||||
59
Ports/angband/patches/fix-sdl-prefix-handling.patch
Normal file
59
Ports/angband/patches/fix-sdl-prefix-handling.patch
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
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 @@
|
||||||
|
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 @@
|
||||||
|
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 @@
|
||||||
|
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 @@
|
||||||
|
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
|
||||||
|
|
@ -1,79 +0,0 @@
|
||||||
diff -ur a/configure b/configure
|
|
||||||
--- a/configure 2021-08-01 01:29:22.000000000 +0200
|
|
||||||
+++ b/configure 2021-10-31 20:28:51.932716113 +0100
|
|
||||||
@@ -6046,7 +6046,7 @@
|
|
||||||
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"
|
|
||||||
@@ -6200,9 +6200,9 @@
|
|
||||||
else
|
|
||||||
hold_CPPFLAGS="${CPPFLAGS}"
|
|
||||||
hold_LIBS="${LIBS}"
|
|
||||||
- SDL2_CFLAGS=`sdl2-config --cflags`
|
|
||||||
+ SDL2_CFLAGS=`${SDL2_CONFIG} ${sdl2_args} --cflags`
|
|
||||||
CPPFLAGS="${CPPFLAGS} ${SDL2_CFLAGS}"
|
|
||||||
- SDL2_LIBS=`sdl2-config --libs`
|
|
||||||
+ SDL2_LIBS=`${SDL2_CONFIG} ${sdl2_args} --libs`
|
|
||||||
LIBS="${LIBS} ${SDL2_LIBS}"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_LoadPNG_RW in -lSDL2_image" >&5
|
|
||||||
$as_echo_n "checking for IMG_LoadPNG_RW in -lSDL2_image... " >&6; }
|
|
||||||
@@ -6389,14 +6389,14 @@
|
|
||||||
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 | \
|
|
||||||
+ 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 | \
|
|
||||||
+ 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"
|
|
||||||
@@ -6550,9 +6550,9 @@
|
|
||||||
else
|
|
||||||
hold_CPPFLAGS="${CPPFLAGS}"
|
|
||||||
hold_LIBS="${LIBS}"
|
|
||||||
- SDL_CFLAGS=`sdl-config --cflags`
|
|
||||||
+ SDL_CFLAGS=`${SDL_CONFIG} ${sdl_args} --cflags`
|
|
||||||
CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
|
|
||||||
- SDL_LIBS=`sdl-config --libs`
|
|
||||||
+ SDL_LIBS=`${SDL_CONFIG} ${sdl_args} --libs`
|
|
||||||
LIBS="${LIBS} ${SDL_LIBS}"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_LoadPNG_RW in -lSDL_image" >&5
|
|
||||||
$as_echo_n "checking for IMG_LoadPNG_RW in -lSDL_image... " >&6; }
|
|
||||||
@@ -6674,8 +6674,8 @@
|
|
||||||
hold_CPPFLAGS="${CPPFLAGS}"
|
|
||||||
hold_LIBS="${LIBS}"
|
|
||||||
if test "$with_sdl2" != "yes"; then
|
|
||||||
- SDL2_CFLAGS=`sdl2-config --cflags`
|
|
||||||
- SDL2_LIBS=`sdl2-config --libs`
|
|
||||||
+ SDL2_CFLAGS=`${SDL2_CONFIG} ${sdl2_args} --cflags`
|
|
||||||
+ SDL2_LIBS=`${SDL2_CONFIG} ${sdl2_args} --libs`
|
|
||||||
CPPFLAGS="${CPPFLAGS} ${SDL2_CFLAGS}"
|
|
||||||
LIBS="${LIBS} ${SDL2_LIBS}"
|
|
||||||
fi
|
|
||||||
@@ -6741,9 +6741,9 @@
|
|
||||||
hold_CPPFLAGS="${CPPFLAGS}"
|
|
||||||
hold_LIBS="${LIBS}"
|
|
||||||
if test "$with_sdl" != "yes"; then
|
|
||||||
- SDL_CFLAGS=`sdl-config --cflags`
|
|
||||||
+ SDL_CFLAGS=`${SDL_CONFIG} ${sdl_args} --cflags`
|
|
||||||
CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
|
|
||||||
- SDL_LIBS=`sdl-config --libs`
|
|
||||||
+ SDL_LIBS=`${SDL_CONFIG} ${sdl_args} --libs`
|
|
||||||
LIBS="${LIBS} ${SDL_LIBS}"
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mix_OpenAudio in -lSDL_mixer" >&5
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue