rpms/nexuiz/F-12 nexuiz-2.5.2-watercrash.patch, NONE, 1.1 nexuiz.spec, 1.35, 1.36
Jon Ciesla
limb at fedoraproject.org
Wed Dec 16 16:43:34 UTC 2009
Author: limb
Update of /cvs/pkgs/rpms/nexuiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18775
Modified Files:
nexuiz.spec
Added Files:
nexuiz-2.5.2-watercrash.patch
Log Message:
Crash fix.
nexuiz-2.5.2-watercrash.patch:
gl_rmain.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE nexuiz-2.5.2-watercrash.patch ---
--- gl_rmain.c (revision 9279)
+++ gl_rmain.c (revision 9280)
@@ -3709,14 +3709,14 @@
r_waterstate.textureheight = textureheight;
}
- // when doing a reduced render (HDR) we want to use a smaller area
- r_waterstate.waterwidth = (int)bound(1, r_refdef.view.width * r_water_resolutionmultiplier.value, r_refdef.view.width);
- r_waterstate.waterheight = (int)bound(1, r_refdef.view.height * r_water_resolutionmultiplier.value, r_refdef.view.height);
-
if (r_waterstate.waterwidth)
{
r_waterstate.enabled = true;
+ // when doing a reduced render (HDR) we want to use a smaller area
+ r_waterstate.waterwidth = (int)bound(1, r_refdef.view.width * r_water_resolutionmultiplier.value, r_refdef.view.width);
+ r_waterstate.waterheight = (int)bound(1, r_refdef.view.height * r_water_resolutionmultiplier.value, r_refdef.view.height);
+
// set up variables that will be used in shader setup
r_waterstate.screenscale[0] = 0.5f * (float)r_waterstate.waterwidth / (float)r_waterstate.texturewidth;
r_waterstate.screenscale[1] = 0.5f * (float)r_waterstate.waterheight / (float)r_waterstate.textureheight;
Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/F-12/nexuiz.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nexuiz.spec 4 Dec 2009 15:33:54 -0000 1.35
+++ nexuiz.spec 16 Dec 2009 16:43:34 -0000 1.36
@@ -3,7 +3,7 @@
Summary: Multiplayer, deathmatch oriented first person shooter
Name: nexuiz
Version: 2.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Amusements/Games
URL: http://www.nexuiz.com/
@@ -15,6 +15,7 @@ Source1: %{name}.desktop
Source10: darkplaces-quake.sh
Source11: darkplaces-quake.autodlrc
Source12: darkplaces-quake.desktop
+Patch0: nexuiz-2.5.2-watercrash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# For the .ico extraction
BuildRequires: ImageMagick, file
@@ -92,6 +93,7 @@ DarkPlaces server required for hosting m
%{__sed} -i 's/\r//' darkplaces.txt
%{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc
+%patch0 -p0
%build
export DP_FS_BASEDIR=%{_datadir}/nexuiz
@@ -217,6 +219,9 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Wed Dec 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.5.2-2
+- patch to fix crash, BZ 540742.
+
* Mon Oct 12 2009 Jon Ciesla <limb at jcomserv.net> - 2.5.2-1
- Update to 2.5.2, BZ 528356.
- Derive icon from .xpm instead of .ico to satisfy new ImageMagick.
More information about the fedora-extras-commits
mailing list