From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 10 18:44:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0956616A4D5 for ; Sat, 10 Jun 2006 18:44:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA19644376 for ; Sat, 10 Jun 2006 18:40:59 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k5AIeF9s045020 for ; Sat, 10 Jun 2006 18:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5AIeFIK045019; Sat, 10 Jun 2006 18:40:15 GMT (envelope-from gnats) Resent-Date: Sat, 10 Jun 2006 18:40:15 GMT Resent-Message-Id: <200606101840.k5AIeFIK045019@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8602116A5C4 for ; Sat, 10 Jun 2006 18:37:33 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: from relay00.pair.com (relay00.pair.com [209.68.5.9]) by mx1.FreeBSD.org (Postfix) with SMTP id E86C4498D7 for ; Sat, 10 Jun 2006 15:27:17 +0000 (GMT) (envelope-from alepulver@FreeBSD.org) Received: (qmail 73928 invoked from network); 10 Jun 2006 15:27:14 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 10 Jun 2006 15:27:14 -0000 Message-Id: <1149953247.15056@phobos.mars.bsd> Date: Sat, 10 Jun 2006 12:27:27 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/98783: [UPDATE] games/tenebrae: fix mouse and building in !i386 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jun 2006 18:44:22 -0000 >Number: 98783 >Category: ports >Synopsis: [UPDATE] games/tenebrae: fix mouse and building in !i386 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jun 10 18:40:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 6.0-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD 6.0-RELEASE-p6 #0: Tue Apr 4 22:29:05 ART 2006 ale@phobos.mars.bsd:/usr/src/sys/i386/compile/ATHLON-PHOBOS >Description: - Fix mouse problems. - Fix sound problems. - Fix building on !i386. - Fix writting personal configuration, and do it in ~/.tenebrae, to avoid conflicts with other engines since they usually have different variables. - Use USE_DOS2UNIX. - Remove unneeded information from pkg-message (it depends on quake-data so it will be installed automatically, also quake-data installs the demo so tenebrae is playable after installation). - Use release target instead of the debug one. - Clean-up. >How-To-Repeat: >Fix: --- tenebrae.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/games/tenebrae/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 7 May 2006 23:45:36 -0000 1.6 +++ Makefile 10 Jun 2006 15:20:44 -0000 @@ -19,33 +19,32 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_ZIP= yes +USE_DOS2UNIX= yes USE_GMAKE= yes USE_GL= yes USE_SDL= yes -ONLY_FOR_ARCHS= i386 -DATADIR= ${Q1DIR} +OPTIONS= X86_ASM "Enable use of x86 assembly code" on WRKSRC= ${WRKDIR}/${PORTNAME}_0 BUILD_WRKSRC= ${WRKSRC}/linux -MAKE_ENV= DATADIR="${DATADIR}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - SDL_CONFIG="${SDL_CONFIG}" +MAKEFILE= Makefile.i386linux +MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" -.include "${.CURDIR}/../quake-data/Makefile.include" +.include -pre-patch: - @${REINPLACE_CMD} -e "s|$$(${PRINTF} '\r')||g" `${FIND} ${WRKSRC} -type f` +.if !defined(WITHOUT_X86_ASM) +MAKE_ENV+= USE_ASM=1 +.endif pre-build: - @${LN} -sf ${WRKSRC}/linux/Makefile.i386linux ${WRKSRC}/linux/Makefile + @cd ${BUILD_WRKSRC} && ${LN} -sf Makefile.i386linux Makefile do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/debugi386.glibc/bin/${PORTNAME}.run \ - ${PREFIX}/bin/${PORTNAME} - @${MKDIR} ${DATADIR} - @${MKDIR} ${DATADIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Pak0.pak ${DATADIR}/${PORTNAME} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/bin/${PORTNAME} \ + ${PREFIX}/bin + @${MKDIR} ${Q1DIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Pak0.pak ${Q1DIR}/${PORTNAME} .ifndef (NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${TR} -d '\r' <${WRKDIR}/Tenebrae_Readme.txt \ @@ -53,6 +52,10 @@ .endif post-install: + @${ECHO_CMD} @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} + +.include "${.CURDIR}/../quake-data/Makefile.include" -.include +.include Index: pkg-message =================================================================== RCS file: /home/pcvs/ports/games/tenebrae/pkg-message,v retrieving revision 1.2 diff -u -r1.2 pkg-message --- pkg-message 17 Nov 2005 11:50:32 -0000 1.2 +++ pkg-message 10 Jun 2006 15:20:44 -0000 @@ -1,4 +1,11 @@ -******************************************************************************* -* Tenebrae Quake requires data files (id1 directory) from original game. -* Before running Tenebrae install them using games/quake-data port. -******************************************************************************* +============================================================================== + +Tenebrae has been installed. + +If you hace sound problems try running it with the parameter +"-sndspeed ", where "" could be 22050 or 44100 for example. + +If you have rendering problems with water try to set the variable "r_novis" to +the value "1". + +============================================================================== Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/games/tenebrae/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 22 Feb 2006 19:48:34 -0000 1.2 +++ pkg-plist 10 Jun 2006 15:20:44 -0000 @@ -1,5 +1,5 @@ bin/tenebrae -%%DATADIR%%/tenebrae/Pak0.pak -@dirrm %%DATADIR%%/tenebrae +%%Q1DIR%%/tenebrae/Pak0.pak +@dirrm %%Q1DIR%%/tenebrae %%PORTDOCS%%%%DOCSDIR%%/Tenebrae_Readme.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-cd__linux.c =================================================================== RCS file: files/patch-cd__linux.c diff -N files/patch-cd__linux.c --- files/patch-cd__linux.c 17 Mar 2004 09:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,184 +0,0 @@ ---- cd_linux.c.orig Sun Mar 14 12:11:16 2004 -+++ cd_linux.c Sun Mar 14 12:24:07 2004 -@@ -31,7 +31,7 @@ - #include - #include - --#include -+#include - - #include "quakedef.h" - -@@ -54,8 +54,8 @@ - if (cdfile == -1 || !enabled) - return; // no cd init'd - -- if ( ioctl(cdfile, CDROMEJECT) == -1 ) -- Con_DPrintf("ioctl cdromeject failed\n"); -+ if ( ioctl(cdfile, CDIOCEJECT) == -1 ) -+ Con_DPrintf("ioctl CDIOCEJECT failed\n"); - } - - -@@ -64,30 +64,30 @@ - if (cdfile == -1 || !enabled) - return; // no cd init'd - -- if ( ioctl(cdfile, CDROMCLOSETRAY) == -1 ) -- Con_DPrintf("ioctl cdromclosetray failed\n"); -+ if ( ioctl(cdfile, CDIOCCLOSE) == -1 ) -+ Con_DPrintf("ioctl CDIOCCLOSE failed\n"); - } - - static int CDAudio_GetAudioDiskInfo(void) - { -- struct cdrom_tochdr tochdr; -+ struct ioc_toc_header tochdr; - - cdValid = false; - -- if ( ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1 ) -+ if ( ioctl(cdfile, CDIOREADTOCHEADER, &tochdr) == -1 ) - { -- Con_DPrintf("ioctl cdromreadtochdr failed\n"); -+ Con_DPrintf("ioctl CDIOREADTOCHEADER failed\n"); - return -1; - } - -- if (tochdr.cdth_trk0 < 1) -+ if (tochdr.starting_track < 1) - { - Con_DPrintf("CDAudio: no music tracks\n"); - return -1; - } - - cdValid = true; -- maxTrack = tochdr.cdth_trk1; -+ maxTrack = tochdr.ending_track; - - return 0; - } -@@ -95,8 +95,8 @@ - - void CDAudio_Play(byte track, qboolean looping) - { -- struct cdrom_tocentry entry; -- struct cdrom_ti ti; -+ struct ioc_read_toc_single_entry entry; -+ struct ioc_play_track ti; - - if (cdfile == -1 || !enabled) - return; -@@ -115,7 +115,7 @@ - Con_DPrintf("CDAudio: Bad track number %u.\n", track); - return; - } -- -+/* - // don't try to play a non-audio track - entry.cdte_track = track; - entry.cdte_format = CDROM_MSF; -@@ -129,7 +129,7 @@ - Con_Printf("CDAudio: track %i is not audio\n", track); - return; - } -- -+*/ - if (playing) - { - if (playTrack == track) -@@ -137,19 +137,19 @@ - CDAudio_Stop(); - } - -- ti.cdti_trk0 = track; -- ti.cdti_trk1 = track; -- ti.cdti_ind0 = 1; -- ti.cdti_ind1 = 99; -- -- if ( ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1 ) -+ ti.start_track = track; -+ ti.end_track = track; -+ ti.start_index = 1; -+ ti.end_index = 99; -+ -+ if ( ioctl(cdfile, CDIOCPLAYTRACKS, &ti) == -1 ) - { -- Con_DPrintf("ioctl cdromplaytrkind failed\n"); -+ Con_DPrintf("ioctl CDIOCPLAYTRACKS failed\n"); - return; - } - -- if ( ioctl(cdfile, CDROMRESUME) == -1 ) -- Con_DPrintf("ioctl cdromresume failed\n"); -+ if ( ioctl(cdfile, CDIOCRESUME) == -1 ) -+ Con_DPrintf("ioctl CDIOCRESUME failed\n"); - - playLooping = looping; - playTrack = track; -@@ -168,8 +168,8 @@ - if (!playing) - return; - -- if ( ioctl(cdfile, CDROMSTOP) == -1 ) -- Con_DPrintf("ioctl cdromstop failed (%d)\n", errno); -+ if ( ioctl(cdfile, CDIOCSTOP) == -1 ) -+ Con_DPrintf("ioctl CDIOCSTOP failed (%d)\n", errno); - - wasPlaying = false; - playing = false; -@@ -183,8 +183,8 @@ - if (!playing) - return; - -- if ( ioctl(cdfile, CDROMPAUSE) == -1 ) -- Con_DPrintf("ioctl cdrompause failed\n"); -+ if ( ioctl(cdfile, CDIOCPAUSE) == -1 ) -+ Con_DPrintf("ioctl CDIOCPAUSE failed\n"); - - wasPlaying = playing; - playing = false; -@@ -202,8 +202,8 @@ - if (!wasPlaying) - return; - -- if ( ioctl(cdfile, CDROMRESUME) == -1 ) -- Con_DPrintf("ioctl cdromresume failed\n"); -+ if ( ioctl(cdfile, CDIOCRESUME) == -1 ) -+ Con_DPrintf("ioctl CDIOCRESUME failed\n"); - playing = true; - } - -@@ -327,7 +327,8 @@ - - void CDAudio_Update(void) - { -- struct cdrom_subchnl subchnl; -+ struct ioc_read_subchannel subchnl; -+ struct cd_sub_channel_info data; - static time_t lastchk; - - if (!enabled) -@@ -351,14 +352,17 @@ - - if (playing && lastchk < time(NULL)) { - lastchk = time(NULL) + 2; //two seconds between chks -- subchnl.cdsc_format = CDROM_MSF; -- if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 ) { -- Con_DPrintf("ioctl cdromsubchnl failed\n"); -+ subchnl.data = &data; -+ subchnl.data_len = sizeof(data); -+ subchnl.address_format = CD_MSF_FORMAT; -+ subchnl.data_format = CD_CURRENT_POSITION; -+ if (ioctl(cdfile, CDIOCREADSUBCHANNEL, (char*) &subchnl) == -1 ) { -+ Con_DPrintf("ioctl CDIOCREADSUBCHANNEL failed\n"); - playing = false; - return; - } -- if (subchnl.cdsc_audiostatus != CDROM_AUDIO_PLAY && -- subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED) { -+ if (subchnl.data->header.audio_status != CD_AS_PLAY_IN_PROGRESS && -+ subchnl.data->header.audio_status != CD_AS_PLAY_PAUSED) { - playing = false; - if (playLooping) - CDAudio_Play(playTrack, true); Index: files/patch-cd_linux.c =================================================================== RCS file: files/patch-cd_linux.c diff -N files/patch-cd_linux.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-cd_linux.c 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,184 @@ +--- ./cd_linux.c.orig Sat Jun 10 12:08:13 2006 ++++ ./cd_linux.c Sat Jun 10 12:08:13 2006 +@@ -31,7 +31,7 @@ + #include + #include + +-#include ++#include + + #include "quakedef.h" + +@@ -54,8 +54,8 @@ + if (cdfile == -1 || !enabled) + return; // no cd init'd + +- if ( ioctl(cdfile, CDROMEJECT) == -1 ) +- Con_DPrintf("ioctl cdromeject failed\n"); ++ if ( ioctl(cdfile, CDIOCEJECT) == -1 ) ++ Con_DPrintf("ioctl CDIOCEJECT failed\n"); + } + + +@@ -64,30 +64,30 @@ + if (cdfile == -1 || !enabled) + return; // no cd init'd + +- if ( ioctl(cdfile, CDROMCLOSETRAY) == -1 ) +- Con_DPrintf("ioctl cdromclosetray failed\n"); ++ if ( ioctl(cdfile, CDIOCCLOSE) == -1 ) ++ Con_DPrintf("ioctl CDIOCCLOSE failed\n"); + } + + static int CDAudio_GetAudioDiskInfo(void) + { +- struct cdrom_tochdr tochdr; ++ struct ioc_toc_header tochdr; + + cdValid = false; + +- if ( ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1 ) ++ if ( ioctl(cdfile, CDIOREADTOCHEADER, &tochdr) == -1 ) + { +- Con_DPrintf("ioctl cdromreadtochdr failed\n"); ++ Con_DPrintf("ioctl CDIOREADTOCHEADER failed\n"); + return -1; + } + +- if (tochdr.cdth_trk0 < 1) ++ if (tochdr.starting_track < 1) + { + Con_DPrintf("CDAudio: no music tracks\n"); + return -1; + } + + cdValid = true; +- maxTrack = tochdr.cdth_trk1; ++ maxTrack = tochdr.ending_track; + + return 0; + } +@@ -95,8 +95,8 @@ + + void CDAudio_Play(byte track, qboolean looping) + { +- struct cdrom_tocentry entry; +- struct cdrom_ti ti; ++ struct ioc_read_toc_single_entry entry; ++ struct ioc_play_track ti; + + if (cdfile == -1 || !enabled) + return; +@@ -115,7 +115,7 @@ + Con_DPrintf("CDAudio: Bad track number %u.\n", track); + return; + } +- ++/* + // don't try to play a non-audio track + entry.cdte_track = track; + entry.cdte_format = CDROM_MSF; +@@ -129,7 +129,7 @@ + Con_Printf("CDAudio: track %i is not audio\n", track); + return; + } +- ++*/ + if (playing) + { + if (playTrack == track) +@@ -137,19 +137,19 @@ + CDAudio_Stop(); + } + +- ti.cdti_trk0 = track; +- ti.cdti_trk1 = track; +- ti.cdti_ind0 = 1; +- ti.cdti_ind1 = 99; +- +- if ( ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1 ) ++ ti.start_track = track; ++ ti.end_track = track; ++ ti.start_index = 1; ++ ti.end_index = 99; ++ ++ if ( ioctl(cdfile, CDIOCPLAYTRACKS, &ti) == -1 ) + { +- Con_DPrintf("ioctl cdromplaytrkind failed\n"); ++ Con_DPrintf("ioctl CDIOCPLAYTRACKS failed\n"); + return; + } + +- if ( ioctl(cdfile, CDROMRESUME) == -1 ) +- Con_DPrintf("ioctl cdromresume failed\n"); ++ if ( ioctl(cdfile, CDIOCRESUME) == -1 ) ++ Con_DPrintf("ioctl CDIOCRESUME failed\n"); + + playLooping = looping; + playTrack = track; +@@ -168,8 +168,8 @@ + if (!playing) + return; + +- if ( ioctl(cdfile, CDROMSTOP) == -1 ) +- Con_DPrintf("ioctl cdromstop failed (%d)\n", errno); ++ if ( ioctl(cdfile, CDIOCSTOP) == -1 ) ++ Con_DPrintf("ioctl CDIOCSTOP failed (%d)\n", errno); + + wasPlaying = false; + playing = false; +@@ -183,8 +183,8 @@ + if (!playing) + return; + +- if ( ioctl(cdfile, CDROMPAUSE) == -1 ) +- Con_DPrintf("ioctl cdrompause failed\n"); ++ if ( ioctl(cdfile, CDIOCPAUSE) == -1 ) ++ Con_DPrintf("ioctl CDIOCPAUSE failed\n"); + + wasPlaying = playing; + playing = false; +@@ -202,8 +202,8 @@ + if (!wasPlaying) + return; + +- if ( ioctl(cdfile, CDROMRESUME) == -1 ) +- Con_DPrintf("ioctl cdromresume failed\n"); ++ if ( ioctl(cdfile, CDIOCRESUME) == -1 ) ++ Con_DPrintf("ioctl CDIOCRESUME failed\n"); + playing = true; + } + +@@ -327,7 +327,8 @@ + + void CDAudio_Update(void) + { +- struct cdrom_subchnl subchnl; ++ struct ioc_read_subchannel subchnl; ++ struct cd_sub_channel_info data; + static time_t lastchk; + + if (!enabled) +@@ -351,14 +352,17 @@ + + if (playing && lastchk < time(NULL)) { + lastchk = time(NULL) + 2; //two seconds between chks +- subchnl.cdsc_format = CDROM_MSF; +- if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 ) { +- Con_DPrintf("ioctl cdromsubchnl failed\n"); ++ subchnl.data = &data; ++ subchnl.data_len = sizeof(data); ++ subchnl.address_format = CD_MSF_FORMAT; ++ subchnl.data_format = CD_CURRENT_POSITION; ++ if (ioctl(cdfile, CDIOCREADSUBCHANNEL, (char*) &subchnl) == -1 ) { ++ Con_DPrintf("ioctl CDIOCREADSUBCHANNEL failed\n"); + playing = false; + return; + } +- if (subchnl.cdsc_audiostatus != CDROM_AUDIO_PLAY && +- subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED) { ++ if (subchnl.data->header.audio_status != CD_AS_PLAY_IN_PROGRESS && ++ subchnl.data->header.audio_status != CD_AS_PLAY_PAUSED) { + playing = false; + if (playLooping) + CDAudio_Play(playTrack, true); Index: files/patch-common.c =================================================================== RCS file: /home/pcvs/ports/games/tenebrae/files/patch-common.c,v retrieving revision 1.1 diff -u -r1.1 patch-common.c --- files/patch-common.c 17 Mar 2004 09:30:31 -0000 1.1 +++ files/patch-common.c 10 Jun 2006 15:20:44 -0000 @@ -1,11 +1,13 @@ ---- common.c.orig Sun Mar 14 13:16:07 2004 -+++ common.c Sun Mar 14 13:17:40 2004 -@@ -2221,6 +2221,8 @@ +--- ./common.c.orig Sat Jun 10 12:08:13 2006 ++++ ./common.c Sat Jun 10 12:08:13 2006 +@@ -2221,7 +2221,10 @@ if ((userdir[j-1] == '\\') || (userdir[j-1] == '/')) userdir[j-1] = 0; } + + strncpy (com_prefdir, userdir, j); COM_AddGameFS (userdir); ++ Sys_mkdir(com_gamedir); #endif + Index: files/patch-common.h =================================================================== RCS file: /home/pcvs/ports/games/tenebrae/files/patch-common.h,v retrieving revision 1.1 diff -u -r1.1 patch-common.h --- files/patch-common.h 17 Mar 2004 09:30:31 -0000 1.1 +++ files/patch-common.h 10 Jun 2006 15:20:44 -0000 @@ -1,5 +1,5 @@ ---- common.h.orig Sun Mar 14 13:19:04 2004 -+++ common.h Sun Mar 14 13:19:50 2004 +--- ./common.h.orig Sat Jun 10 12:08:13 2006 ++++ ./common.h Sat Jun 10 12:08:13 2006 @@ -169,6 +169,10 @@ extern char com_gamedir[MAX_OSPATH]; Index: files/patch-gl__common.c =================================================================== RCS file: files/patch-gl__common.c diff -N files/patch-gl__common.c --- files/patch-gl__common.c 17 Mar 2004 09:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ ---- gl_common.c.orig Sun Mar 14 12:33:12 2004 -+++ gl_common.c Sun Mar 14 12:35:26 2004 -@@ -248,11 +248,11 @@ - if (!strstr(gl_extensions, "GL_ARB_texture_env_dot3")) { - Sys_Error ("ARB_texture_env_dot3 not found.\nProbably your 3d-card is not supported.\n"); - } -- -+#if 0 - if (!strstr(gl_extensions, "GL_ARB_texture_cube_map")) { - Sys_Error ("ARB_texture_cube_map not found.\nProbably your 3d-card is not supported.\n"); - } -- -+#endif - //Just spit a warning user prob has gl-1.2 or something - if (!strstr(gl_extensions, "GL_SGI_texture_edge_clamp") && - !strstr(gl_extensions, "GL_EXT_texture_edge_clamp")) { Index: files/patch-gl__vidlinuxglx.c =================================================================== RCS file: files/patch-gl__vidlinuxglx.c diff -N files/patch-gl__vidlinuxglx.c --- files/patch-gl__vidlinuxglx.c 17 Mar 2004 09:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- gl_vidlinuxglx.c.orig Sun Mar 14 12:27:06 2004 -+++ gl_vidlinuxglx.c Sun Mar 14 12:27:21 2004 -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - #include - #include - #include Index: files/patch-gl_common.c =================================================================== RCS file: files/patch-gl_common.c diff -N files/patch-gl_common.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-gl_common.c 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,16 @@ +--- ./gl_common.c.orig Sat Jun 10 12:08:13 2006 ++++ ./gl_common.c Sat Jun 10 12:08:13 2006 +@@ -248,11 +248,11 @@ + if (!strstr(gl_extensions, "GL_ARB_texture_env_dot3")) { + Sys_Error ("ARB_texture_env_dot3 not found.\nProbably your 3d-card is not supported.\n"); + } +- ++#if 0 + if (!strstr(gl_extensions, "GL_ARB_texture_cube_map")) { + Sys_Error ("ARB_texture_cube_map not found.\nProbably your 3d-card is not supported.\n"); + } +- ++#endif + //Just spit a warning user prob has gl-1.2 or something + if (!strstr(gl_extensions, "GL_SGI_texture_edge_clamp") && + !strstr(gl_extensions, "GL_EXT_texture_edge_clamp")) { Index: files/patch-gl_vidlinuxglx.c =================================================================== RCS file: files/patch-gl_vidlinuxglx.c diff -N files/patch-gl_vidlinuxglx.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-gl_vidlinuxglx.c 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,19 @@ +--- ./gl_vidlinuxglx.c.orig Sat Jun 10 12:08:13 2006 ++++ ./gl_vidlinuxglx.c Sat Jun 10 12:08:13 2006 +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -339,8 +338,6 @@ + { + mx += ((int)event.xmotion.x - mwx) * 2; + my += ((int)event.xmotion.y - mwy) * 2; +- mwx = event.xmotion.x; +- mwy = event.xmotion.y; + + if (mx || my) + dowarp = true; Index: files/patch-glquake.h =================================================================== RCS file: /home/pcvs/ports/games/tenebrae/files/patch-glquake.h,v retrieving revision 1.1 diff -u -r1.1 patch-glquake.h --- files/patch-glquake.h 14 Dec 2004 23:17:28 -0000 1.1 +++ files/patch-glquake.h 10 Jun 2006 15:20:44 -0000 @@ -1,8 +1,5 @@ - -$FreeBSD: ports/games/tenebrae/files/patch-glquake.h,v 1.1 2004/12/14 23:17:28 lesi Exp $ - ---- glquake.h.orig -+++ glquake.h +--- ./glquake.h.orig Sat Jun 10 12:08:13 2006 ++++ ./glquake.h Sat Jun 10 12:08:13 2006 @@ -419,8 +419,8 @@ void R_TranslatePlayerSkin (int playernum); void GL_Bind (int texnum); Index: files/patch-linux_Makefile.i386linux =================================================================== RCS file: files/patch-linux_Makefile.i386linux diff -N files/patch-linux_Makefile.i386linux --- files/patch-linux_Makefile.i386linux 17 Mar 2004 09:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,80 +0,0 @@ ---- linux/Makefile.i386linux.orig Sun Mar 14 15:07:08 2004 -+++ linux/Makefile.i386linux Sun Mar 14 17:54:02 2004 -@@ -18,30 +18,30 @@ - - MOUNT_DIR = ../ - --MASTER_DIR = /usr/local/share/games/quake -+MASTER_DIR = ${DATADIR} - - BUILD_DEBUG_DIR = debug$(ARCH)$(GLIBC) - BUILD_RELEASE_DIR = release$(ARCH)$(GLIBC) - --LEX = /usr/bin/flex -i -Cfr --CC = /usr/bin/gcc -+LEX ?= /usr/bin/flex -i -Cfr -+#CC = /usr/bin/gcc - --X11_LIBS = -L/usr/X11R6/lib -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm -+X11_LIBS = -L${X11BASE}/lib ${PTHREAD_LIBS} -lX11 -lXext -lXxf86dga -lXxf86vm - - # to enable OpenGL code in source --OPENGL_CFLAGS = -D__glx__ -DGLQUAKE -+OPENGL_CFLAGS = -D__glx__ -DGLQUAKE -I${X11BASE}/include - OPENGL_LIBS = -lGL -lGLU - --PNG_LIBS = -lpng -lz -+PNG_LIBS = -L${LOCALBASE}/lib -lpng -lz - - #OPENAL_LIBS = -lopenal --#OPENAL_CFLAGS = -DOPENAL -I/usr/local/include/AL -+#OPENAL_CFLAGS = -DOPENAL -I${LOCALBASE}/include/AL - --BASE_CFLAGS = -DBASEDIR="$(MASTER_DIR)" -DUSERPREF_DIR $(OPENGL_CFLAGS) $(OPENAL_CFLAGS) -I$(MOUNT_DIR) --RELEASE_CFLAGS = $(BASE_CFLAGS) -mpentiumpro -O6 -ffast-math -funroll-loops \ -+BASE_CFLAGS = -DBASEDIR="$(MASTER_DIR)" -DUSERPREF_DIR $(OPENGL_CFLAGS) $(OPENAL_CFLAGS) -I$(MOUNT_DIR) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -+RELEASE_CFLAGS = $(BASE_CFLAGS) -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - DEBUG_CFLAGS = $(BASE_CFLAGS) -g --LDFLAGS = -lm -ldl $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) -+LDFLAGS = -lm $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) `${SDL_CONFIG} --libs` - - DO_GL_CC = $(CC) $(CFLAGS) -o $@ -c $< - DO_GL_AS = $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< -@@ -57,15 +57,15 @@ - @-mkdir -p $(BUILD_DEBUG_DIR) \ - $(BUILD_DEBUG_DIR)/bin \ - $(BUILD_DEBUG_DIR)/glquake -- $(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)" -+ $(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS+="$(DEBUG_CFLAGS)" - - build_release: - @-mkdir -p $(BUILD_RELEASE_DIR) \ - $(BUILD_RELEASE_DIR)/bin \ - $(BUILD_RELEASE_DIR)/glquake -- $(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)" -+ $(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS+="$(RELEASE_CFLAGS)" - --all: build_debug build_release -+all: build_debug - - targets: $(TARGETS) - -@@ -143,7 +143,7 @@ - $(BUILDDIR)/glquake/snd_dma.o \ - $(BUILDDIR)/glquake/snd_mem.o \ - $(BUILDDIR)/glquake/snd_mix.o \ -- $(BUILDDIR)/glquake/snd_linux.o \ -+ $(BUILDDIR)/glquake/snd_sdl.o \ - $(BUILDDIR)/glquake/gl_vidlinuxglx.o \ - $(BUILDDIR)/glquake/math.o \ - $(BUILDDIR)/glquake/worlda.o \ -@@ -361,7 +361,7 @@ - $(BUILDDIR)/glquake/snd_mix.o : $(MOUNT_DIR)/snd_mix.c - $(DO_GL_CC) - --$(BUILDDIR)/glquake/snd_linux.o : $(MOUNT_DIR)/snd_linux.c -+$(BUILDDIR)/glquake/snd_sdl.o : $(MOUNT_DIR)/snd_sdl.c - $(DO_GL_CC) - - $(BUILDDIR)/glquake/math.o : $(MOUNT_DIR)/math.s Index: files/patch-linux__Makefile.i386linux =================================================================== RCS file: files/patch-linux__Makefile.i386linux diff -N files/patch-linux__Makefile.i386linux --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-linux__Makefile.i386linux 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,108 @@ +--- ./linux/Makefile.i386linux.orig Sat Jun 10 12:08:13 2006 ++++ ./linux/Makefile.i386linux Sat Jun 10 12:12:17 2006 +@@ -18,56 +18,60 @@ + + MOUNT_DIR = ../ + +-MASTER_DIR = /usr/local/share/games/quake ++MASTER_DIR = ${Q1DIR} + + BUILD_DEBUG_DIR = debug$(ARCH)$(GLIBC) +-BUILD_RELEASE_DIR = release$(ARCH)$(GLIBC) ++BUILD_RELEASE_DIR = release + +-LEX = /usr/bin/flex -i -Cfr +-CC = /usr/bin/gcc ++LEX ?= /usr/bin/flex -i -Cfr ++#CC = /usr/bin/gcc + +-X11_LIBS = -L/usr/X11R6/lib -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm ++X11_LIBS = -L${X11BASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm + + # to enable OpenGL code in source +-OPENGL_CFLAGS = -D__glx__ -DGLQUAKE ++OPENGL_CFLAGS = -D__glx__ -DGLQUAKE -I${X11BASE}/include + OPENGL_LIBS = -lGL -lGLU + +-PNG_LIBS = -lpng -lz ++PNG_LIBS = -L${LOCALBASE}/lib -lpng -lz + + #OPENAL_LIBS = -lopenal +-#OPENAL_CFLAGS = -DOPENAL -I/usr/local/include/AL ++#OPENAL_CFLAGS = -DOPENAL -I${LOCALBASE}/include/AL + +-BASE_CFLAGS = -DBASEDIR="$(MASTER_DIR)" -DUSERPREF_DIR $(OPENGL_CFLAGS) $(OPENAL_CFLAGS) -I$(MOUNT_DIR) +-RELEASE_CFLAGS = $(BASE_CFLAGS) -mpentiumpro -O6 -ffast-math -funroll-loops \ ++BASE_CFLAGS = -DBASEDIR="$(MASTER_DIR)" -DUSERPREF_DIR $(OPENGL_CFLAGS) $(OPENAL_CFLAGS) -I$(MOUNT_DIR) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ++RELEASE_CFLAGS = $(BASE_CFLAGS) -ffast-math -funroll-loops \ + -fomit-frame-pointer -fexpensive-optimizations + DEBUG_CFLAGS = $(BASE_CFLAGS) -g +-LDFLAGS = -lm -ldl $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) ++LDFLAGS += -lm $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) `${SDL_CONFIG} --libs` + + DO_GL_CC = $(CC) $(CFLAGS) -o $@ -c $< + DO_GL_AS = $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< + DO_LEX = $(LEX) -o$@ $< + ++ifdef USE_ASM ++BASE_CFLAGS += -DUSE_ASM ++endif ++ + ############################################################################# + # SETUP AND BUILD + ############################################################################# + +-TARGETS=$(BUILDDIR)/bin/tenebrae.run ++TARGETS=$(BUILDDIR)/bin/tenebrae ++ ++all: build_release ++ ++targets: $(TARGETS) + + build_debug: + @-mkdir -p $(BUILD_DEBUG_DIR) \ + $(BUILD_DEBUG_DIR)/bin \ + $(BUILD_DEBUG_DIR)/glquake +- $(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)" ++ $(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS+="$(DEBUG_CFLAGS)" + + build_release: + @-mkdir -p $(BUILD_RELEASE_DIR) \ + $(BUILD_RELEASE_DIR)/bin \ + $(BUILD_RELEASE_DIR)/glquake +- $(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)" +- +-all: build_debug build_release +- +-targets: $(TARGETS) ++ $(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS+="$(RELEASE_CFLAGS)" + + ############################################################################# + # GLQuake +@@ -143,7 +147,7 @@ + $(BUILDDIR)/glquake/snd_dma.o \ + $(BUILDDIR)/glquake/snd_mem.o \ + $(BUILDDIR)/glquake/snd_mix.o \ +- $(BUILDDIR)/glquake/snd_linux.o \ ++ $(BUILDDIR)/glquake/snd_sdl.o \ + $(BUILDDIR)/glquake/gl_vidlinuxglx.o \ + $(BUILDDIR)/glquake/math.o \ + $(BUILDDIR)/glquake/worlda.o \ +@@ -154,7 +158,7 @@ + $(BUILDDIR)/glquake/te_scripts.o + + +-$(BUILDDIR)/bin/tenebrae.run : $(GLQUAKE_OBJS) ++$(BUILDDIR)/bin/tenebrae : $(GLQUAKE_OBJS) + $(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(LDFLAGS) + + $(BUILDDIR)/glquake/cl_demo.o : $(MOUNT_DIR)/cl_demo.c +@@ -361,7 +365,7 @@ + $(BUILDDIR)/glquake/snd_mix.o : $(MOUNT_DIR)/snd_mix.c + $(DO_GL_CC) + +-$(BUILDDIR)/glquake/snd_linux.o : $(MOUNT_DIR)/snd_linux.c ++$(BUILDDIR)/glquake/snd_sdl.o : $(MOUNT_DIR)/snd_sdl.c + $(DO_GL_CC) + + $(BUILDDIR)/glquake/math.o : $(MOUNT_DIR)/math.s Index: files/patch-net.h =================================================================== RCS file: /home/pcvs/ports/games/tenebrae/files/patch-net.h,v retrieving revision 1.1 diff -u -r1.1 patch-net.h --- files/patch-net.h 17 Mar 2004 09:30:31 -0000 1.1 +++ files/patch-net.h 10 Jun 2006 15:20:44 -0000 @@ -1,5 +1,5 @@ ---- net.h.orig Wed Mar 17 10:25:22 2004 -+++ net.h Wed Mar 17 10:25:37 2004 +--- ./net.h.orig Sat Jun 10 12:08:13 2006 ++++ ./net.h Sat Jun 10 12:08:13 2006 @@ -239,7 +239,7 @@ extern int hostCacheCount; extern hostcache_t hostcache[HOSTCACHESIZE]; Index: files/patch-quakeasm.h =================================================================== RCS file: files/patch-quakeasm.h diff -N files/patch-quakeasm.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-quakeasm.h 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,11 @@ +--- ./quakeasm.h.orig Sat Jun 10 12:08:13 2006 ++++ ./quakeasm.h Sat Jun 10 12:08:13 2006 +@@ -31,7 +31,7 @@ + + #endif + +-#ifdef __i386__ ++#if defined(__i386__) && defined(USE_ASM) + #define id386 1 + #else + #define id386 0 Index: files/patch-quakedef.h =================================================================== RCS file: files/patch-quakedef.h diff -N files/patch-quakedef.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-quakedef.h 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,14 @@ +--- ./quakedef.h.orig Sat Jun 10 12:08:13 2006 ++++ ./quakedef.h Sat Jun 10 12:08:13 2006 +@@ -74,11 +74,6 @@ + + #endif + +-//PENTA: win32 we use assembler +-#if defined(_WIN32) || defined __glx__ +-#define USE_ASM 1 +-#endif +- + #if defined(__i386__) && defined(USE_ASM) + #define id386 1 + #else Index: files/patch-snd__linux.c =================================================================== RCS file: files/patch-snd__linux.c diff -N files/patch-snd__linux.c --- files/patch-snd__linux.c 17 Mar 2004 09:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- snd_linux.c.orig Sun Mar 14 12:25:10 2004 -+++ snd_linux.c Sun Mar 14 12:25:46 2004 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include "quakedef.h" - Index: files/patch-snd__sdl.c =================================================================== RCS file: files/patch-snd__sdl.c diff -N files/patch-snd__sdl.c --- files/patch-snd__sdl.c 17 Mar 2004 09:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ ---- snd_sdl.c.orig Sun Mar 14 17:59:19 2004 -+++ snd_sdl.c Sun Mar 14 17:59:35 2004 -@@ -119,3 +119,12 @@ - } - } - -+/* -+============== -+SNDDMA_Submit -+Send sound to device if buffer isn't really the dma buffer -+=============== -+*/ -+void SNDDMA_Submit(void) -+{ -+} Index: files/patch-snd_sdl.c =================================================================== RCS file: files/patch-snd_sdl.c diff -N files/patch-snd_sdl.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-snd_sdl.c 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,24 @@ +--- ./snd_sdl.c.orig Sat Jun 10 12:08:13 2006 ++++ ./snd_sdl.c Sat Jun 10 12:08:13 2006 +@@ -94,7 +94,7 @@ + shm = &the_shm; + shm->splitbuffer = 0; + shm->samplebits = (obtained.format & 0xFF); +- shm->speed = obtained.freq; ++ shm->speed = desired.freq; + shm->channels = obtained.channels; + shm->samples = obtained.samples*shm->channels; + shm->samplepos = 0; +@@ -119,3 +119,12 @@ + } + } + ++/* ++============== ++SNDDMA_Submit ++Send sound to device if buffer isn't really the dma buffer ++=============== ++*/ ++void SNDDMA_Submit(void) ++{ ++} Index: files/patch-sys__uxfindfirst.c =================================================================== RCS file: files/patch-sys__uxfindfirst.c diff -N files/patch-sys__uxfindfirst.c --- files/patch-sys__uxfindfirst.c 17 Mar 2004 09:30:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- sys_uxfindfirst.c.orig Sun Mar 14 15:00:09 2004 -+++ sys_uxfindfirst.c Sun Mar 14 15:06:52 2004 -@@ -36,7 +36,7 @@ - #include "quakedef.h" - #include - --#if !defined(__GLIBC__) -+#if !defined(__GLIBC__) && !defined(__FreeBSD__) - - #include - #include Index: files/patch-sys_dosa.s =================================================================== RCS file: files/patch-sys_dosa.s diff -N files/patch-sys_dosa.s --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-sys_dosa.s 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,15 @@ +--- ./sys_dosa.s.orig Sat Jun 10 12:08:13 2006 ++++ ./sys_dosa.s Sat Jun 10 12:08:13 2006 +@@ -5,6 +5,7 @@ + #include "asm_i386.h" + #include "quakeasm.h" + ++#if id386 + + .data + +@@ -93,3 +94,4 @@ + + ret + ++#endif Index: files/patch-sys_linux.c =================================================================== RCS file: files/patch-sys_linux.c diff -N files/patch-sys_linux.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-sys_linux.c 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,11 @@ +--- ./sys_linux.c.orig Sat Jun 10 12:08:13 2006 ++++ ./sys_linux.c Sat Jun 10 12:08:13 2006 +@@ -27,7 +27,7 @@ + // user preference directory + + #if defined (USERPREF_DIR) +-char *prefdir= ".quake"; ++char *prefdir= ".tenebrae"; + #endif + + #if defined (BASEDIR) Index: files/patch-sys_uxfindfirst.c =================================================================== RCS file: files/patch-sys_uxfindfirst.c diff -N files/patch-sys_uxfindfirst.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-sys_uxfindfirst.c 10 Jun 2006 15:20:44 -0000 @@ -0,0 +1,11 @@ +--- ./sys_uxfindfirst.c.orig Sat Jun 10 12:08:13 2006 ++++ ./sys_uxfindfirst.c Sat Jun 10 12:08:13 2006 +@@ -36,7 +36,7 @@ + #include "quakedef.h" + #include + +-#if !defined(__GLIBC__) ++#if !defined(__GLIBC__) && !defined(__FreeBSD__) + + #include + #include --- tenebrae.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: