Attachment 94034 Details for Bug 132086 – file.shar

file.shar

file.shar (text/plain), 22.65 KB, created by Aragon Gouveia on 2009-02-25 04:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aragon Gouveia

Created: 2009-02-25 04:20:05 UTC

Size: 22.65 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	d2x-xl
>#	d2x-xl/Makefile
>#	d2x-xl/distinfo
>#	d2x-xl/pkg-descr
>#	d2x-xl/pkg-message
>#	d2x-xl/files
>#	d2x-xl/files/patch-ogl-sdlgl.cpp
>#	d2x-xl/files/patch-ogl-pbuffer.cpp
>#	d2x-xl/files/patch-ogl-ogl_texcache.cpp
>#	d2x-xl/files/patch-ogl-ogl_render.cpp
>#	d2x-xl/files/patch-ogl-ogl_lib.cpp
>#	d2x-xl/files/patch-ogl-ogl_fastrender.cpp
>#	d2x-xl/files/patch-ogl-ogl_defs.cpp
>#	d2x-xl/files/patch-audio-rbaudio.cpp
>#	d2x-xl/files/patch-effects-particles.cpp
>#	d2x-xl/files/patch-include-inferno.h
>#	d2x-xl/files/patch-include-ogl_defs.h
>#	d2x-xl/files/patch-input-event.cpp
>#	d2x-xl/files/patch-input-joy.cpp
>#	d2x-xl/files/patch-input-mouse.cpp
>#	d2x-xl/files/patch-libmve-mveplay.cpp
>#	d2x-xl/files/patch-input-key.cpp
>#	d2x-xl/files/patch-main-game.cpp
>#	d2x-xl/files/patch-main-gamecntl.cpp
>#	d2x-xl/files/patch-main-inferno.cpp
>#	d2x-xl/files/patch-mem-mem.cpp
>#	d2x-xl/files/patch-network-autodl.cpp
>#	d2x-xl/files/patch-ogl-ogl_bitmap.cpp
>#	d2x-xl/files/patch-audio-digi.cpp
>#	d2x-xl/files/patch-audio-linux-midi.cpp
>#	d2x-xl/files/patch-input-include-joy.h
>#	d2x-xl/files/patch-main-console.cpp
>#	d2x-xl/files/patch-network-tracker.cpp
>#	d2x-xl/files/patch-ogl-fbuffer.cpp
>#	d2x-xl/files/patch-ogl-ogl_draw.cpp
>#	d2x-xl/files/patch-ogl-ogl_hudstuff.cpp
>#	d2x-xl/files/patch-ogl-ogl_shader.cpp
>#	d2x-xl/files/patch-ogl-ogl_texture.cpp
>#	d2x-xl/files/patch-ogl-screenshot.cpp
>#
>echo c - d2x-xl
>mkdir -p d2x-xl > /dev/null 2>&1
>echo x - d2x-xl/Makefile
>sed 's/^X//' >d2x-xl/Makefile << '66a5fc2a973f48c4c9242a54910a70c3'
>X# New ports collection makefile for:	d2x
>X# Date created:		5 Apr 2004
>X# Whom:			Radim Kolar
>X#
>X# $FreeBSD: ports/games/d2x/Makefile,v 1.12 2009/01/31 22:36:36 pav Exp $
>X#
>X
>XPORTNAME=	d2x-xl
>XPORTVERSION=	1.13.127
>XPORTREVISION=	0
>XCATEGORIES=	games
>XMASTER_SITES=	http://www.descent2.de/downloads/
>XDISTFILES=	d2x-xl-src-${PORTVERSION}.rar
>X
>XMAINTAINER=	ports@FreeBSD.org
>XCOMMENT=	Community Unix port of Descent 2 Game
>X
>XGNU_CONFIGURE=	yes
>XCONFIGURE_ARGS=	--disable-debug --enable-release=yes --with-sharepath=${PREFIX}/share/d2x-xl
>XUSE_SDL=	sdl mixer
>XUSE_GMAKE=	yes
>XUSE_AUTOTOOLS=	aclocal:110 \
>X		autoheader:262 \
>X		automake:110 \
>X		autoconf:262
>XAUTOMAKE_ARGS=	--add-missing --copy
>XEXTRACT_DEPENDS+=       unrar:${PORTSDIR}/archivers/unrar
>X
>X.ifdef(WITH_OPENGL)
>XUSE_GL=		glut
>XCONFIGURE_ARGS+=--with-opengl
>XCONFIGURE_ENV=LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
>X.endif
>X
>Xpre-everything::
>X.ifndef(WITH_OPENGL)
>X	@${ECHO_MSG} ""
>X	@${ECHO_MSG} "Define WITH_OPENGL to use OpenGL for 3D graphics"
>X	@${ECHO_MSG} ""
>X.endif
>X
>Xdo-extract:
>X	@${MKDIR} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
>X	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION} && \
>X		unrar x ${DISTDIR}/${DISTFILES} >/dev/null && \
>X		unrar x ${PORTNAME}-makefiles.rar >/dev/null && \
>X		${CHMOD} +x configure && \
>X		${MV} missing missing.old && \
>X		${MV} depcomp depcomp.old && \
>X		${CAT} missing.old |${TR} -d \\r >missing && \
>X		${CAT} depcomp.old |${TR} -d \\r >depcomp && \
>X		${RM} -f missing.old depcomp.old
>X
>Xdo-install:
>X		${INSTALL} ${WRKSRC}/d2x-xl  ${PREFIX}/bin/d2x-xl
>X	        @${CAT} ${PKGMESSAGE}
>X
>X.include <bsd.port.mk>
>66a5fc2a973f48c4c9242a54910a70c3
>echo x - d2x-xl/distinfo
>sed 's/^X//' >d2x-xl/distinfo << '25bfa8f70514c7e53ca5bd6bafa76649'
>XMD5 (d2x-xl-src-1.13.127.rar) = 050a60816b90e5f6e1e6b2c729d3ea22
>XSHA256 (d2x-xl-src-1.13.127.rar) = a9d856c08b3617412393c80fcdf4a80dd565b2ed8dd375d5f6cedf692288d599
>XSIZE (d2x-xl-src-1.13.127.rar) = 1406776
>25bfa8f70514c7e53ca5bd6bafa76649
>echo x - d2x-xl/pkg-descr
>sed 's/^X//' >d2x-xl/pkg-descr << '99c0512655bca314a5d2221405583848'
>XD2X-XL is a community modified version of Icculus's D2X port,
>Xthe original Unix port of Descent by Parallax software.  It
>Xcontains many bug fixes and improvements since Icculus stopped
>Xworking on D2X.
>X
>XYou need to own the orignal game or download demo data
>Xfiles.
>X
>XWWW: http://www.descent2.de/
>99c0512655bca314a5d2221405583848
>echo x - d2x-xl/pkg-message
>sed 's/^X//' >d2x-xl/pkg-message << '4826e4445429d27fb982647dc77cea27'
>X************************************************************
>XYou need to get data files from an original Descent 2 or 1
>XCD or from the free demo and place them in:
>X
>X  /usr/local/share/d2x-xl/data
>X
>XSee http://www.descent2.de/ for more information and addons.
>X************************************************************
>4826e4445429d27fb982647dc77cea27
>echo c - d2x-xl/files
>mkdir -p d2x-xl/files > /dev/null 2>&1
>echo x - d2x-xl/files/patch-ogl-sdlgl.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-sdlgl.cpp << 'b43c205026aa4f328dbd900e11323e6d'
>X--- ogl/sdlgl.cpp.orig	2008-11-21 00:32:50.000000000 +0200
>X+++ ogl/sdlgl.cpp	2009-02-25 01:49:37.000000000 +0200
>X@@ -9,16 +9,9 @@
>X #include <conf.h>
>X #endif
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-# ifdef SDL_IMAGE
>X-#  include <SDL/SDL_image.h>
>X-# endif
>X-#else
>X-# include <SDL.h>
>X-# ifdef SDL_IMAGE
>X-#  include <SDL_image.h>
>X-# endif
>X+#include <SDL/SDL.h>
>X+#ifdef SDL_IMAGE
>X+# include <SDL/SDL_image.h>
>X #endif
>X 
>X #include "inferno.h"
>b43c205026aa4f328dbd900e11323e6d
>echo x - d2x-xl/files/patch-ogl-pbuffer.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-pbuffer.cpp << 'a70b6afced38964513e4397aa21a4f01'
>X--- ogl/pbuffer.cpp.orig	2008-11-21 00:32:50.000000000 +0200
>X+++ ogl/pbuffer.cpp	2009-02-25 01:49:00.000000000 +0200
>X@@ -18,13 +18,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "3d.h"
>X #include "piggy.h"
>a70b6afced38964513e4397aa21a4f01
>echo x - d2x-xl/files/patch-ogl-ogl_texcache.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_texcache.cpp << 'e03ee0ada2b9a5c7e8c33990ab909b44'
>X--- ogl/ogl_texcache.cpp.orig	2008-10-21 01:58:33.000000000 +0200
>X+++ ogl/ogl_texcache.cpp	2009-02-25 01:48:47.000000000 +0200
>X@@ -18,13 +18,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>e03ee0ada2b9a5c7e8c33990ab909b44
>echo x - d2x-xl/files/patch-ogl-ogl_render.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_render.cpp << 'fa5b75449bde1325351be6087522a207'
>X--- ogl/ogl_render.cpp.orig	2009-01-05 16:34:04.000000000 +0200
>X+++ ogl/ogl_render.cpp	2009-02-25 01:46:22.000000000 +0200
>X@@ -18,13 +18,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>fa5b75449bde1325351be6087522a207
>echo x - d2x-xl/files/patch-ogl-ogl_lib.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_lib.cpp << 'f4026f424a9e656a8fc9cb8c5e01f63a'
>X--- ogl/ogl_lib.cpp.orig	2008-12-01 11:56:24.000000000 +0200
>X+++ ogl/ogl_lib.cpp	2009-02-25 01:47:55.000000000 +0200
>X@@ -18,13 +18,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>f4026f424a9e656a8fc9cb8c5e01f63a
>echo x - d2x-xl/files/patch-ogl-ogl_fastrender.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_fastrender.cpp << 'b02daa8280c286cff60e10fea7604dd6'
>X--- ogl/ogl_fastrender.cpp.orig	2008-12-01 01:32:17.000000000 +0200
>X+++ ogl/ogl_fastrender.cpp	2009-02-25 01:47:25.000000000 +0200
>X@@ -19,13 +19,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>b02daa8280c286cff60e10fea7604dd6
>echo x - d2x-xl/files/patch-ogl-ogl_defs.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_defs.cpp << '68aa5a64b407962b6bb8a78a5d92c7ce'
>X--- ogl/ogl_defs.cpp.orig	2008-10-09 09:34:17.000000000 +0200
>X+++ ogl/ogl_defs.cpp	2009-02-25 01:47:04.000000000 +0200
>X@@ -19,13 +19,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "ogl_shader.h"
>68aa5a64b407962b6bb8a78a5d92c7ce
>echo x - d2x-xl/files/patch-audio-rbaudio.cpp
>sed 's/^X//' >d2x-xl/files/patch-audio-rbaudio.cpp << '9cb548b985d9e07e4ea3bf757da5921f'
>X--- audio/rbaudio.cpp.orig	2008-07-17 21:36:14.000000000 +0200
>X+++ audio/rbaudio.cpp	2009-02-25 02:05:08.000000000 +0200
>X@@ -12,11 +12,7 @@
>X #include <stdio.h>
>X #include <string.h>
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X #ifdef __linux__
>X #include <sys/ioctl.h>
>9cb548b985d9e07e4ea3bf757da5921f
>echo x - d2x-xl/files/patch-effects-particles.cpp
>sed 's/^X//' >d2x-xl/files/patch-effects-particles.cpp << '6be4335eb614caef26a0e26dd652927b'
>X--- effects/particles.cpp.orig	2009-01-02 00:08:48.000000000 +0200
>X+++ effects/particles.cpp	2009-02-25 02:05:38.000000000 +0200
>X@@ -11,11 +11,7 @@
>X #	include <conf.h>
>X #endif
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X #include "pstypes.h"
>X #include "inferno.h"
>6be4335eb614caef26a0e26dd652927b
>echo x - d2x-xl/files/patch-include-inferno.h
>sed 's/^X//' >d2x-xl/files/patch-include-inferno.h << '9804ef70a62cd1dd6a9a52cbffbc818b'
>X--- include/inferno.h.orig	2009-01-03 12:21:33.000000000 +0200
>X+++ include/inferno.h	2009-02-25 02:06:07.000000000 +0200
>X@@ -97,14 +97,8 @@
>X #include "segment.h"
>X #include "console.h"
>X #include "vecmat.h"
>X-
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-# include <SDL/SDL_thread.h>
>X-#else
>X-# include <SDL.h>
>X-# include <SDL_thread.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X+#include <SDL/SDL_thread.h>
>X 
>X /**
>X  **	Constants
>9804ef70a62cd1dd6a9a52cbffbc818b
>echo x - d2x-xl/files/patch-include-ogl_defs.h
>sed 's/^X//' >d2x-xl/files/patch-include-ogl_defs.h << '68f81ceb9cbc04c3c8a3dcd8ee20d40d'
>X--- include/ogl_defs.h.orig	2008-10-09 09:34:21.000000000 +0200
>X+++ include/ogl_defs.h	2009-02-25 02:06:41.000000000 +0200
>X@@ -220,7 +220,6 @@
>X 
>X #else //GL_VERSION_20
>X 
>X-#  ifdef __macosx__
>X #    define glCreateShaderObject   glCreateShaderObjectARB
>X #    define glShaderSource         glShaderSourceARB
>X #    define glCompileShader        glCompileShaderARB
>X@@ -239,7 +238,6 @@
>X #    define glUniform4fv           glUniform4fvARB
>X #    define glUniform3fv           glUniform3fvARB
>X #    define glUniform1fv           glUniform1fvARB
>X-#  endif
>X 
>X #endif //GL_VERSION_20
>X 
>68f81ceb9cbc04c3c8a3dcd8ee20d40d
>echo x - d2x-xl/files/patch-input-event.cpp
>sed 's/^X//' >d2x-xl/files/patch-input-event.cpp << '73006be46595f5cacb8c2da57d3b5fc7'
>X--- input/event.cpp.orig	2008-07-16 00:02:25.000000000 +0200
>X+++ input/event.cpp	2009-02-25 02:07:09.000000000 +0200
>X@@ -19,11 +19,7 @@
>X # endif
>X #endif
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X 
>73006be46595f5cacb8c2da57d3b5fc7
>echo x - d2x-xl/files/patch-input-joy.cpp
>sed 's/^X//' >d2x-xl/files/patch-input-joy.cpp << 'adeb80042a2baee567822a97fb083938'
>X--- input/joy.cpp.orig	2008-11-28 01:47:28.000000000 +0200
>X+++ input/joy.cpp	2009-02-25 02:07:29.000000000 +0200
>X@@ -10,11 +10,7 @@
>X #endif
>X 
>X #include <string.h>   // for memset
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "joy.h"
>adeb80042a2baee567822a97fb083938
>echo x - d2x-xl/files/patch-input-mouse.cpp
>sed 's/^X//' >d2x-xl/files/patch-input-mouse.cpp << '024123d1ccb1444dee242332d8ac5add'
>X--- input/mouse.cpp.orig	2008-07-16 00:02:25.000000000 +0200
>X+++ input/mouse.cpp	2009-02-25 02:07:43.000000000 +0200
>X@@ -11,11 +11,7 @@
>X 
>X #include <string.h>
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "fix.h"
>024123d1ccb1444dee242332d8ac5add
>echo x - d2x-xl/files/patch-libmve-mveplay.cpp
>sed 's/^X//' >d2x-xl/files/patch-libmve-mveplay.cpp << '2886e8448c9bea89664b1b3753c75e3d'
>X--- libmve/mveplay.cpp.orig	2008-09-06 01:56:56.000000000 +0200
>X+++ libmve/mveplay.cpp	2009-02-25 02:08:00.000000000 +0200
>X@@ -20,11 +20,7 @@
>X #endif
>X 
>X #if defined (AUDIO)
>X-#	ifdef __macosx__
>X-#		include <SDL/SDL.h>
>X-#	else
>X-#		include <SDL.h>
>X-#	endif
>X+#	include <SDL/SDL.h>
>X #endif
>X 
>X #include "mvelib.h"
>2886e8448c9bea89664b1b3753c75e3d
>echo x - d2x-xl/files/patch-input-key.cpp
>sed 's/^X//' >d2x-xl/files/patch-input-key.cpp << '6997151f29ea12dc7a2291b6664129f1'
>X--- input/key.cpp.orig	2008-10-21 01:58:33.000000000 +0200
>X+++ input/key.cpp	2009-02-25 02:07:37.000000000 +0200
>X@@ -13,11 +13,7 @@
>X #include <stdlib.h>
>X #include <time.h>
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "event.h"
>6997151f29ea12dc7a2291b6664129f1
>echo x - d2x-xl/files/patch-main-game.cpp
>sed 's/^X//' >d2x-xl/files/patch-main-game.cpp << 'c49b2362f7214a596e8c05690e4d26d1'
>X--- main/game.cpp.orig	2009-01-02 00:07:51.000000000 +0200
>X+++ main/game.cpp	2009-02-25 02:10:12.000000000 +0200
>X@@ -71,11 +71,6 @@
>X #include "soundthreads.h"
>X #include "sparkeffect.h"
>X #include "createmesh.h"
>X-#ifdef __macosx__
>X-#include "SDL/SDL_syswm.h"
>X-#else
>X-#include "SDL_syswm.h"
>X-#endif
>X #include "renderthreads.h"
>X #include "fvi.h"
>X 
>c49b2362f7214a596e8c05690e4d26d1
>echo x - d2x-xl/files/patch-main-gamecntl.cpp
>sed 's/^X//' >d2x-xl/files/patch-main-gamecntl.cpp << 'e1a0f1d6952dafea98793af4bb799918'
>X--- main/gamecntl.cpp.orig	2008-10-17 14:56:09.000000000 +0200
>X+++ main/gamecntl.cpp	2009-02-25 02:09:00.000000000 +0200
>X@@ -83,11 +83,7 @@
>X #endif
>X 
>X #ifdef SDL_INPUT
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X #endif
>X 
>X //	Function prototypes --------------------------------------------------------
>e1a0f1d6952dafea98793af4bb799918
>echo x - d2x-xl/files/patch-main-inferno.cpp
>sed 's/^X//' >d2x-xl/files/patch-main-inferno.cpp << '6c574d35371dfa3636850210eecdb4de'
>X--- main/inferno.cpp.orig	2009-01-06 20:17:10.000000000 +0200
>X+++ main/inferno.cpp	2009-02-25 02:10:33.000000000 +0200
>X@@ -29,14 +29,6 @@
>X #include <sys/types.h>
>X #endif
>X 
>X-#ifdef __macosx__
>X-#	include "SDL/SDL_main.h"
>X-#	include "SDL/SDL_keyboard.h"
>X-#	include "FolderDetector.h"
>X-#else
>X-#	include "SDL_main.h"
>X-#	include "SDL_keyboard.h"
>X-#endif
>X #include "inferno.h"
>X #include "u_mem.h"
>X #include "strutil.h"
>6c574d35371dfa3636850210eecdb4de
>echo x - d2x-xl/files/patch-mem-mem.cpp
>sed 's/^X//' >d2x-xl/files/patch-mem-mem.cpp << 'c2c2fc18200f068bc716e5de1b3401f5'
>X--- mem/mem.cpp.orig	2008-11-26 11:30:23.000000000 +0200
>X+++ mem/mem.cpp	2009-02-25 02:10:53.000000000 +0200
>X@@ -25,11 +25,6 @@
>X #include <stdio.h>
>X #include <stdlib.h>
>X #include <string.h>
>X-#ifdef __macosx__
>X-# include <sys/malloc.h>
>X-#else
>X-# include <malloc.h>
>X-#endif
>X #include "pstypes.h"
>X #include "mono.h"
>X #include "error.h"
>c2c2fc18200f068bc716e5de1b3401f5
>echo x - d2x-xl/files/patch-network-autodl.cpp
>sed 's/^X//' >d2x-xl/files/patch-network-autodl.cpp << '5946b575ebdd94c083c511c707d955b6'
>X--- network/autodl.cpp.orig	2008-11-29 00:12:19.000000000 +0200
>X+++ network/autodl.cpp	2009-02-25 02:11:05.000000000 +0200
>X@@ -8,11 +8,7 @@
>X #include <time.h>
>X #include <string.h>
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X #include "inferno.h"
>X #include "ipx.h"
>X #include "key.h"
>5946b575ebdd94c083c511c707d955b6
>echo x - d2x-xl/files/patch-ogl-ogl_bitmap.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_bitmap.cpp << '24f5130963d2f0d505922042faabc899'
>X--- ogl/ogl_bitmap.cpp.orig	2008-11-21 00:32:50.000000000 +0200
>X+++ ogl/ogl_bitmap.cpp	2009-02-25 01:46:34.000000000 +0200
>X@@ -18,13 +18,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>24f5130963d2f0d505922042faabc899
>echo x - d2x-xl/files/patch-audio-digi.cpp
>sed 's/^X//' >d2x-xl/files/patch-audio-digi.cpp << 'f0bd9a11e3243fa19f708a7d78b0fd6d'
>X--- audio/digi.cpp.orig	2009-01-03 11:57:45.000000000 +0200
>X+++ audio/digi.cpp	2009-02-25 02:04:59.000000000 +0200
>X@@ -16,13 +16,9 @@
>X 
>X #include "digi.h"
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-# if USE_SDL_MIXER
>X-#  include <SDL_mixer.h>
>X-# endif
>X+#include <SDL/SDL.h>
>X+#if USE_SDL_MIXER
>X+# include <SDL/SDL_mixer.h>
>X #endif
>X 
>X #include "inferno.h"
>f0bd9a11e3243fa19f708a7d78b0fd6d
>echo x - d2x-xl/files/patch-audio-linux-midi.cpp
>sed 's/^X//' >d2x-xl/files/patch-audio-linux-midi.cpp << 'ca3136aebe6e58596075b8812a0e222a'
>X--- audio/linux/midi.cpp.orig	2008-10-08 14:27:20.000000000 +0200
>X+++ audio/linux/midi.cpp	2009-02-25 02:05:25.000000000 +0200
>X@@ -15,11 +15,7 @@
>X #include "hmpfile.h"
>X 
>X #if USE_SDL_MIXER
>X-#	ifdef __macosx__
>X-#		include <SDL/SDL_mixer.h>
>X-#	else
>X-#		include <SDL_mixer.h>
>X-#	endif
>X+#include <SDL/SDL_mixer.h>
>X 
>X Mix_Music *mixMusic = NULL;
>X #endif
>ca3136aebe6e58596075b8812a0e222a
>echo x - d2x-xl/files/patch-input-include-joy.h
>sed 's/^X//' >d2x-xl/files/patch-input-include-joy.h << '449d3e5d107f47c4412a7c270ddf8d32'
>X--- input/include/joy.h.orig	2008-11-28 01:47:32.000000000 +0200
>X+++ input/include/joy.h	2009-02-25 02:07:21.000000000 +0200
>X@@ -16,11 +16,7 @@
>X 
>X #include "pstypes.h"
>X #include "fix.h"
>X-#ifdef __macosx__
>X-#	include "SDL/SDL_joystick.h"
>X-#else
>X-#	include "SDL_joystick.h"
>X-#endif
>X+#include "SDL/SDL_joystick.h"
>X 
>X #define JOY_1_BUTTON_A  1
>X #define JOY_1_BUTTON_B  2
>449d3e5d107f47c4412a7c270ddf8d32
>echo x - d2x-xl/files/patch-main-console.cpp
>sed 's/^X//' >d2x-xl/files/patch-main-console.cpp << '8c5d6b03ebecb14b2177ba31d265c725'
>X--- main/console.cpp.orig	2008-11-29 00:12:18.000000000 +0200
>X+++ main/console.cpp	2009-02-25 02:08:12.000000000 +0200
>X@@ -16,11 +16,7 @@
>X #ifndef _WIN32
>X #	include <fcntl.h>
>X #endif
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "u_mem.h"
>8c5d6b03ebecb14b2177ba31d265c725
>echo x - d2x-xl/files/patch-network-tracker.cpp
>sed 's/^X//' >d2x-xl/files/patch-network-tracker.cpp << '616673400f79f85e362f651f984f8466'
>X--- network/tracker.cpp.orig	2008-10-21 01:58:33.000000000 +0200
>X+++ network/tracker.cpp	2009-02-25 02:11:12.000000000 +0200
>X@@ -27,11 +27,7 @@
>X #include "menu.h"
>X #include "tracker.h"
>X 
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X static int bTestTracker = 0;
>X #if 0
>616673400f79f85e362f651f984f8466
>echo x - d2x-xl/files/patch-ogl-fbuffer.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-fbuffer.cpp << '29d9a61802b7e8a9b4bc875a86955ae0'
>X--- ogl/fbuffer.cpp.orig	2008-11-21 00:32:54.000000000 +0200
>X+++ ogl/fbuffer.cpp	2009-02-25 01:46:46.000000000 +0200
>X@@ -18,13 +18,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "ogl_defs.h"
>X #include "ogl_lib.h"
>29d9a61802b7e8a9b4bc875a86955ae0
>echo x - d2x-xl/files/patch-ogl-ogl_draw.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_draw.cpp << '378fc0d414b3e0cec899574c176b0fab'
>X--- ogl/ogl_draw.cpp.orig	2008-04-07 23:23:22.000000000 +0200
>X+++ ogl/ogl_draw.cpp	2009-02-25 01:47:17.000000000 +0200
>X@@ -19,13 +19,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>378fc0d414b3e0cec899574c176b0fab
>echo x - d2x-xl/files/patch-ogl-ogl_hudstuff.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_hudstuff.cpp << '86d78b4f104e5623adf8086c25231516'
>X--- ogl/ogl_hudstuff.cpp.orig	2008-10-03 02:18:42.000000000 +0200
>X+++ ogl/ogl_hudstuff.cpp	2009-02-25 01:47:41.000000000 +0200
>X@@ -11,13 +11,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>86d78b4f104e5623adf8086c25231516
>echo x - d2x-xl/files/patch-ogl-ogl_shader.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_shader.cpp << 'e17747ae1ba10d06263f1931f8e6f5ba'
>X--- ogl/ogl_shader.cpp.orig	2008-07-16 00:02:26.000000000 +0200
>X+++ ogl/ogl_shader.cpp	2009-02-25 01:48:21.000000000 +0200
>X@@ -18,13 +18,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>e17747ae1ba10d06263f1931f8e6f5ba
>echo x - d2x-xl/files/patch-ogl-ogl_texture.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-ogl_texture.cpp << 'f6a97bc78233fad84b1e9631cc8158b7'
>X--- ogl/ogl_texture.cpp.orig	2008-11-29 13:42:41.000000000 +0200
>X+++ ogl/ogl_texture.cpp	2009-02-25 01:48:34.000000000 +0200
>X@@ -18,13 +18,8 @@
>X #include <math.h>
>X #include <fcntl.h>
>X #include <stdio.h>
>X-#ifdef __macosx__
>X-# include <stdlib.h>
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <malloc.h>
>X-# include <SDL.h>
>X-#endif
>X+#include <stdlib.h>
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "error.h"
>f6a97bc78233fad84b1e9631cc8158b7
>echo x - d2x-xl/files/patch-ogl-screenshot.cpp
>sed 's/^X//' >d2x-xl/files/patch-ogl-screenshot.cpp << 'd79aa9f969fa556f8d32ae348c1ea190'
>X--- ogl/screenshot.cpp.orig	2008-11-21 00:32:50.000000000 +0200
>X+++ ogl/screenshot.cpp	2009-02-25 01:49:13.000000000 +0200
>X@@ -24,11 +24,7 @@
>X #include <sys/stat.h>
>X #include <fcntl.h>
>X #include <errno.h>
>X-#ifdef __macosx__
>X-# include <SDL/SDL.h>
>X-#else
>X-# include <SDL.h>
>X-#endif
>X+#include <SDL/SDL.h>
>X 
>X #include "inferno.h"
>X #include "ogl_defs.h"
>d79aa9f969fa556f8d32ae348c1ea190
>exit

Actions: View

Attachments on bug 132086: 94034