r9723 - in packages/trunk/asylum/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2009-05-12 22:50:54 +0000 (Tue, 12 May 2009)
New Revision: 9723

Added:
   packages/trunk/asylum/debian/patches/
   packages/trunk/asylum/debian/patches/opengl-endianness.patch
   packages/trunk/asylum/debian/patches/series
Modified:
   packages/trunk/asylum/debian/changelog
   packages/trunk/asylum/debian/control
   packages/trunk/asylum/debian/rules
Log:
asylum: fix big-endian problems


Modified: packages/trunk/asylum/debian/changelog
===================================================================
--- packages/trunk/asylum/debian/changelog	2009-05-12 21:45:51 UTC (rev 9722)
+++ packages/trunk/asylum/debian/changelog	2009-05-12 22:50:54 UTC (rev 9723)
@@ -1,3 +1,9 @@
+asylum (0.3.0-3) unstable; urgency=low
+
+  * Fixed endianness problems in the OpenGL rendering code. (Closes: #527568)
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Wed, 13 May 2009 00:28:54 +0200
+
 asylum (0.3.0-2) unstable; urgency=low
 
   * Fixed permissions of high score files.

Modified: packages/trunk/asylum/debian/control
===================================================================
--- packages/trunk/asylum/debian/control	2009-05-12 21:45:51 UTC (rev 9722)
+++ packages/trunk/asylum/debian/control	2009-05-12 22:50:54 UTC (rev 9723)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-mixer1.2-dev,
+Build-Depends: debhelper (>= 7), quilt,
+ libsdl1.2-dev, libsdl-mixer1.2-dev,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev
 Standards-Version: 3.8.1
 Homepage: http://sdl-asylum.sourceforge.net/

Added: packages/trunk/asylum/debian/patches/opengl-endianness.patch
===================================================================
--- packages/trunk/asylum/debian/patches/opengl-endianness.patch	                        (rev 0)
+++ packages/trunk/asylum/debian/patches/opengl-endianness.patch	2009-05-12 22:50:54 UTC (rev 9723)
@@ -0,0 +1,43 @@
+--- a/vdu.c
++++ b/vdu.c
+@@ -666,11 +666,11 @@
+     {
+ 	glBindTexture(GL_TEXTURE_2D, *redtex);
+         gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, 128, 64,
+-			  GL_RGBA, GL_UNSIGNED_BYTE, (char*)redpixels);
++			  GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, (char*)redpixels);
+         free(redpixels);
+ 	glBindTexture(GL_TEXTURE_2D, *greytex);
+         gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, 128, 64,
+-			  GL_RGBA, GL_UNSIGNED_BYTE, (char*)greypixels);
++			  GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, (char*)greypixels);
+         free(greypixels);
+     }
+     else
+@@ -744,7 +744,7 @@
+     {
+         DecompScreen->x = -1;  DecompScreen->y = -1;
+         gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, 512, 512,
+-			  GL_RGBA, GL_UNSIGNED_BYTE, (char*)data);
++			  GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, (char*)data);
+         free(data);
+     }
+     else
+@@ -816,7 +816,7 @@
+ 	glGenTextures(1, batex);
+ 	glBindTexture(GL_TEXTURE_2D, *batex);
+ 	gluBuild2DMipmaps(GL_TEXTURE_2D, 4, 2*64, 2*32,
+-			  GL_RGBA, GL_UNSIGNED_BYTE, (char*)ba);
++			  GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, (char*)ba);
+     }
+     else
+     {
+@@ -982,7 +982,7 @@
+ 	    //Without this line I don't get textures unless I use gluBuild2DMipmaps
+ 	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST); 
+ 	    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0,
+-			 GL_RGBA, GL_UNSIGNED_BYTE, (char*)data);
++			 GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, (char*)data);
+ 	    free(data);
+ 	}
+ 	else SDL_UnlockSurface(sprites[i].s);

Added: packages/trunk/asylum/debian/patches/series
===================================================================
--- packages/trunk/asylum/debian/patches/series	                        (rev 0)
+++ packages/trunk/asylum/debian/patches/series	2009-05-12 22:50:54 UTC (rev 9723)
@@ -0,0 +1 @@
+opengl-endianness.patch

Modified: packages/trunk/asylum/debian/rules
===================================================================
--- packages/trunk/asylum/debian/rules	2009-05-12 21:45:51 UTC (rev 9722)
+++ packages/trunk/asylum/debian/rules	2009-05-12 22:50:54 UTC (rev 9723)
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
+	
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp:
+build-arch-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(MAKE) CFLAGS="$(CFLAGS)"
 	touch $@
@@ -11,7 +14,7 @@
 build-indep:
 # Nothing to do here.
 
-clean:
+clean: unpatch
 	dh_testdir
 	make clean RM='rm -f'
 	dh_clean