Ticket #708: bzflag-2.4.2.patch

configure.ac

@@ -54 +54 @@
     libdir="$libdir/bzflag"
 fi
 
-AC_CONFIG_AUX_DIR(misc)
+AC_CONFIG_AUX_DIR(m4)
 
 # sed magic to get version numbers from src/date/buildDate.cxx
 MAJOR_VERSION=`sed -e 's/#.*define.*BZ_MAJOR_VERSION[^0-9]*\(.*\)/\1/' -e t -e d < \$srcdir/src/date/buildDate.cxx`
@@ -166 +166 @@
 # compile our own curl
 AC_ARG_ENABLE(curl_build, [  --enable-curl-build     Force compilation of curl])
 
-# compile our own glew
-AC_ARG_WITH(included-glew,
-        AC_HELP_STRING([--with-included-glew],[build with included GLEW library]),
-        [enable_glew_build="$withval"], )
-
 # compile our own regex
 AC_ARG_ENABLE(regex_build, [  --enable-regex-build    Force compilation of regex])
 
@@ -184 +179 @@
 if test "x$enable_all_builds" = "xyes" ; then
     enable_ares_build=yes
     enable_curl_build=yes
-    enable_glew_build=yes
     enable_regex_build=yes
     enable_zlib_build=yes
 fi
@@ -476 +470 @@
     irix*)
         GLIBS="-lXsgivc -lX11 -laudio $GLIBS"
         ;;
-    beos)
+    beos*|haiku*)
         GLIBS=" -lmedia -lgame $GLIBS"
         LIBS="-lbe"
         ;;
@@ -491 +485 @@
 case $host_os in
     macos|darwin*)
         ;;
-    beos*)
+    beos*|haiku*)
         ;;
     *)
         CONF_CPPFLAGS="$CONF_CPPFLAGS $X_CFLAGS"
@@ -730 +724 @@
         fi
         CONF_CFLAGS="$CONF_CFLAGS $FLAGS";
         CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS";;
-     beos*)
+     beos*|haiku*)
         AC_DEFINE(HAVE_DEFINED_TOLOWER, 1, [tolower and toupper are not functions])
         ;;
 esac
@@ -831 +825 @@
 # need to consolidate them to here.
 
 case $host_os in
-    beos*)
+    beos*|haiku*)
         beos=true
         ;;
     hpux*)
@@ -1033 +1027 @@
     CONF_CPPFLAGS="$CONF_CPPFLAGS -I\$(top_srcdir)/src/other/curl/include"
 fi
 
-
-# GLEW
-if test "x$enable_client" != "xno" ; then
-# Check for the GLEW library (GL Extension Wrangler)
-if test "x$enable_glew_build" != "xyes" ; then
-    AC_MSG_CHECKING([for GLEW library])
-    tmpLIBS=$LIBS
-    GLEW_LIBS="-lGLEW"
-    LIBS=$GLEW_LIBS
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <GL/glew.h>]],
-                                    [[if (GLEW_VERSION_3_0) { glewInit(); }]])],
-                   [glew_check="yes"],
-                   [glew_check="no  (missing, or older than version 1.5.1)"])
-    if test "x$glew_check" != "xyes"; then
-        GLEW_LIBS=""
-    fi
-    AC_MSG_RESULT([$glew_check])
-    AC_SUBST(GLEW_LIBS)
-    LIBS=$tmpLIBS
-fi
-AC_MSG_CHECKING(whether to build the included GLEW library)
-BUILD_GLEW="no (using system)"
-if test "x$GLEW_LIBS" = "x" ; then
-    if test "x$enable_glew_build" = xno ; then
-        BUILD_GLEW=no
-    else
-        BUILD_GLEW="yes"
-        CONF_CPPFLAGS="$CONF_CPPFLAGS -I\$(top_srcdir)/src/other/glew/include"
-    fi
-fi
-AC_MSG_RESULT($BUILD_GLEW)
-else # enable_client
-BUILD_GLEW="no (clients disabled)"
-AC_MSG_NOTICE([GLEW is disabled because no clients are being built])
-fi # enable_client
-AM_CONDITIONAL(BUILD_GLEW, test "x$BUILD_GLEW" = "xyes")
-if test "x$BUILD_GLEW" = xyes -o "x$glew_check" = xyes; then
-    AC_DEFINE(HAVE_GLEW, 1, [Using GLEW])
-fi
-
 # make sure ECHO and ECHO_N got defined and substituted
 if test "x$ECHO" = "x" ; then
     ECHO=echo
@@ -1318 +1272 @@
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Build ares ........: $BUILD_ARES])
 AC_MSG_RESULT([Build curl ........: $BUILD_CURL])
-AC_MSG_RESULT([Build glew ........: $BUILD_GLEW])
 AC_MSG_RESULT([Build regex .......: $BUILD_REGEX])
 AC_MSG_RESULT([Build zlib ........: $BUILD_ZLIB])
 AC_MSG_RESULT([])

Makefile.in

@@ -149 +149 @@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FRAMEWORK_OPENGL = @FRAMEWORK_OPENGL@
-GLEW_LIBS = @GLEW_LIBS@
 GLIBS = @GLIBS@
 GREP = @GREP@
 HASPOD2MAN = @HASPOD2MAN@

src/bzadmin/StdBothUI.cxx

@@ -22 +22 @@
 #else
 #  include <sys/types.h>
 #  include <sys/select.h>
+// for memset, used in FD_ZERO (this is a Haiku bug, select.h should include string.h):
+#  include <string.h>
 #endif
 
 /* implementation headers */

src/bzflag/clientCommands.cxx

