- Update to version 1.9.

10 files changed, 86 insertions, 119 deletions

diff --git a/games/ezquake/files/patch-Makefile b/games/ezquake/files/patch-Makefile
index 4a52f6ea8804..0a277a1d1a30 100644
--- a/games/ezquake/files/patch-Makefile
+++ b/games/ezquake/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Jan  4 11:28:34 2008
-+++ Makefile	Fri Jan  4 11:29:06 2008
+--- Makefile.orig	2008-04-27 17:51:52.000000000 -0300
++++ Makefile	2008-04-29 22:27:42.000000000 -0300
 @@ -6,7 +6,7 @@
  
  # compilation tool and detection of targets/achitecture
@@ -21,13 +21,13 @@
 -	ARCH_CFLAGS = -march=i686 -mtune=generic -mmmx -Did386
 -endif
 -ifeq ($(ARCH),ppc)
--	ARCH_CFLAGS = -arch i686 -arch ppc -msse2
+-	ARCH_CFLAGS = -arch ppc -faltivec -maltivec -mcpu=7450 -mtune=7450 -mpowerpc -mpowerpc-gfxopt
 -endif
 -
  ifeq ($(OS),linux)
  	DEFAULT_TARGET = glx
  	OS_GL_CFLAGS = -DWITH_DGA -DWITH_EVDEV -DWITH_VMODE
-@@ -53,19 +42,19 @@
+@@ -55,19 +44,19 @@
  # Directories for object files #
  ################################
  
@@ -52,15 +52,22 @@
 +X11_TARGET = $(TYPE)/ezquake.x11
 +SVGA_TARGET = $(TYPE)/ezquake.svga
 +MAC_TARGET = $(TYPE)/ezquake-gl.mac
+ QUAKE_DIR="/opt/quake/"
  
  ################
+@@ -89,7 +78,8 @@
+ # -DWITH_MPD       for mpd       MP3 player support
+ # -DWITH_WINAMP    for winamp    MP3 player support
+ PRJ_CFLAGS = -DWITH_ZLIB -DWITH_PNG -DEMBED_TCL -DJSS_CAM -DWITH_ZIP -DWITH_FTE_VFS
+-BASE_CFLAGS = -pipe -Wall -funsigned-char $(ARCH_CFLAGS) $(PRJ_CFLAGS) -I./libs
++BASE_CFLAGS := $(CFLAGS) -pipe -Wall -funsigned-char $(ARCH_CFLAGS) $(PRJ_CFLAGS) `pcre-config --cflags` -I$(TCL_INCLUDEDIR) -I.. -DQ1DIR='"$(Q1DIR)"' -DDATADIR='"$(DATADIR)"'
++
  
-@@ -81,9 +70,11 @@
  
- # compiler flags
- PRJ_CFLAGS = -DWITH_ZLIB -DWITH_PNG -DEMBED_TCL -DJSS_CAM -DWITH_ZIP #-DWITH_FTE_VFS
--BASE_CFLAGS = -pipe -Wall -funsigned-char $(ARCH_CFLAGS) $(PRJ_CFLAGS) -I ./libs
-+BASE_CFLAGS := $(CFLAGS) -pipe -Wall -funsigned-char $(ARCH_CFLAGS) $(PRJ_CFLAGS) `pcre-config --cflags` -I$(TCL_INCLUDEDIR) -I.. -DDATADIR='"$(Q1DIR)"'
+ ########################
+@@ -112,7 +102,9 @@
+ 
+ ########################
  
 +ifeq ($(USE_OPTIMIZED_CFLAGS),YES)
  RELEASE_CFLAGS = -O2 -fno-strict-aliasing -ffast-math -funroll-loops
@@ -68,20 +75,21 @@
  DEBUG_CFLAGS = -ggdb
  
  # opengl builds
-@@ -96,13 +87,13 @@
+@@ -125,13 +117,13 @@
  endif
  
  ifeq ($(TYPE),release)
 -LDFLAGS = -lm -lpthread
 +LDFLAGS = -lm -pthread
  else
- LDFLAGS = -ggdb -lm -lpthread
+-LDFLAGS = -ggdb -lm -lpthread
++LDFLAGS = -ggdb -lm -pthread
  endif
  
