4 files changed, 151 insertions, 0 deletions

diff --git a/games/quake2forge/files/patch-aa b/games/quake2forge/files/patch-aa
new file mode 100644
index 000000000000..bac7f8e2ced4
--- /dev/null
+++ b/games/quake2forge/files/patch-aa
@@ -0,0 +1,69 @@
+--- src/snd.c.orig	Fri Oct 18 16:08:56 2002
++++ src/snd.c	Tue Oct 15 17:56:17 2002
+@@ -211,12 +211,7 @@
+ 		sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE);
+ 		sndspeed = Cvar_Get("sndspeed", "0", CVAR_ARCHIVE);
+ 		sndchannels = Cvar_Get("sndchannels", "2", CVAR_ARCHIVE);
+-/* merged in from snd_bsd.c -- jaq */
+-#ifdef __linux__
+ 		snddevice = Cvar_Get("snddevice", "/dev/dsp", CVAR_ARCHIVE);
+-#else /* bsd */
+-		snddevice = Cvar_Get("snddevice", "/dev/audio", CVAR_ARCHIVE);
+-#endif
+ 	}
+ 
+ // open /dev/dsp, check capability to mmap, and get size of dma buffer
+@@ -321,24 +316,6 @@
+ 	if (dma.channels < 1 || dma.channels > 2)
+ 		dma.channels = 2;
+ 
+-	if (mmapped) {
+-		dma.samples = info.fragstotal * info.fragsize / (dma.samplebits/8);
+-		dma.submission_chunk = 1;
+-
+-		// memory map the dma buffer
+-
+-		if (!dma.buffer)
+-			dma.buffer = (unsigned char *) mmap(NULL, info.fragstotal
+-				* info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
+-		if (!dma.buffer || dma.buffer == MAP_FAILED) {
+-			perror(snddevice->string);
+-			Com_Printf("SNDDMA_Init: Could not mmap %s.\n", snddevice->string);
+-			close(audio_fd);
+-			audio_fd = -1;
+-			return 0;
+-		}
+-	}
+-
+ 	tmp = 0;
+ 	if (dma.channels == 2)
+ 		tmp = 1;
+@@ -432,6 +409,28 @@
+ 	} else {
+ 	    tmp = 0;
+     	rc  = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
++		dma.samples = info.fragstotal * info.fragsize / (dma.samplebits/8);
++		dma.submission_chunk = 1;
++
++		// memory map the dma buffer
++
++		if (!dma.buffer) {
++			dma.buffer = (unsigned char *) mmap(NULL, info.fragstotal * info.fragsize,
++#if (defined(__FreeBSD__) && (__FreeBSD_version < 500000))
++				PROT_READ|PROT_WRITE,
++#else
++				PROT_WRITE,
++#endif
++				MAP_FILE|MAP_SHARED, audio_fd, 0);
++		}
++		if (!dma.buffer || dma.buffer == MAP_FAILED) {
++			perror(snddevice->string);
++			Com_Printf("SNDDMA_Init: Could not mmap %s.\n", snddevice->string);
++			close(audio_fd);
++			audio_fd = -1;
++			return 0;
++		}
++
+ 		if (rc < 0) {
+ 			perror(snddevice->string);
+ 			Com_Printf("SNDDMA_Init: Could not toggle. (1)\n");
diff --git a/games/quake2forge/files/patch-ab b/games/quake2forge/files/patch-ab
new file mode 100644
index 000000000000..280c8efd73c9
--- /dev/null
+++ b/games/quake2forge/files/patch-ab
@@ -0,0 +1,42 @@
+--- configure.orig	Wed Sep 18 07:02:16 2002
++++ configure	Thu Oct 31 17:55:52 2002
+@@ -2789,7 +2789,7 @@
+ echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+    { (exit 1); exit 1; }; } ;;
+   "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++      ac_configure_args="--enable-ltdl-convenience" ;;
+   esac
+   LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
+   LTDLINCL='-I${top_srcdir}/''libltdl'
+@@ -9633,9 +9633,9 @@
+ 
+ 
+ 
+-# Check whether --with-gl or --without-gl was given.
+-if test "${with_gl+set}" = set; then
+-  withval="$with_gl"
++# Check whether --with-opengl or --without-opengl was given.
++if test "${with_opengl+set}" = set; then
++  withval="$with_opengl"
+   HAVE_OPENGL=$withval
+ else
+   HAVE_OPENGL=auto
+@@ -9763,7 +9763,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lGL $OPENGL_LIBS
++LIBS="-lGL $OPENGL_LIBS -lX11 -lXext
+ 		 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -9814,7 +9814,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glBegin" >&5
+ echo "${ECHO_T}$ac_cv_lib_GL_glBegin" >&6
+ if test $ac_cv_lib_GL_glBegin = yes; then
+-  OPENGL_LIBS="$OPENGL_LIBS -lGL"
++  OPENGL_LIBS="$OPENGL_LIBS -lGL -lX11 -lXext"
+ 			HAVE_OPENGL=yes
+ else
+   HAVE_OPENGL=no
diff --git a/games/quake2forge/files/patch-ac b/games/quake2forge/files/patch-ac
new file mode 100644
index 000000000000..0859ba03c6b1
--- /dev/null
+++ b/games/quake2forge/files/patch-ac
@@ -0,0 +1,21 @@
+--- src/Makefile.am.orig	Thu Oct 31 20:08:06 2002
++++ src/Makefile.am	Thu Oct 31 20:11:19 2002
+@@ -79,15 +79,15 @@
+ #ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ @OPENGL_CFLAGS@
+ ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@
+ #ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @DL_LIBS@
+-ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@
++ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@ @OPENGL_LIBS@
+ ref_glx_la_LDFLAGS = $(module_ldflags)
+ endif
+ 
+ # ref_tdfx
+ if BUILD_TDFX
+ ref_tdfx_la_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c
+-ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@
+-ref_tdfx_la_LDADD = @SVGALIB_LIBS@
++ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@ @OPENGL_CFLAGS@
++ref_tdfx_la_LDADD = @SVGALIB_LIBS@ @OPENGL_LIBS@
+ ref_tdfx_la_LDFLAGS = $(module_ldflags)
+ endif
+ 
diff --git a/games/quake2forge/files/patch-ad b/games/quake2forge/files/patch-ad
new file mode 100644
index 000000000000..8aac0402f8fa
--- /dev/null
+++ b/games/quake2forge/files/patch-ad
@@ -0,0 +1,19 @@
+--- src/Makefile.in.orig	Thu Oct 31 20:07:59 2002
++++ src/Makefile.in	Thu Oct 31 20:11:21 2002
+@@ -200,13 +200,13 @@
+ #ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ @OPENGL_CFLAGS@
+ @BUILD_GLX_TRUE@ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@
+ #ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @DL_LIBS@
+-@BUILD_GLX_TRUE@ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@
++@BUILD_GLX_TRUE@ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@ @OPENGL_LIBS@
+ @BUILD_GLX_TRUE@ref_glx_la_LDFLAGS = $(module_ldflags)
+ 
+ # ref_tdfx
+ @BUILD_TDFX_TRUE@ref_tdfx_la_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c
+-@BUILD_TDFX_TRUE@ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@
+-@BUILD_TDFX_TRUE@ref_tdfx_la_LDADD = @SVGALIB_LIBS@
++@BUILD_TDFX_TRUE@ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@ @OPENGL_CFLAGS@
++@BUILD_TDFX_TRUE@ref_tdfx_la_LDADD = @SVGALIB_LIBS@ @OPENGL_LIBS@
+ @BUILD_TDFX_TRUE@ref_tdfx_la_LDFLAGS = $(module_ldflags)
+ 
+ # ref_sdlgl