r1312 - in packages/branches/nexuiz/nexuiz-2.0/debian: . patches

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2006-08-05 14:55:49 +0000 (Sat, 05 Aug 2006)
New Revision: 1312

Added:
   packages/branches/nexuiz/nexuiz-2.0/debian/patches/
   packages/branches/nexuiz/nexuiz-2.0/debian/patches/00list
   packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_crash_after_screenshot.dpatch
Modified:
   packages/branches/nexuiz/nexuiz-2.0/debian/changelog
   packages/branches/nexuiz/nexuiz-2.0/debian/control
   packages/branches/nexuiz/nexuiz-2.0/debian/rules
Log:
included a patch, bumped revision and set to UNRELEASED

Modified: packages/branches/nexuiz/nexuiz-2.0/debian/changelog
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/changelog	2006-08-05 14:40:10 UTC (rev 1311)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/changelog	2006-08-05 14:55:49 UTC (rev 1312)
@@ -1,3 +1,11 @@
+nexuiz (2.0-2) UNRELEASED; urgency=low
+
+  [ Bruno "Fuddl" Kleinert ]
+  * Included a patch to fix a crash after taking a screenshot at non-standard
+    resolutions.
+
+ -- Bruno "Fuddl" Kleinert <fuddl at gmx.de>  Sat, 05 Aug 2006 16:47:18 +0200
+
 nexuiz (2.0-1) unstable; urgency=low
 
   [ Gonéri Le Bouder ]

Modified: packages/branches/nexuiz/nexuiz-2.0/debian/control
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/control	2006-08-05 14:40:10 UTC (rev 1311)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/control	2006-08-05 14:55:49 UTC (rev 1312)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at gmx.de>
-Build-Depends: debhelper (>= 4.0.0), libsdl1.2-dev, sharutils, imagemagick, gcc-4.0
+Build-Depends: debhelper (>= 4.0.0), libsdl1.2-dev, sharutils, imagemagick, gcc-4.0, dpatch
 Standards-Version: 3.7.2
 
 Package: nexuiz

Added: packages/branches/nexuiz/nexuiz-2.0/debian/patches/00list
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/patches/00list	2006-08-05 14:40:10 UTC (rev 1311)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/patches/00list	2006-08-05 14:55:49 UTC (rev 1312)
@@ -0,0 +1 @@
+10_fix_crash_after_screenshot.dpatch

Added: packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_crash_after_screenshot.dpatch
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_crash_after_screenshot.dpatch	2006-08-05 14:40:10 UTC (rev 1311)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_crash_after_screenshot.dpatch	2006-08-05 14:55:49 UTC (rev 1312)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_crash_after_screenshot.dpatch by  Bruno "Fuddl" Kleinert <fuddl at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch fixes a crash that happens when taking screenshots at
+## DP: non-default screen resolutions.
+
+ at DPATCH@
+diff -urNad nexuiz-2.0~/darkplaces/gl_textures.c nexuiz-2.0/darkplaces/gl_textures.c
+--- nexuiz-2.0~/darkplaces/gl_textures.c	2006-06-07 19:06:00.000000000 +0200
++++ nexuiz-2.0/darkplaces/gl_textures.c	2006-08-05 16:44:00.536905750 +0200
+@@ -452,6 +452,7 @@
+ 	// LordHavoc: allow any alignment
+ 	CHECKGLERROR
+ 	qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);CHECKGLERROR
++	qglPixelStorei(GL_PACK_ALIGNMENT, 1);CHECKGLERROR
+ 
+ 	texturemempool = Mem_AllocPool("texture management", 0, NULL);
+ 
+diff -urNad nexuiz-2.0~/darkplaces/glquake.h nexuiz-2.0/darkplaces/glquake.h
+--- nexuiz-2.0~/darkplaces/glquake.h	2006-06-07 19:06:00.000000000 +0200
++++ nexuiz-2.0/darkplaces/glquake.h	2006-08-05 16:44:00.536905750 +0200
+@@ -110,6 +110,7 @@
+ #define GL_TEXTURE_BORDER_COLOR			0x1004
+ #define GL_TEXTURE_MAG_FILTER			0x2800
+ #define GL_TEXTURE_MIN_FILTER			0x2801
++#define GL_PACK_ALIGNMENT			0x0D05
+ #define GL_UNPACK_ALIGNMENT			0x0CF5
+ #define GL_TEXTURE_BINDING_1D                   0x8068
+ #define GL_TEXTURE_BINDING_2D                   0x8069


Property changes on: packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_crash_after_screenshot.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/branches/nexuiz/nexuiz-2.0/debian/rules
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/rules	2006-08-05 14:40:10 UTC (rev 1311)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/rules	2006-08-05 14:55:49 UTC (rev 1312)
@@ -1,18 +1,20 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	touch configure-stamp
 
-build: build-stamp
+build: patch-stamp build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 	cd darkplaces && $(MAKE) CC=gcc-4.0 sdl-nexuiz sv-nexuiz
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	-rm -f build-stamp configure-stamp