packages: quake2forge/quake2forge-fix.patch, quake2forge/quake2forge-stupid...

glen glen at pld-linux.org
Sun Jan 31 21:39:23 CET 2010 

Author: glen                         Date: Sun Jan 31 20:39:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.3.1 svn r11886

---- Files affected:
packages/quake2forge:
   quake2forge-fix.patch (1.1 -> 1.2) , quake2forge-stupid_nvidia_bug.patch (1.1 -> 1.2) , quake2forge.spec (1.82 -> 1.83) , quake2forge-gamedir.patch (1.1 -> NONE)  (REMOVED), quake2forge-missionpacks.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/quake2forge/quake2forge-fix.patch
diff -u packages/quake2forge/quake2forge-fix.patch:1.1 packages/quake2forge/quake2forge-fix.patch:1.2
--- packages/quake2forge/quake2forge-fix.patch:1.1	Sat Apr 28 14:02:26 2007
+++ packages/quake2forge/quake2forge-fix.patch	Sun Jan 31 21:39:18 2010
@@ -12,36 +12,25 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <errno.h>
---- quake2-0.3/src/gl_fxmesa.c.orig	2007-04-28 13:39:07.868871000 +0200
-+++ quake2-0.3/src/gl_fxmesa.c	2007-04-28 13:48:27.456760766 +0200
-@@ -190,7 +190,7 @@ int GLimp_SetMode( unsigned int *pwidth,
- 
- 	ri.Con_Printf (PRINT_ALL, "...setting mode %d:", mode );
- 
--	if ( !ri.Vid_GetModeInfo( &width, &height, mode ) )
-+	if ( !ri.Vid_GetModeInfo( (unsigned int *)&width, (unsigned int *)&height, mode ) )
- 	{
- 		ri.Con_Printf( PRINT_ALL, " invalid mode\n" );
+--- quake2-0.3.1/src/gl_fxmesa.c~	2010-01-31 21:30:28.000000000 +0200
++++ quake2-0.3.1/src/gl_fxmesa.c	2010-01-31 21:31:31.414537554 +0200
+@@ -186,7 +186,7 @@
+ 	
+ 	ri.Con_Printf(PRINT_ALL, "...setting mode %d:", mode);
+ 	
+-	if( !ri.Vid_GetModeInfo( &width, &height, mode)){
++	if( !ri.Vid_GetModeInfo( (unsigned int *)&width, (unsigned int *)&height, mode)){
+ 		ri.Con_Printf( PRINT_ALL, " invalid mode\n");
  		return rserr_invalid_mode;
---- quake2-0.3/src/snd_ao.c.orig	2004-03-15 03:25:43.000000000 +0100
-+++ quake2-0.3/src/snd_ao.c	2007-04-28 13:50:31.543832086 +0200
-@@ -157,7 +157,7 @@ void SNDDMA_Submit(void) {
-     /* ao_play returns success, not number of samples successfully output
-      * unlike alsa or arts, so we can only assume that the whole buffer
-      * made it out... though this makes updating si->dma->samplepos easy */
--    if (ao_play(device, si->dma->buffer, si->dma->samples * samplesize) == 0) {
-+    if (ao_play(device, (char *)si->dma->buffer, si->dma->samples * samplesize) == 0) {
- 	Com_Printf("W: error occurred while playing buffer\n");
- 	ao_close(device);
- 	ao_shutdown();
---- quake2-0.3/src/snd_alsa.c.orig	2004-03-15 03:25:43.000000000 +0100
-+++ quake2-0.3/src/snd_alsa.c	2007-04-28 13:51:39.407699427 +0200
-@@ -101,7 +101,7 @@ qboolean SNDDMA_Init(struct sndinfo * s)
-     if (!si->dma->speed) {
- 	for (i = 0; i < sizeof(tryrates); i++) {
- 	    int dir = 0;
--	    int test = tryrates[i];
-+	    unsigned int test = tryrates[i];
- 
- 	    if ((err = snd_pcm_hw_params_set_rate_near(pcm_handle, hw_params,
- 						       &test, &dir)) < 0) {
+ 	}
+--- quake2-0.3.1/src/snd_ao.c~	2010-01-31 16:54:57.000000000 +0200
++++ quake2-0.3.1/src/snd_ao.c	2010-01-31 21:32:28.668015776 +0200
+@@ -157,7 +157,7 @@
+ 	/* ao_play returns success, not number of samples successfully output
+ 	 * unlike alsa or arts, so we can only assume that the whole buffer
+ 	 * made it out... though this makes updating si->dma->samplepos easy */
+-	if(ao_play(device, si->dma->buffer, si->dma->samples * samplesize) == 0){
++	if(ao_play(device, (char *)si->dma->buffer, si->dma->samples * samplesize) == 0){
+ 		Com_Printf("W: error occurred while playing buffer\n");
+ 		ao_close(device);
+ 		ao_shutdown();

================================================================
Index: packages/quake2forge/quake2forge-stupid_nvidia_bug.patch
diff -u packages/quake2forge/quake2forge-stupid_nvidia_bug.patch:1.1 packages/quake2forge/quake2forge-stupid_nvidia_bug.patch:1.2
--- packages/quake2forge/quake2forge-stupid_nvidia_bug.patch:1.1	Sun Oct  5 16:01:15 2003
+++ packages/quake2forge/quake2forge-stupid_nvidia_bug.patch	Sun Jan 31 21:39:18 2010
@@ -1,24 +1,25 @@
---- src/files.c~	2002-12-23 09:15:00.000000000 +0100
-+++ src/files.c	2003-10-05 15:58:04.000000000 +0200
-@@ -630,6 +630,7 @@
- void FS_SetGamedir (char *dir)
- {
+--- quake2-0.3/src/files.c~	2010-01-31 16:54:57.000000000 +0200
++++ quake2-0.3/src/files.c	2010-01-31 21:27:32.244572453 +0200
+@@ -668,6 +668,7 @@
+ */
+ void FS_SetGamedir(char *dir){
  	searchpath_t	*next;
 +	cvar_t *cv;
- 
- 	if (strstr(dir, "..") || strstr(dir, "/")
- 		|| strstr(dir, "\\") || strstr(dir, ":") )
-@@ -654,10 +655,12 @@
+ 	
+ 	if(strstr(dir, "..") || strstr(dir, "/")
+ 			|| strstr(dir, "\\") || strstr(dir, ":")){
+@@ -688,11 +689,13 @@
+ 		Z_Free(fs_searchpaths);
  		fs_searchpaths = next;
  	}
- 
-+	cv = Cvar_Get ("stupid_nvidia_bug", "0", 0);
 +
++	cv = Cvar_Get ("stupid_nvidia_bug", "0", 0);
+ 	
  	//
  	// flush all data, so it will be forced to reload
  	//
--	if (dedicated && !dedicated->value)
-+	if (dedicated && !dedicated->value && !cv->value)
- 		Cbuf_AddText ("vid_restart\nsnd_restart\n");
- 
- 	// now add new entries for 
+-	if(dedicated && !dedicated->value)
++	if(dedicated && !dedicated->value && !cv->value)
+ 		Cbuf_AddText("vid_restart\nsnd_restart\n");
+ 		
+ 	// now add new entries for

================================================================
Index: packages/quake2forge/quake2forge.spec
diff -u packages/quake2forge/quake2forge.spec:1.82 packages/quake2forge/quake2forge.spec:1.83
--- packages/quake2forge/quake2forge.spec:1.82	Thu Apr 10 21:45:35 2008
+++ packages/quake2forge/quake2forge.spec	Sun Jan 31 21:39:18 2010
@@ -6,17 +6,21 @@
 %bcond_with	rogue	# with Rogue ("Ground Zero") Mission Pack  (non-distributable package)
 %bcond_with	xatrix	# with Xatrix ("The Reckoning") Mission Pack  (non-distributable package)
 #
+%define		svnrev	11886
+%define		rel		0.1
 Summary:	Quake2Forge - improved version of id Software's classic Quake II engine
 Summary(pl.UTF-8):	Quake2Forge - ulepszona wersja klasycznego silnika Quake II firmy id Software
 Name:		quake2forge
-Version:	0.3
-Release:	3
+Version:	0.3.1
+Release:	0.%{svnrev}.%{rel}
 License:	GPL (for main code only)
 Group:		Applications/Games
 # http://dl.sourceforge.net/quake/quake2-%{version}.tar.gz [but no 0.3 yet]
 # ftp://ftp.quakeforge.net/quake2forge/quake2-%{version}.tar.gz [dead]
-Source0:	quake2-%{version}.tar.gz
-# Source0-md5:	2c167ff7edce20f0240316b98a1e4515
+# svn co -q https://quake.svn.sourceforge.net/svnroot/quake/quake2/trunk quake2-0.3.1
+# tar -cjf quake2-0.3.1-r$(svnversion quake2).tar.bz2 --exclude=.svn quake2-0.3.1
+Source0:	quake2-%{version}-r%{svnrev}.tar.bz2
+# Source0-md5:	d95b5bb394d40c4a6121f63cab9bca77
 #Source1:	multiplay pack (need to check licence)
 # ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full.exe
 Source2:	%{name}-server.conf
@@ -35,10 +39,10 @@
 Patch1:		%{name}-gl.patch
 Patch2:		%{name}-ac.patch
 Patch3:		%{name}-fix.patch
-Patch4:		%{name}-gamedir.patch
-Patch5:		%{name}-missionpacks.patch
 Patch6:		%{name}-rogue-fix.patch
 Patch7:		%{name}-xatrix-fix.patch
+Patch8:		xf86dga.h-obsolete.patch
+Patch9:		ignore-warning.patch
 URL:		http://www.quakeforge.net/
 BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	SDL-devel
@@ -283,12 +287,10 @@
 
 %prep
 %setup -q -n quake2-%{version}
-%patch0
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %if %{with rogue}
 cd src/rogue
@@ -305,6 +307,8 @@
 cd ../..
 %patch7 -p1
 %endif
+%patch8 -p1
+%patch9 -p1
 
 %build
 %{__libtoolize}
@@ -332,18 +336,18 @@
 	$RPM_BUILD_ROOT{/etc/sysconfig,/etc/rc.d/init.d} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_gamehomedir}/.quake2/baseq2/server.cfg
-install %{SOURCE7} $RPM_BUILD_ROOT%{_gamehomedir}/.screenrc
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/q2ded
-install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/q2ded
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_gamehomedir}/.quake2/baseq2/server.cfg
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_gamehomedir}/.screenrc
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/q2ded
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/q2ded
 
 %if %{with rogue}
-install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-rogue.desktop
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-rogue.desktop
 %endif
 %if %{with xatrix}
-install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-xatrix.desktop
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-xatrix.desktop
 %endif
 
 rm -rf _doc
@@ -481,6 +485,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2010/01/31 20:39:18  glen
+- up to 0.3.1 svn r11886
+
 Revision 1.82  2008/04/10 19:45:35  tommat
 - hack, disable Werror for sparcs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quake2forge/quake2forge-fix.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quake2forge/quake2forge-stupid_nvidia_bug.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quake2forge/quake2forge.spec?r1=1.82&r2=1.83&f=u

More information about the pld-cvs-commit mailing list