From 8358124887a9526b2ff05f85171dc7004b489d4d Mon Sep 17 00:00:00 2001 From: kenmays Date: Tue, 22 Nov 2022 09:36:31 -0800 Subject: [PATCH] bzflag: bump to 2.4.26 (#7470) * bzflag: bump to 2.4.26 * bzflag: bump to 2.4.26 * Delete bzflag-2.4.22.patchset * Delete bzflag-2.4.22.recipe * bzflag: updated patchset * bzflag: refreshed recipe --- ...lag-2.4.22.recipe => bzflag-2.4.26.recipe} | 30 ++++++----- ...2.4.22.patchset => bzflag-2.4.26.patchset} | 51 ++++++++++++------- 2 files changed, 50 insertions(+), 31 deletions(-) rename games-action/bzflag/{bzflag-2.4.22.recipe => bzflag-2.4.26.recipe} (74%) rename games-action/bzflag/patches/{bzflag-2.4.22.patchset => bzflag-2.4.26.patchset} (72%) diff --git a/games-action/bzflag/bzflag-2.4.22.recipe b/games-action/bzflag/bzflag-2.4.26.recipe similarity index 74% rename from games-action/bzflag/bzflag-2.4.22.recipe rename to games-action/bzflag/bzflag-2.4.26.recipe index 956778bca..7f16c0280 100644 --- a/games-action/bzflag/bzflag-2.4.22.recipe +++ b/games-action/bzflag/bzflag-2.4.26.recipe @@ -5,11 +5,11 @@ Linux, BSD, and other platforms. It was one of the most popular games ever on \ Silicon Graphics machines and continues to be developed and improved to this \ day." HOMEPAGE="https://www.bzflag.org/" -COPYRIGHT="1993-2021 Tim Riker" +COPYRIGHT="1993-2022 Tim Riker" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.bzflag.org/bzflag/source/$portVersion/bzflag-$portVersion.tar.bz2" -CHECKSUM_SHA256="9e64653302b657bd8b5f96fe1150a9ff80a1d53a6d7e8a35138c6b1b02006a4d" +CHECKSUM_SHA256="01830405ff26ad1dc595a7e0695c824c2786e678868d9ff822aeb14ac7481014" PATCHES="bzflag-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -26,6 +26,7 @@ fi PROVIDES=" bzflag$secondaryArchSuffix = $portVersion cmd:bzadmin$commandSuffix + cmd:bzflag$commandSuffix cmd:bzfs$commandSuffix " REQUIRES=" @@ -35,6 +36,10 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:libnghttp2$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + lib:libglu$secondaryArchSuffix + lib:libglew$secondaryArchSuffix + lib:libsdl2_2.0$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -44,15 +49,16 @@ BUILD_REQUIRES=" devel:libcares$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libcurl$secondaryArchSuffix + devel:libgl$secondaryArchSuffix + devel:libglu$secondaryArchSuffix + devel:libglew$secondaryArchSuffix devel:libncurses$secondaryArchSuffix + devel:libsdl2_2.0$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:autoheader + cmd:autoreconf cmd:gawk cmd:g++$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix @@ -61,14 +67,14 @@ BUILD_PREREQUIRES=" BUILD() { - libtoolize --force --copy --install - aclocal -I m4 - autoconf - automake --add-missing - runConfigure --omit-dirs "binDir libDir" ./configure \ + autoreconf -vfi + runConfigure --omit-dirs "binDir libDir" ./configure \ --bindir=$commandBinDir \ --libdir=$libDir/bzflag \ - --enable-robots + --enable-bzadmin \ + --enable-client \ + --enable-robots \ + --with-SDL=2 make $jobArgs } diff --git a/games-action/bzflag/patches/bzflag-2.4.22.patchset b/games-action/bzflag/patches/bzflag-2.4.26.patchset similarity index 72% rename from games-action/bzflag/patches/bzflag-2.4.22.patchset rename to games-action/bzflag/patches/bzflag-2.4.26.patchset index fe06499d1..dc40aeadb 100644 --- a/games-action/bzflag/patches/bzflag-2.4.22.patchset +++ b/games-action/bzflag/patches/bzflag-2.4.26.patchset @@ -1,13 +1,11 @@ -From 6b8d3751ad90f51336bf867485d98affe9bdd158 Mon Sep 17 00:00:00 2001 +From 9111dee8c3c17e8bb43a3d2cd1e52cfda63e1e53 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 3 Jul 2016 21:49:57 +0000 Subject: Haiku fixes for BZFlag 2.4 -* Look for regcomp in libroot instead of libc. -* Haiku also has libmedia, libgame and libbe. diff --git a/configure.ac b/configure.ac -index 48b45d6..d14c165 100644 +index 5d77858..ed5b28a 100644 --- a/configure.ac +++ b/configure.ac @@ -320,7 +320,7 @@ fi @@ -19,7 +17,7 @@ index 48b45d6..d14c165 100644 [AC_CHECK_LIB(regex, regcomp, LIBREGEX="-lregex", [AC_CHECK_LIB(compat, regcomp, LIBREGEX="-lcompat", AC_MSG_ERROR([working regex library was not found]))] )] -@@ -362,6 +362,7 @@ AC_CHECK_LIB(m, sqrtf) +@@ -363,6 +363,7 @@ AC_CHECK_LIB(m, sqrtf) # for BeOS - old network stack don't have those libs ( move it in the case switch ?) AC_CHECK_LIB([socket], [socket]) AC_CHECK_LIB([socket], [gethostent], [], AC_CHECK_LIB([bind], [gethostent])) @@ -27,7 +25,7 @@ index 48b45d6..d14c165 100644 # see if pthreads are in libc_r (as on FreeBSD) or libpthread AC_CHECK_LIB([c_r], [pthread_create], LIBPTHREAD="-lc_r", -@@ -538,7 +539,7 @@ case $host_os in +@@ -539,7 +540,7 @@ case $host_os in irix*) GLIBS="-lXsgivc -lX11 -laudio $GLIBS" ;; @@ -36,7 +34,7 @@ index 48b45d6..d14c165 100644 GLIBS=" -lmedia -lgame $GLIBS" LIBS="-lbe" ;; -@@ -552,7 +553,7 @@ esac +@@ -553,7 +554,7 @@ esac # avoid using X11 in BeOS and Mac OS X case $host_os in @@ -45,24 +43,39 @@ index 48b45d6..d14c165 100644 ;; darwin*) ;; -@@ -906,7 +907,7 @@ BZ_CONFIGURE_STAGE([services], [8 of 9]) - # need to consolidate them to here. - - case $host_os in -- beos*) -+ beos*|haiku*) - beos=true - ;; - darwin*) -- -2.30.2 +2.37.3 -From f4c981a1a49598f25f0f33af0163f80af985bd5d Mon Sep 17 00:00:00 2001 +From 680b4f464dc184e2b59643d1c9ce10e94755dcf6 Mon Sep 17 00:00:00 2001 +From: Ken Mays +Date: Sat, 19 Nov 2022 04:13:24 +0000 +Subject: Fix BZFlag 2.4 client build on Haiku + + +diff --git a/configure.ac b/configure.ac +index ed5b28a..5a03dc4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -922,7 +922,7 @@ case $host_os in + irix*) + irix=true + ;; +- linux*|kfreebsd*|freebsd*|netbsd*|openbsd*|dragonfly*|gnu*) ++ linux*|kfreebsd*|freebsd*|netbsd*|openbsd*|dragonfly*|gnu*|haiku*) + linux=true + ;; + solaris*) +-- +2.37.3 + + +From a043cf6133c1c2e02dfb041e76aee14dbdc01624 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 9 Jun 2015 15:21:49 +0200 Subject: more Haiku fixes + diff --git a/include/network.h b/include/network.h index 4ef4c77..c512cc1 100644 --- a/include/network.h @@ -90,5 +103,5 @@ index e0c30a7..014671e 100644 #endif #if !defined(_WIN32) -- -2.30.2 +2.37.3