diff options
author | B. Watson <yalhcru@gmail.com> | 2010-05-12 23:29:24 +0200 |
---|---|---|
committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-12 23:29:24 +0200 |
commit | 433652987873bb7e1bb654dcbfeaa9225d9fbe5a (patch) | |
tree | 7260a2ab50dac4b2b18d80235130e32cc82556ae /games/koules/patches | |
parent | ded2ffc51a4b5e5d54d17b05b8cde862c8951c6b (diff) | |
download | slackbuilds-433652987873bb7e1bb654dcbfeaa9225d9fbe5a.tar.gz |
games/koules: Added to 12.2 repository
Diffstat (limited to 'games/koules/patches')
-rw-r--r-- | games/koules/patches/compile_fix.diff | 16 | ||||
-rw-r--r-- | games/koules/patches/document_E_option.diff | 24 | ||||
-rw-r--r-- | games/koules/patches/no_inline_asm.diff | 48 | ||||
-rw-r--r-- | games/koules/patches/slackware.diff | 40 | ||||
-rw-r--r-- | games/koules/patches/tcl_launcher_paths.diff | 16 |
5 files changed, 144 insertions, 0 deletions
diff --git a/games/koules/patches/compile_fix.diff b/games/koules/patches/compile_fix.diff new file mode 100644 index 0000000000..1b04d634b7 --- /dev/null +++ b/games/koules/patches/compile_fix.diff @@ -0,0 +1,16 @@ +diff -Naur koules1.4/xlib/init.c koules1.4.patched/xlib/init.c +--- koules1.4/xlib/init.c 1998-03-05 12:03:01.000000000 -0500 ++++ koules1.4.patched/xlib/init.c 2009-04-15 06:12:07.000000000 -0400 +@@ -88,11 +88,11 @@ + return (pixmap); + } + ++static int bpp; + #ifdef MITSHM + extern int XShmQueryExtension (Display * dpy); + static int haderror; + static int (*origerrorhandler) (Display *, XErrorEvent *); +-static int bpp; + + + static int diff --git a/games/koules/patches/document_E_option.diff b/games/koules/patches/document_E_option.diff new file mode 100644 index 0000000000..15d008f995 --- /dev/null +++ b/games/koules/patches/document_E_option.diff @@ -0,0 +1,24 @@ +diff -Naur koules1.4/xkoules.6 koules1.4.patched/xkoules.6 +--- koules1.4/xkoules.6 1998-03-04 13:59:19.000000000 -0500 ++++ koules1.4.patched/xkoules.6 2009-04-15 06:30:32.000000000 -0400 +@@ -69,6 +69,9 @@ + for large display(640x480) + default size + .TP ++.B \-E ++for extra large display(900x600) ++.TP + .B \-m + for monochrome displays + .TP +diff -Naur koules1.4/xlib/init.c koules1.4.patched/xlib/init.c +--- koules1.4/xlib/init.c 1998-03-05 12:03:01.000000000 -0500 ++++ koules1.4.patched/xlib/init.c 2009-04-15 06:29:13.000000000 -0400 +@@ -775,6 +775,7 @@ + " -m for monochrome displays\n" + " -s for small display(320x250)\n" + " -l for large display(640x480)\n" ++ " -E for extra large display(900x600)\n" + " -p use private colormap\n" + " -y Synchronize with X(for debugging)\n" + " -f nofade(for debugging)\n" diff --git a/games/koules/patches/no_inline_asm.diff b/games/koules/patches/no_inline_asm.diff new file mode 100644 index 0000000000..95c02bcf78 --- /dev/null +++ b/games/koules/patches/no_inline_asm.diff @@ -0,0 +1,48 @@ +diff -Naur koules1.4/xlib/shmbitmap.c koules1.4.patched/xlib/shmbitmap.c +--- koules1.4/xlib/shmbitmap.c 1998-03-04 13:59:19.000000000 -0500 ++++ koules1.4.patched/xlib/shmbitmap.c 2009-04-15 06:44:35.000000000 -0400 +@@ -237,7 +237,7 @@ + #define __clipy1 0 + #undef __clipy2 + #define __clipy2 (MAPHEIGHT+19) +-#ifdef __i386__ ++#if 0 + static INLINE int + muldiv64 (int CONST m1, int CONST m2, int CONST d) + { +@@ -333,7 +333,7 @@ + } + if (r1 & 1) + { /* left */ +-#ifdef __i386__ ++#if 0 + y1 += muldiv64 (__clipx1 - x1, y2 - y1, x2 - x1); + #else + y1 += (long) (__clipx1 - x1) * (long) (y2 - y1) / (long) (x2 - x1); +@@ -342,7 +342,7 @@ + } + else if (r1 & 2) + { /* right */ +-#ifdef __i386__ ++#if 0 + y1 += muldiv64 (__clipx2 - x1, y2 - y1, x2 - x1); + #else + y1 += (long) (__clipx2 - x1) * (long) (y2 - y1) / (long) (x2 - x1); +@@ -351,7 +351,7 @@ + } + else if (r1 & 4) + { /* top */ +-#ifdef __i386__ ++#if 0 + x1 += muldiv64 (__clipy1 - y1, x2 - x1, y2 - y1); + #else + x1 += (long) (__clipy1 - y1) * (long) (x2 - x1) / (long) (y2 - y1); +@@ -360,7 +360,7 @@ + } + else if (r1 & 8) + { /* bottom */ +-#ifdef __i386__ ++#if 0 + x1 += muldiv64 (__clipy2 - y1, x2 - x1, y2 - y1); + #else + x1 += (long) (__clipy2 - y1) * (long) (x2 - x1) / (long) (y2 - y1); diff --git a/games/koules/patches/slackware.diff b/games/koules/patches/slackware.diff new file mode 100644 index 0000000000..ea597d220c --- /dev/null +++ b/games/koules/patches/slackware.diff @@ -0,0 +1,40 @@ +diff -Naur koules1.4/Iconfig koules1.4.patched/Iconfig +--- koules1.4/Iconfig 1998-03-04 15:29:05.000000000 -0500 ++++ koules1.4.patched/Iconfig 2009-04-15 05:54:44.000000000 -0400 +@@ -29,13 +29,14 @@ + /* linux joystick support + Now compiles w/o joystick toolkit. For using joystick support is + joystick toolikit required...of course */ +-/*#define JOYSTICK*/ ++#define JOYSTICK + /*for fast 386 based assembler routines + recomended for linux*/ + /*#define I386ASSEMBLY*/ ++#define LinuxArchitecture + /* directories*/ + KOULESDIR =/usr/bin/X11 +-SOUNDDIR =/usr/local/lib/koules ++SOUNDDIR =/usr/share/koules + MANDIR =/usr/local/man/man6 + + /*You need some extra libraryes for BSD sockets compatibility?*/ +@@ -51,7 +52,6 @@ + SUBDIRS = xlib + + #if defined(LinuxArchitecture) +- SYSDEFS = -Wall -fomit-frame-pointer -O6 -ffast-math + #if !defined(NAS_SOUND)&&!defined(RSOUND) + #define SOUND + SOUNDSERVER = koules.sndsrv.linux +diff -Naur koules1.4/Imakefile koules1.4.patched/Imakefile +--- koules1.4/Imakefile 1998-03-04 13:59:19.000000000 -0500 ++++ koules1.4.patched/Imakefile 2009-04-15 05:35:39.000000000 -0400 +@@ -56,7 +56,7 @@ + + DEFINES = -DONLYANSI -DSOUND $(JOYSTICK1) $(NET) $(MITSHM1) $(HAVEUSLEEP1) $(SYSDEFS) $(JOYSTICK) -Ixlib\ + $(NAMEDEF) $(ASMDEF)\ +- -DSOUNDSERVER=\"$(SOUNDDIR)/$(SOUNDSERVER)\" \ ++ -DSOUNDSERVER=\"/usr/libexec/$(SOUNDSERVER)\" \ + -DSOUNDDIR=\"$(SOUNDDIR)\" \ + -DSOUNDDEV=\"$(SOUNDDEV)\" + #endif diff --git a/games/koules/patches/tcl_launcher_paths.diff b/games/koules/patches/tcl_launcher_paths.diff new file mode 100644 index 0000000000..f743b0afdd --- /dev/null +++ b/games/koules/patches/tcl_launcher_paths.diff @@ -0,0 +1,16 @@ +diff -Naur koules1.4/koules.tcl koules1.4.patched/koules.tcl +--- koules1.4/koules.tcl 1998-03-04 13:59:19.000000000 -0500 ++++ koules1.4.patched/koules.tcl 2009-04-15 08:00:38.000000000 -0400 +@@ -3,9 +3,9 @@ + # This is simple user (anti)friendly dialog for starting koules + # Only reason why I did it is that I wanted to try tcl/tk + #files - configure here if paths are differ +-set xkoules "/usr/bin/X11/xkoules" +-set koulessvga "/usr/local/bin/koules.svga" +-set koulessound "/usr/local/lib/koules/creator1.raw" ++set xkoules "/usr/games/koules" ++set koulessvga "@@@NOSUCHFILE@@@" ++set koulessound "/usr/share/koules/creator1.raw" + set config "~/.xkoules.opt" + set revision 1.1 + # Set default |