r4474 - in packages/trunk/koules/debian: . patches
Barry deFreese
bddebian-guest at alioth.debian.org
Sat Oct 27 02:41:17 UTC 2007
Author: bddebian-guest
Date: 2007-10-27 02:41:17 +0000 (Sat, 27 Oct 2007)
New Revision: 4474
Added:
packages/trunk/koules/debian/patches/107_fix_xsynchronize.diff
packages/trunk/koules/debian/patches/108_use_right_visual.diff
packages/trunk/koules/debian/patches/109_fpe_fix.diff
packages/trunk/koules/debian/watch
Modified:
packages/trunk/koules/debian/changelog
packages/trunk/koules/debian/control
packages/trunk/koules/debian/patches/series
Log:
Add watch file and three patches. Fix description. Add homepage field.
Modified: packages/trunk/koules/debian/changelog
===================================================================
--- packages/trunk/koules/debian/changelog 2007-10-26 21:02:18 UTC (rev 4473)
+++ packages/trunk/koules/debian/changelog 2007-10-27 02:41:17 UTC (rev 4474)
@@ -1,3 +1,20 @@
+koules (1.4-18) UNRELEASED; urgency=low
+
+ [ Barry deFreese ]
+ * Add watch file
+ * Change long description to not include short description.
+ * Add homepage field in control
+ * 107_fix_xsynchronize.diff (Closes: #412056)
+ * Handle ARGB visuals properly
+ * 108_use_right_visual.diff
+ * Handle -y option
+ * Thanks to Peter De Wachter for the patches
+ * 109_fpe_fix.diff (Closes: #269840)
+ * Fixes floating point exceptions
+ * Thanks to Steffen Pingel for the patch
+
+ -- Barry deFreese <bddebian at comcast.net> Fri, 26 Oct 2007 20:24:06 -0400
+
koules (1.4-17) unstable; urgency=low
[ Cyril Brulebois ]
@@ -5,6 +22,7 @@
[ Gonéri Le Bouder ]
* remove ./xkoules.man during the clean to be able to do two build in a row
+ * (Closes: #424462)
* remove the dh-make header in the debian/rules
-- Alexander Schmehl <tolimar at debian.org> Tue, 31 Jul 2007 21:27:40 +0000
Modified: packages/trunk/koules/debian/control
===================================================================
--- packages/trunk/koules/debian/control 2007-10-26 21:02:18 UTC (rev 4473)
+++ packages/trunk/koules/debian/control 2007-10-27 02:41:17 UTC (rev 4474)
@@ -5,6 +5,7 @@
Uploaders: Alexander Schmehl <tolimar at debian.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
Build-Depends: debhelper (>= 5), quilt, xutils (>= 4.0.1-1), libx11-dev, libxext-dev, sharutils
Standards-Version: 3.7.2
+Homepage: http://www.ucw.cz/~hubicka/koules/English/koules.html
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/koules/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/koules/?op=log
@@ -13,10 +14,9 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: tcl8.3, tk8.3
Description: abstract space action game
- Koules is a somewhat abstract space action game. It supports multiplayer
- deathmatch and cooperative play.
- .
Koules is a fast action arcade-style game. This version is compiled for X11.
It has cool 256 color graphics, a multiplayer mode for up to 5 players, full
sound and, of course, network support. Koules is an original idea. The first
version of Koules was developed from scratch by Jan Hubicka in July 1995.
+ .
+ It supports multiplayer deathmatch and cooperative play.
Added: packages/trunk/koules/debian/patches/107_fix_xsynchronize.diff
===================================================================
--- packages/trunk/koules/debian/patches/107_fix_xsynchronize.diff (rev 0)
+++ packages/trunk/koules/debian/patches/107_fix_xsynchronize.diff 2007-10-27 02:41:17 UTC (rev 4474)
@@ -0,0 +1,32 @@
+Index: koules-1.4/xlib/init.c
+===================================================================
+--- koules-1.4.orig/xlib/init.c 2007-09-03 20:29:10.000000000 +0200
++++ koules-1.4/xlib/init.c 2007-09-03 20:29:29.000000000 +0200
+@@ -386,6 +386,8 @@
+ printf ("could not open display\n");
+ exit (0);
+ }
++ if (Sync)
++ XSynchronize (dp, 1);
+ XSetCloseDownMode (dp, DestroyAll);
+ screen = DefaultScreen (dp);
+ fadeenable = 1;
+@@ -578,8 +580,6 @@
+ }
+ #endif
+
+- if (Sync)
+- XSynchronize (dp, 1);
+ #if defined(NAS_SOUND)||defined(RSOUND)
+ printf ("Initializing sound server...\n");
+ if (sndinit)
+@@ -666,7 +666,7 @@
+ "\n\n\n\n"
+ " Copyright(c) Jan Hubicka 1995, 1996\n\n\n");
+ useprivate = 0;
+- while ((c = mygetopt (argc, argv, "KWD:P:L:C:SxslEMmpdhfb")) != -1)
++ while ((c = mygetopt (argc, argv, "KWD:P:L:C:SxyslEMmpdhfb")) != -1)
+ {
+ switch (c)
+ {
+
Added: packages/trunk/koules/debian/patches/108_use_right_visual.diff
===================================================================
--- packages/trunk/koules/debian/patches/108_use_right_visual.diff (rev 0)
+++ packages/trunk/koules/debian/patches/108_use_right_visual.diff 2007-10-27 02:41:17 UTC (rev 4474)
@@ -0,0 +1,130 @@
+Index: koules-1.4/xlib/init.c
+===================================================================
+--- koules-1.4.orig/xlib/init.c 2007-09-03 20:46:52.000000000 +0200
++++ koules-1.4/xlib/init.c 2007-09-03 21:38:49.000000000 +0200
+@@ -95,7 +95,6 @@
+ Bool * sharedpixmaps);
+ static int haderror;
+ static int (*origerrorhandler) (Display *, XErrorEvent *);
+-static int bpp;
+
+
+ static int
+@@ -179,14 +178,14 @@
+ VfTime = 1000000 / 25 * 12;
+ pixmap->ximage = XCreateImage (dp, DefaultVisual (dp, screen),
+ depth, ZPixmap, 0,
+- NULL, Width, Height, bpp * 8, 0);
++ NULL, Width, Height, depth, 0);
+ if (!pixmap->ximage)
+ {
+ fprintf (stderr, "Can't get image\n");
+ return 0;
+ }
+ /*Calculate size of shared memory */
+- memsize = ((Width + 1) * (Height + 1) * bpp);
++ memsize = ((Width + 1) * (Height + 1) * depth / 8);
+ if ((data = malloc (memsize)) == NULL)
+ {
+ printf ("Can't malloc memory for image\n");
+@@ -340,7 +339,6 @@
+ char *title1 = "Koules";
+
+ Font f;
+- XVisualInfo vinfo_return;
+ XGCValues values;
+ #ifndef NAS_SOUND
+ #ifndef RSOUND
+@@ -390,54 +388,46 @@
+ XSynchronize (dp, 1);
+ XSetCloseDownMode (dp, DestroyAll);
+ screen = DefaultScreen (dp);
+- fadeenable = 1;
+- if (XMatchVisualInfo (dp, DefaultScreen (dp),
+- 8, PseudoColor, &vinfo_return) == False)
+- {
+- fadeenable = 0;
+- printf ("X: Screen doesn't support PseudoColor!\n");
+- if (XMatchVisualInfo (dp, DefaultScreen (dp),
+- 32, TrueColor, &vinfo_return) == True)
+- {
+- useprivate = 0;
+- bpp = 4;
+- }
+- else if (XMatchVisualInfo (dp, DefaultScreen (dp),
+- 24, TrueColor, &vinfo_return) == True)
+- {
+- useprivate = 0;
+- bpp = 4;
+- }
+- else if (XMatchVisualInfo (dp, DefaultScreen (dp),
+- 16, TrueColor, &vinfo_return) == True)
+- {
+- useprivate = 0;
+- bpp = 2;
+- }
+- else if (XMatchVisualInfo (dp, DefaultScreen (dp),
+- 15, TrueColor, &vinfo_return) == True)
+- {
+- useprivate = 0;
+- bpp = 2;
+- }
+- else if (XMatchVisualInfo (dp, DefaultScreen (dp),
+- 8, GrayScale, &vinfo_return) == True)
+- {
+- useprivate = 0;
+- monochrome = 1;
+- bpp = 2;
+- }
+- else
+- {
+- printf ("Unsupported visual! Using slow and reliable mode\n");
++ {
++ XVisualInfo template;
++ XVisualInfo * vinfo;
++ int nitems_return;
++ template.visualid = XVisualIDFromVisual (DefaultVisual (dp, DefaultScreen (dp)));
++ vinfo = XGetVisualInfo (dp, VisualIDMask, &template, &nitems_return);
++ if (nitems_return == 0)
++ {
++ printf ("X server does not know about the default visual...");
++ exit (0);
++ }
++
++ if (vinfo->class == PseudoColor && vinfo->depth == 8)
++ {
++ fadeenable = 1;
++ }
++ else
++ {
++ fadeenable = 0;
++ printf ("X: Screen doesn't support PseudoColor!\n");
++ if (vinfo->class == TrueColor)
++ {
++ useprivate = 0;
++ }
++ else if (vinfo->class == GrayScale)
++ {
++ useprivate = 0;
++ monochrome = 1;
++ }
++ else
++ {
++ printf ("Unsupported visual! Using slow and reliable mode\n");
+ #ifdef MITSHM
+- shm = 0;
++ shm = 0;
+ #endif
+- }
+- }
+- else
+- bpp = 1;
+- depth = vinfo_return.depth;
++ }
++ }
++ depth = vinfo->depth;
++ XFree(vinfo);
++ }
+ #ifdef MITSHM
+ /* Make sure all is destroyed if killed off */
+
Added: packages/trunk/koules/debian/patches/109_fpe_fix.diff
===================================================================
--- packages/trunk/koules/debian/patches/109_fpe_fix.diff (rev 0)
+++ packages/trunk/koules/debian/patches/109_fpe_fix.diff 2007-10-27 02:41:17 UTC (rev 4474)
@@ -0,0 +1,12 @@
+--- koules-1.4.orig/xlib/shmbitmap.c 2007-10-26 21:16:50.000000000 -0400
++++ koules-1.4/xlib/shmbitmap.c 2007-10-26 21:18:21.000000000 -0400
+@@ -187,6 +187,9 @@
+ void
+ ShmPutBitmap (int x, int y, int w, int h, void *_dp)
+ {
++ if (x < 0 || y < 0)
++ return;
++
+ /* no clipping */
+ uchar *dp = _dp;
+ uchar *vp, *vpline;
Modified: packages/trunk/koules/debian/patches/series
===================================================================
--- packages/trunk/koules/debian/patches/series 2007-10-26 21:02:18 UTC (rev 4473)
+++ packages/trunk/koules/debian/patches/series 2007-10-27 02:41:17 UTC (rev 4474)
@@ -7,5 +7,8 @@
104_types.diff
105_save_file.diff
106_shm_check.diff
+107_fix_xsynchronize.diff
+108_use_right_visual.diff
200_tcl.diff
300_kfreebsd-gnu.diff
+109_fpe_fix.diff
Added: packages/trunk/koules/debian/watch
===================================================================
--- packages/trunk/koules/debian/watch (rev 0)
+++ packages/trunk/koules/debian/watch 2007-10-27 02:41:17 UTC (rev 4474)
@@ -0,0 +1,3 @@
+version=3
+
+http://www.ucw.cz/~hubicka/koules/packages/koules(.*)-src\.tar\.gz
More information about the Pkg-games-commits
mailing list