--COMMON_LIBS = libs/$(LIB_PREFIX)/minizip.a libs/$(LIB_PREFIX)/libpng.a libs/$(LIB_PREFIX)/libz.a libs/$(LIB_PREFIX)/libpcre.a libs/$(LIB_PREFIX)/libexpat.a libs/$(LIB_PREFIX)/libtcl8.4.a
+-COMMON_LIBS = libs/$(LIB_PREFIX)/minizip.a libs/$(LIB_PREFIX)/libpng.a libs/$(LIB_PREFIX)/libz.a libs/$(LIB_PREFIX)/libpcre.a libs/$(LIB_PREFIX)/libexpat.a libs/$(LIB_PREFIX)/libtcl.a
 -GL_LIBS = libs/$(LIB_PREFIX)/libjpeg.a
 +COMMON_LIBS = -lm -lpng -lz `pcre-config --libs` `glib-config --libs` -lexpat -ltcl$(TCL_SUFX)
 +GL_LIBS = -ljpeg
  
  ifeq ($(OS),freebsd)
- LOCALBASE ?= /usr/X11R6
+ X11BASE ?= /usr/X11R6
diff --git a/games/ezquake/files/patch-Makefile.list b/games/ezquake/files/patch-Makefile.list
index cc75d55c8c63..70eadcf1669b 100644
--- a/games/ezquake/files/patch-Makefile.list
+++ b/games/ezquake/files/patch-Makefile.list
@@ -1,16 +1,16 @@
---- Makefile.list.orig	Fri Jan  4 11:28:34 2008
-+++ Makefile.list	Fri Jan  4 11:28:47 2008
-@@ -109,7 +109,8 @@
- 	net_chan \
+--- Makefile.list.orig	2008-04-27 17:51:56.000000000 -0300
++++ Makefile.list	2008-04-29 22:32:27.000000000 -0300
+@@ -137,7 +137,8 @@
  	q_shared \
  	version \
--	zone
-+	zone \
+ 	zone \
+-	zone2
++	zone2 \
 +	../unzip ../ioapi
  
  GL_C_FILES := \
  	collision \
-@@ -167,7 +168,6 @@
+@@ -195,7 +196,6 @@
  	in_linux \
  	keymap_x11 \
  	localtime_linux \
diff --git a/games/ezquake/files/patch-common.c b/games/ezquake/files/patch-common.c
deleted file mode 100644
index 184fbc5ef173..000000000000
--- a/games/ezquake/files/patch-common.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- common.c.orig	Fri Jan  4 12:29:52 2008
-+++ common.c	Fri Jan  4 12:41:04 2008
-@@ -2012,7 +2012,7 @@
- 		if (!Sys_fullpath(com_basedir, "/proc/self/exe", sizeof(com_basedir)))
- 			Sys_Error("FS_InitFilesystemEx: Sys_fullpath failed");
- #else
--		com_basedir[0] = 0; // FIXME: MAC / FreeBSD
-+		snprintf(com_basedir, sizeof(com_basedir), "%s/.ezquake/", getenv("HOME") ? getenv("HOME") : ".");
- #endif
- 
- 		// strip ezquake*.exe, we need only path
-@@ -2029,12 +2029,7 @@
- 		strlcpy (com_basedir, com_argv[i + 1], sizeof(com_basedir));
- 	}
-  	else { // made com_basedir equa to cwd
--//#ifdef __FreeBSD__
--//		strlcpy(com_basedir, DATADIR, sizeof(com_basedir) - 1);
--//#else
--
--		Sys_getcwd(com_basedir, sizeof(com_basedir) - 1); // FIXME strlcpy (com_basedir, ".", sizeof(com_basedir)); ?
--//#endif
-+		snprintf(com_basedir, sizeof(com_basedir), "%s/.ezquake/", getenv("HOME") ? getenv("HOME") : ".");
- 	}
- 
- 	for (i = 0; i < (int) strlen(com_basedir); i++)
-@@ -2078,6 +2073,10 @@
- 	}
- 
- 	// start up with id1 by default
-+	FS_AddGameDirectory(DATADIR, "id1");
-+	FS_AddGameDirectory(DATADIR, "ezquake");
-+	FS_AddGameDirectory(DATADIR, "qw");
-+
- 	FS_AddGameDirectory(com_basedir, "id1");
- 
- 	FS_AddGameDirectory(com_basedir, "ezquake");
diff --git a/games/ezquake/files/patch-config_manager.c b/games/ezquake/files/patch-config_manager.c
index ac6bff68892e..10691df54d2f 100644
--- a/games/ezquake/files/patch-config_manager.c
+++ b/games/ezquake/files/patch-config_manager.c
@@ -1,8 +1,8 @@
---- config_manager.c.orig	Tue Apr 18 17:59:55 2006
-+++ config_manager.c	Wed Aug 30 19:01:17 2006
-@@ -67,7 +67,7 @@
- cvar_t	cfg_save_unchanged	=	{"cfg_save_unchanged", "0"};
+--- config_manager.c.orig	2008-04-27 17:51:52.000000000 -0300
++++ config_manager.c	2008-05-06 15:02:46.000000000 -0300
+@@ -68,7 +68,7 @@
  cvar_t	cfg_save_userinfo	=	{"cfg_save_userinfo", "2"};
