Bugfix update to warzone2100-2.3.7.
From Brad. Tested by me.
This commit is contained in:
parent
bbd348b237
commit
ad6e122328
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2011/01/13 09:36:35 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2011/03/13 10:26:26 dcoppa Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= i386
|
||||
|
||||
COMMENT= 3D realtime strategy on a future earth
|
||||
|
||||
DISTNAME= warzone2100-2.3.6
|
||||
REVISION= 1
|
||||
DISTNAME= warzone2100-2.3.7
|
||||
CATEGORIES= games
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
|
||||
|
||||
@ -38,7 +37,8 @@ RUN_DEPENDS= devel/desktop-file-utils
|
||||
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE= autoconf
|
||||
AUTOCONF_VERSION= 2.61
|
||||
# Should be 2.65
|
||||
AUTOCONF_VERSION= 2.64
|
||||
CONFIGURE_ARGS+= --with-distributor="OpenBSD"
|
||||
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include/libpng \
|
||||
-I${LOCALBASE}/include" \
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (warzone2100-2.3.6.tar.gz) = 8ByaHkft7b4MLGQaIgBbMA==
|
||||
RMD160 (warzone2100-2.3.6.tar.gz) = +hrEJ9LKzbjryeMOfAc9b0oj9lY=
|
||||
SHA1 (warzone2100-2.3.6.tar.gz) = WvurdGscI6lWPpPJVFdutxDi+4o=
|
||||
SHA256 (warzone2100-2.3.6.tar.gz) = nvk5j/CA3atYrJj/JCbI6NIxkawid2d6LnaiiwHGLCg=
|
||||
SIZE (warzone2100-2.3.6.tar.gz) = 54088640
|
||||
MD5 (warzone2100-2.3.7.tar.gz) = Z8K7UG/Fkzbrgw/1AwN0XQ==
|
||||
RMD160 (warzone2100-2.3.7.tar.gz) = fQmeb0RM6uFSFZkPA+odmER1BlU=
|
||||
SHA1 (warzone2100-2.3.7.tar.gz) = YADn154WcaqSN8wB2BANoOdTgIw=
|
||||
SHA256 (warzone2100-2.3.7.tar.gz) = RqyaHJ3PBGtt+6haQZJ4qNsI6P0ps4U8CIkCqbAc+5Q=
|
||||
SIZE (warzone2100-2.3.7.tar.gz) = 54089321
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1 2010/12/05 16:14:16 dcoppa Exp $
|
||||
--- configure.ac.orig Sun Nov 28 14:38:58 2010
|
||||
+++ configure.ac Mon Nov 29 19:08:56 2010
|
||||
@@ -371,9 +371,6 @@ fi
|
||||
$OpenBSD: patch-configure_ac,v 1.2 2011/03/13 10:26:26 dcoppa Exp $
|
||||
--- configure.ac.orig Fri Jan 21 15:52:00 2011
|
||||
+++ configure.ac Sat Jan 29 21:18:41 2011
|
||||
@@ -372,9 +372,6 @@ fi
|
||||
|
||||
# Checks for libraries:
|
||||
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2010/12/05 16:14:16 dcoppa Exp $
|
||||
# When (cross-)compiling for Windows (MinGW) we need to link in iberty for Popt
|
||||
# and the Dr. MinGW derived exception handler.
|
||||
if test "x$host_os_mingw32" = "xyes" ; then
|
||||
@@ -413,7 +410,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
|
||||
@@ -414,7 +411,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
|
||||
|
||||
# Look for PhysicsFS
|
||||
AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
|
||||
|
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-lib_exceptionhandler_exceptionhandler_c,v 1.1 2010/12/05 16:14:16 dcoppa Exp $
|
||||
--- lib/exceptionhandler/exceptionhandler.c.orig Sun Nov 28 14:39:00 2010
|
||||
+++ lib/exceptionhandler/exceptionhandler.c Wed Dec 1 22:03:05 2010
|
||||
@@ -122,10 +122,12 @@ static LONG WINAPI windowsExceptionHandler(PEXCEPTION_
|
||||
# include <sys/stat.h>
|
||||
# include <sys/wait.h>
|
||||
# include <sys/utsname.h>
|
||||
+#ifdef WZ_OS_LINUX
|
||||
# include <sys/prctl.h>
|
||||
#ifndef PR_SET_PTRACER
|
||||
# define PR_SET_PTRACER 0x59616d61 // prctl will ignore unknown options
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
// GNU extension for backtrace():
|
||||
# if defined(__GLIBC__)
|
||||
@@ -492,8 +494,10 @@ static pid_t execGdb(int const dumpFile, int* gdbWrite
|
||||
// Check to see if we're the parent
|
||||
if (pid != 0)
|
||||
{
|
||||
+#ifdef WZ_OS_LINUX
|
||||
// Allow tracing the process, some hardened kernel configurations disallow this.
|
||||
prctl(PR_SET_PTRACER, pid, 0, 0, 0);
|
||||
+#endif
|
||||
|
||||
// Return the write end of the pipe
|
||||
*gdbWritePipe = gdbPipe[1];
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-lib_sequence_sequence_c,v 1.1 2010/12/05 16:14:16 dcoppa Exp $
|
||||
--- lib/sequence/sequence.c.orig Mon Nov 22 14:43:44 2010
|
||||
+++ lib/sequence/sequence.c Mon Nov 22 14:44:10 2010
|
||||
@@ -758,7 +758,7 @@ bool seq_Update()
|
||||
$OpenBSD: patch-lib_sequence_sequence_c,v 1.2 2011/03/13 10:26:26 dcoppa Exp $
|
||||
--- lib/sequence/sequence.c.orig Fri Jan 21 15:52:01 2011
|
||||
+++ lib/sequence/sequence.c Sat Jan 29 21:18:37 2011
|
||||
@@ -756,7 +756,7 @@ bool seq_Update()
|
||||
{
|
||||
for (j = 0; j < videodata.vi.channels; j++)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user