srb2: update to 2.2.10

This commit is contained in:
oreo639 2022-03-06 17:54:03 -08:00 committed by Duncan Overbruck
parent f7295c0151
commit 7aedb433ba
3 changed files with 26 additions and 19 deletions

View file

@ -0,0 +1,19 @@
diff -Naur comptime.sh comptime.sh.new
--- a/SRB2-SRB2_release_2.2.10/comptime.sh 2022-03-06 13:52:43.000000000 -0800
+++ b/SRB2-SRB2_release_2.2.10/comptime.sh 2022-03-06 17:05:02.725041025 -0800
@@ -40,13 +40,14 @@
const char* compbranch = "Unknown";
const char* comprevision = "illegal";
EOF
+exit 0
}
compversion() {
touch $path/comptime.c
-versionfake
test -d $path/.svn && versionsvn
test -d $path/../.git && versiongit
+versionfake
exit 1
}

View file

@ -1,12 +0,0 @@
diff -Naur SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg SRB2-SRB2_release_2.2.9.orig/src/sdl/MakeNIX.cfg
--- a/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-07 00:06:51.901546000 -0700
+++ b/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-06 19:38:24.000000000 -0700
@@ -22,7 +22,7 @@
OPTS=-DUNIXCOMMON
#LDFLAGS = -L/usr/local/lib
+ LIBS+=-lm
- LIBS=-lm
ifdef LINUX
LIBS+=-lrt
ifdef NOTERMIOS

View file

@ -1,7 +1,7 @@
# Template file for 'srb2' # Template file for 'srb2'
pkgname=srb2 pkgname=srb2
version=2.2.9 version=2.2.10
revision=2 revision=1
create_wrksrc=true create_wrksrc=true
build_wrksrc="SRB2-SRB2_release_${version}" build_wrksrc="SRB2-SRB2_release_${version}"
build_style=gnu-makefile build_style=gnu-makefile
@ -16,8 +16,8 @@ license="GPL-2.0-or-later"
homepage="https://srb2.org/" homepage="https://srb2.org/"
distfiles="https://github.com/STJr/SRB2/archive/SRB2_release_${version}.tar.gz distfiles="https://github.com/STJr/SRB2/archive/SRB2_release_${version}.tar.gz
https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${version//./}-Full.zip" https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${version//./}-Full.zip"
checksum="5f7eeb08e90323e28cdcb02ad25c904eef25ce75316720609b995a1e4ffd154a checksum="feb3a95a15ea04218282e5c4f01ae3733672e14d219e2792dcfc500dcf89a3c2
48e644604bed81b5ce6b12ef23a2f4042d0118d0ba70f18c534dfe86ebe6f37d" e69ac5cacc86f85eeaba14644a37cad932f7d7031b667892d2f9ba9bfb437d25"
restricted=yes restricted=yes
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
@ -28,7 +28,7 @@ esac
if [ "$XBPS_TARGET_LIBC" = musl ]; then if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel" makedepends+=" libexecinfo-devel"
export LIBS="-lexecinfo" export LDFLAGS="-lexecinfo"
fi fi
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
@ -36,7 +36,7 @@ if [ -n "$CROSS_BUILD" ]; then
fi fi
do_install() { do_install() {
vbin bin/Linux/Release/${pkgname} vbin bin/${pkgname}
PROGRAM_NAME="${pkgname}" PROGRAM_DESCRIPTION="${short_desc}" \ PROGRAM_NAME="${pkgname}" PROGRAM_DESCRIPTION="${short_desc}" \
PACKAGE_INSTALL_PATH="/usr/bin" PROGRAM_FILENAME="${pkgname}" \ PACKAGE_INSTALL_PATH="/usr/bin" PROGRAM_FILENAME="${pkgname}" \
@ -45,7 +45,7 @@ do_install() {
vinstall srb2.png 644 /usr/share/pixmaps/ vinstall srb2.png 644 /usr/share/pixmaps/
vinstall srb2.desktop 644 /usr/share/applications/ vinstall srb2.desktop 644 /usr/share/applications/
vmkdir /usr/share/games/SRB2 vmkdir /usr/share/games/SRB2
for f in {music,player}.dta {srb2,zones,patch,patch_music}.pk3 models models.dat; do for f in {music,player}.dta {srb2,zones}.pk3 models models.dat; do
vcopy ../${f} /usr/share/games/SRB2 vcopy ../${f} /usr/share/games/SRB2
done done
} }