+ cvar_t	cfg_save_onquit		=	{"cfg_save_onquit", "0"};
  cvar_t	cfg_legacy_exec		=	{"cfg_legacy_exec", "1"};
 -cvar_t	cfg_legacy_write	=	{"cfg_legacy_write", "0"};
 +cvar_t	cfg_legacy_write	=	{"cfg_legacy_write", "1"};
diff --git a/games/ezquake/files/patch-fs.c b/games/ezquake/files/patch-fs.c
new file mode 100644
index 000000000000..42c4ad1d4693
--- /dev/null
+++ b/games/ezquake/files/patch-fs.c
@@ -0,0 +1,40 @@
+--- fs.c.orig	2008-04-27 17:51:50.000000000 -0300
++++ fs.c	2008-05-06 20:22:16.000000000 -0300
+@@ -1022,6 +1022,8 @@
+ 		FS_AddGameDirectory(com_basedir, dir);
+ 	}
+ #else
++	FS_AddGameDirectory(va("%s/%s", Q1DIR, dir), FS_LOAD_FILE_ALL);
++	FS_AddGameDirectory(va("%s/%s", DATADIR, dir), FS_LOAD_FILE_ALL);
+ 	FS_AddGameDirectory(va("%s/%s", com_basedir, dir), FS_LOAD_FILE_ALL);
+ 	if (*com_homedir) {
+ 		FS_AddHomeDirectory(va("%s/%s", com_homedir, dir), FS_LOAD_FILE_ALL);
+@@ -1095,7 +1097,7 @@
+ 		if (!Sys_fullpath(com_basedir, "/proc/self/exe", sizeof(com_basedir)))
+ 			Sys_Error("FS_InitFilesystemEx: Sys_fullpath failed");
+ #else
+-		com_basedir[0] = 0; // FIXME: MAC / FreeBSD
++		snprintf(com_basedir, sizeof(com_basedir), "%s/.ezquake/", getenv("HOME") ? getenv("HOME") : ".");
+ #endif
+ 
+ 		// strip ezquake*.exe, we need only path
+@@ -1116,7 +1118,7 @@
+ //		strlcpy(com_basedir, DATADIR, sizeof(com_basedir) - 1);
+ //#else
+ 
+-		Sys_getcwd(com_basedir, sizeof(com_basedir) - 1); // FIXME strlcpy (com_basedir, ".", sizeof(com_basedir)); ?
++		snprintf(com_basedir, sizeof(com_basedir), "%s/.ezquake/", getenv("HOME") ? getenv("HOME") : ".");
+ //#endif
+ 	}
+ 
+@@ -1176,6 +1178,10 @@
+ 	FS_AddGameDirectory(com_basedir, "ezquake");
+ 	FS_AddGameDirectory(com_basedir, "qw");
+ #else
++	FS_AddGameDirectory(va("%s/%s", Q1DIR, "id1"),     FS_LOAD_FILE_ALL);
++	FS_AddGameDirectory(va("%s/%s", Q1DIR, "qw"),      FS_LOAD_FILE_ALL);
++	FS_AddGameDirectory(va("%s/%s", DATADIR, "ezquake"), FS_LOAD_FILE_ALL);
++	FS_AddGameDirectory(va("%s/%s", DATADIR, "qw"),      FS_LOAD_FILE_ALL);
+ 	FS_AddGameDirectory(va("%s/%s", com_basedir, "id1"),     FS_LOAD_FILE_ALL);
+ 	FS_AddGameDirectory(va("%s/%s", com_basedir, "ezquake"), FS_LOAD_FILE_ALL);
+ 	FS_AddGameDirectory(va("%s/%s", com_basedir, "qw"),      FS_LOAD_FILE_ALL);
diff --git a/games/ezquake/files/patch-gl_local.h b/games/ezquake/files/patch-gl_local.h
deleted file mode 100644
index 7259a8ea30e6..000000000000
--- a/games/ezquake/files/patch-gl_local.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./gl_local.h.orig	Thu Jul 12 20:11:59 2007
-+++ ./gl_local.h	Thu Jul 12 20:27:57 2007
-@@ -299,6 +299,9 @@
- extern lpMTexFUNC qglMultiTexCoord2f;
- extern lpSelTexFUNC qglActiveTexture;
- 
-+extern PFNGLXGETVIDEOSYNCSGIPROC qglXGetVideoSyncSGI;
-+extern PFNGLXWAITVIDEOSYNCSGIPROC qglXWaitVideoSyncSGI;
-+
- extern float gldepthmin, gldepthmax;
- extern byte color_white[4], color_black[4];
- extern qbool gl_mtexable;
diff --git a/games/ezquake/files/patch-q_shared.h b/games/ezquake/files/patch-q_shared.h
index a4ae32d61198..23d7125e2329 100644
--- a/games/ezquake/files/patch-q_shared.h
+++ b/games/ezquake/files/patch-q_shared.h
@@ -1,10 +1,13 @@
---- q_shared.h.orig	Fri Jan  4 10:53:25 2008
-+++ q_shared.h	Fri Jan  4 11:10:59 2008
-@@ -32,6 +32,17 @@
- #include <ctype.h>
- #include <assert.h>
+--- q_shared.h.orig	2008-04-27 17:51:54.000000000 -0300
++++ q_shared.h	2008-05-06 15:08:25.000000000 -0300
+@@ -161,10 +161,13 @@
+ //======================= FreeBSD DEFINES ====================================
+ #ifdef __FreeBSD__
  
