diff options
Diffstat (limited to 'games/bzflag/patches/patch-ad')
| -rw-r--r-- | games/bzflag/patches/patch-ad | 77 |
1 files changed, 21 insertions, 56 deletions
diff --git a/games/bzflag/patches/patch-ad b/games/bzflag/patches/patch-ad index 401c58a4300..9855c3782f6 100644 --- a/games/bzflag/patches/patch-ad +++ b/games/bzflag/patches/patch-ad @@ -1,57 +1,22 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/09/24 12:49:12 blymn Exp $ +$NetBSD: patch-ad,v 1.2 2003/12/13 10:32:53 xtraeme Exp $ ---- src/platform/NetBSDDisplay.h.orig Sun Sep 22 22:29:02 2002 -+++ src/platform/NetBSDDisplay.h -@@ -0,0 +1,52 @@ -+/* bzflag -+ * Copyright (c) 1993 - 2002 Tim Riker -+ * -+ * This package is free software; you can redistribute it and/or -+ * modify it under the terms of the license found in the file -+ * named LICENSE that should have accompanied this file. -+ * -+ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ */ -+ -+/* NetBSDDisplay: -+ * An X display with XFree86 vidmode extension -+ */ -+ -+#ifndef BZF_NETBSDDISPLAY_H -+#define BZF_NETBSDDISPLAY_H -+ -+#include "XDisplay.h" -+#if defined(XF86VIDMODE_EXT) -+#define USE_XF86VIDMODE_EXT -+#define private c_private -+#include <X11/extensions/xf86vmode.h> -+#undef private -+#endif -+ -+class NetBSDDisplayMode : public XDisplayMode { -+ public: -+#if defined(USE_XF86VIDMODE_EXT) -+ NetBSDDisplayMode(); -+ ~NetBSDDisplayMode(); -+ -+ ResInfo** init(XDisplay* owner, int& num, int& current); -+ boolean set(int); -+ boolean setDefault(int); -+ -+ private: -+ boolean doSet(int, boolean position); -+ -+ private: -+ XDisplay* display; -+ int numResolutions; -+ int lastResolution; -+ XF86VidModeModeInfo** resolutions; -+ int origNumResolutions; -+ XF86VidModeModeInfo** origResolutions; -+#endif -+}; -+ -+#endif // BZF_NETBSDDISPLAY_H -+// ex: shiftwidth=2 tabstop=8 +--- configure.orig Tue Dec 9 17:08:21 2003 ++++ configure Thu Dec 11 00:55:53 2003 +@@ -2515,7 +2515,7 @@ + fi + + +-LDFLAGS=$X_LIBS ++LDFLAGS="$X_LIBS $LDFLAGS" + case $host_os in + solaris*) + GLIBS="-lresolv -laudio $GLIBS"; +@@ -2724,7 +2724,7 @@ + + # avoid using X11 in BeOS + if test $host_os != beos; then +- CPPFLAGS= ++ CPPFLAGS="$X_CFLAGS $CPPFLAGS" + if test x$no_x = x; then + GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS" + fi |