@@ -18 +18 @@
 #  include <sys/types.h>
 #  include <dirent.h>
 #endif
+#ifdef HAVE_PTHREADS
+#  include <pthread.h>
+#endif
 #include <string>
 #include <vector>
 

src/bzflag/Makefile.am

@@ -185 +185 @@
         stars.h
 
 
-if BUILD_GLEW
-bzflag_SOURCES += $(top_srcdir)/src/other/glew/src/glew.c
-endif
-
 if WIN32
 RESOURCE = bzflag.res
 else
@@ -219 +215 @@
         $(SDL_LIBS)                     \
         $(SDL_IMAGE_LIBS)               \
         $(GLIBS)                        \
-        $(GLEW_LIBS)                    \
         $(LIBCURL)                      \
         ../date/libDate.la
 # This is required to hook in ogg/vorbis libraries

src/bzflag/ServerLink.cxx

@@ -480 +480 @@
   if ((urecvfd >= 0) /* && ulinkup */) {
 
     if (!udpLength) {
-      AddrLen recvlen = sizeof(urecvaddr);
+      socklen_t recvlen = sizeof(urecvaddr);
       int n = recvfrom(urecvfd, ubuf, MaxPacketLen, 0,
                        &urecvaddr, (socklen_t*) &recvlen);
       if (n > 0) {

src/bzfs/bzfs.cxx

@@ -858 +858 @@
     }
 
     // fixup ping reply
-    AddrLen addrLen = sizeof(addr);
+    socklen_t addrLen = sizeof(addr);
     if (getsockname(wksSocket, (struct sockaddr*)&addr, &addrLen) >= 0)
       pingReply.serverId.port = addr.sin_port;
 
@@ -1171 +1171 @@
   // client (not a player yet) is requesting service.
   // accept incoming connection on our well known port
   struct sockaddr_in clientAddr;
-  AddrLen addr_len = sizeof(clientAddr);
+  socklen_t addr_len = sizeof(clientAddr);
   int fd = accept(wksSocket, (struct sockaddr*)&clientAddr, &addr_len);
   if (fd == -1) {
     nerror("accepting on wks");

src/common/TimeKeeper.cxx

@@ -20 +20 @@
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
-#ifdef __BEOS__
+#if defined __BEOS__ || defined __HAIKU__
 #  include <OS.h>
 #endif
 #if !defined(_WIN32)

src/game/NetHandler.cxx

@@ -125 +125 @@
 
 int NetHandler::udpReceive(char *buffer, struct sockaddr_in *uaddr,
                            bool &udpLinkRequest) {
-  AddrLen recvlen = sizeof(*uaddr);
+  socklen_t recvlen = sizeof(*uaddr);
   int n;
   int id;
   uint16_t len;

src/ogl/OpenGLGState.cxx

@@ -1575 +1575 @@
 #else
 #  ifdef HAVE_CGLGETCURRENTCONTEXT
 #    define GET_CURRENT_CONTEXT CGLGetCurrentContext
-#  elif defined(__BEOS__)
+#  elif defined(__BEOS__) || defined(__HAIKU__)
 // no way to do that, and you shouldn't have to anyway!
 #    define GET_CURRENT_CONTEXT() 1
 #  else

src/other/ares/configure.ac

@@ -231 +231 @@
                ])
 fi
 
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  AC_MSG_CHECKING([for gethostbyname with network lib])
+  AC_CHECK_LIB(network, gethostbyname,
+               [HAVE_GETHOSTBYNAME="1"
+               LIBS="$LIBS -lnetwork"
+               ])
+fi
+
 dnl At least one system has been identified to require BOTH nsl and socket
 dnl libs at the same time to link properly.
 if test "$HAVE_GETHOSTBYNAME" != "1"

src/other/curl/acinclude.m4

@@ -2211 +2211 @@
   AC_MSG_CHECKING([for connect in libraries])
   tst_connect_save_LIBS="$LIBS"
   tst_connect_need_LIBS="unknown"
-  for tst_lib in '' '-lsocket' ; do
+  for tst_lib in '' '-lsocket' '-lnetwork' ; do
     if test "$tst_connect_need_LIBS" = "unknown"; then
       LIBS="$tst_lib $tst_connect_save_LIBS"
       AC_LINK_IFELSE([

src/other/Makefile.am

@@ -30 +30 @@
 
 # include the files for subconfigured packages as needed left out of the dist
 EXTRA_DIST = \
-        PDCurses \
-        glew
+        PDCurses
 
 MAINTAINERCLEANFILES = \
         Makefile.in \

src/platform/BeOSWindow.cxx

@@ -22 +22 @@
 #include <View.h>
 #include <WindowScreen.h> // for set_mouse_position()
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include "BeOSDisplay.h"
 #include "BeOSWindow.h"
@@ -86 +87 @@
 /****** MyGLView implementation ******/
 
 MyGLView::MyGLView(MyGLWindow *win, BRect rect, char *name)
-  : BGLView(rect, name, B_FOLLOW_NONE, 0, BGL_RGB | BGL_DEPTH | BGL_DOUBLE)
+  : BGLView(rect, const_cast<const char*>(name), B_FOLLOW_NONE, 0, BGL_RGB | BGL_DEPTH | BGL_DOUBLE)
 {
   this->win = win;
 }

src/platform/BeOSWindow.h

@@ -22 +22 @@
 
 class BeOSDisplay;
 class BeOSVisual;
-#ifdef BEOS_USE_GL2
+// we need this forward declaration
 class MyGLWindow;
-#endif
 class BView;
 
 class BeOSWindow : public BzfWindow {