-+#ifdef __FreeBSD__
+-#if !idppc
+-#define __LITTLE_ENDIAN__
+-#else
+-#define __BIG_ENDIAN__
 +#include <machine/endian.h>
 +#if BYTE_ORDER == BIG_ENDIAN
 +#define __BIG_ENDIAN__ 1
@@ -12,9 +15,6 @@
 +#define __LITTLE_ENDIAN__ 1
 +#elif BYTE_ORDER == PDP_ENDIAN
 +#define __PDP_ENDIAN__ 1
-+#endif
-+#endif
-+
- #define wchar unsigned short	// 16-bit Unicode char
+ #endif
  
- #include "mathlib.h"
+ #endif
diff --git a/games/ezquake/files/patch-snd_dma.c b/games/ezquake/files/patch-snd_dma.c
index d3e5c41180c3..e5b78c85d75a 100644
--- a/games/ezquake/files/patch-snd_dma.c
+++ b/games/ezquake/files/patch-snd_dma.c
@@ -1,6 +1,6 @@
---- snd_dma.c.orig	Fri Jan  4 07:05:02 2008
-+++ snd_dma.c	Fri Jan  4 07:06:53 2008
-@@ -94,7 +94,7 @@
+--- snd_dma.c.orig	2008-04-27 17:51:58.000000000 -0300
++++ snd_dma.c	2008-05-06 15:10:34.000000000 -0300
+@@ -93,7 +93,7 @@
  cvar_t s_khz = {"s_khz", "11", CVAR_ARCHIVE, OnChange_s_khz};
  #ifdef __FreeBSD__
  cvar_t s_stereo = {"s_stereo", "1"};
diff --git a/games/ezquake/files/patch-teamplay.c b/games/ezquake/files/patch-teamplay.c
deleted file mode 100644
index d0dfdab8d03d..000000000000
--- a/games/ezquake/files/patch-teamplay.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- teamplay.c.orig	Fri Jan  4 10:53:25 2008
-+++ teamplay.c	Fri Jan  4 11:14:15 2008
-@@ -21,6 +21,7 @@
- 
- #include <time.h>
- #include <string.h>
-+#include <limits.h>
- #include "quakedef.h"
- #include "ignore.h"
- #ifdef GLQUAKE
diff --git a/games/ezquake/files/patch-vid_common_gl.c b/games/ezquake/files/patch-vid_common_gl.c
deleted file mode 100644
index eda8f1076951..000000000000
--- a/games/ezquake/files/patch-vid_common_gl.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- vid_common_gl.c.orig	Fri Jan  4 07:13:37 2008
-+++ vid_common_gl.c	Fri Jan  4 07:15:29 2008
-@@ -68,6 +68,9 @@
- lpMTexFUNC qglMultiTexCoord2f = NULL;
- lpSelTexFUNC qglActiveTexture = NULL;
- 
-+PFNGLXGETVIDEOSYNCSGIPROC qglXGetVideoSyncSGI = NULL;
-+PFNGLXWAITVIDEOSYNCSGIPROC qglXWaitVideoSyncSGI = NULL;
-+
- qbool gl_combine = false;
- 
- qbool gl_add_ext = false;
-@@ -198,6 +201,10 @@
- 	Cvar_ForceSet (&gl_strings, va("GL_VENDOR: %s\nGL_RENDERER: %s\n"
- 		"GL_VERSION: %s\nGL_EXTENSIONS: %s", gl_vendor, gl_renderer, gl_version, gl_extensions));
-     Cvar_Register (&gl_maxtmu2);
-+
-+	qglXGetVideoSyncSGI = GL_GetProcAddress("glXGetVideoSyncSGI");
-+	qglXWaitVideoSyncSGI = GL_GetProcAddress("glXWaitVideoSyncSGI");
-+
- #ifndef __APPLE__
- 	glClearColor (1,0,0,0);
- #else