diff options
author | B. Watson <urchlay@slackware.uk> | 2025-01-16 17:48:02 -0500 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2025-01-25 09:03:36 +0700 |
commit | d53a3133510638e0518b9eb510ab6abde15b5046 (patch) | |
tree | 14916e7abce9a3b5b2b697d16bff37c9799be5e8 | |
parent | c428be9ff349fc3c97136b0ca73f6c7289d23160 (diff) |
games/o2em: gzip patches (CRLF endings).
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r-- | games/o2em/compile_fix.diff | 54 | ||||
-rw-r--r-- | games/o2em/compile_fix.diff.gz | bin | 0 -> 610 bytes | |||
-rw-r--r-- | games/o2em/o2em.SlackBuild | 4 | ||||
-rw-r--r-- | games/o2em/wordsize.diff | 47 | ||||
-rw-r--r-- | games/o2em/wordsize.diff.gz | bin | 0 -> 567 bytes |
5 files changed, 2 insertions, 103 deletions
diff --git a/games/o2em/compile_fix.diff b/games/o2em/compile_fix.diff deleted file mode 100644 index 127967c09c..0000000000 --- a/games/o2em/compile_fix.diff +++ /dev/null @@ -1,54 +0,0 @@ -diff -Naur o2em118src/src/debug.c o2em118src.patched//src/debug.c ---- o2em118src/src/debug.c 2006-11-24 05:41:34.000000000 -0500 -+++ o2em118src.patched//src/debug.c 2011-01-12 16:02:24.000000000 -0500 -@@ -16,6 +16,7 @@ -
- #include <stdio.h>
- #include <string.h>
-+#include <errno.h>
- #include "cpu.h"
- #include "keyboard.h"
- #include "vmachine.h"
-@@ -1042,4 +1043,4 @@ -
- printf("\n");
- return 1;
--} -\ No newline at end of file -+}
-diff -Naur o2em118src/src/makefile.linux o2em118src.patched//src/makefile.linux ---- o2em118src/src/makefile.linux 2006-05-05 16:45:14.000000000 -0400 -+++ o2em118src.patched//src/makefile.linux 2011-01-12 16:07:46.000000000 -0500 -@@ -1,8 +1,8 @@ - CC = gcc
-
--CFLAGS = -O3 -Wall -fomit-frame-pointer -I/usr/include
-+CFLAGS = -Wall $(SLKCFLAGS) `allegro-config --cflags`
- LFLAGS = -s
--LIBALLEG = /usr/lib/liballeg.so.4.2 -lalleg_unsharable
-+LIBALLEG = `allegro-config --libs`
-
-
- all: o2em dis48
-diff -Naur o2em118src/src/score.c o2em118src.patched//src/score.c ---- o2em118src/src/score.c 2006-05-01 01:58:08.000000000 -0400 -+++ o2em118src.patched//src/score.c 2011-01-12 16:02:35.000000000 -0500 -@@ -19,6 +19,7 @@ - #include <string.h>
- #include <ctype.h>
- #include <time.h>
-+#include <errno.h>
- #include "vmachine.h"
- #include "types.h"
- #include "score.h"
-diff -Naur o2em118src/src/vmachine.c o2em118src.patched//src/vmachine.c ---- o2em118src/src/vmachine.c 2006-11-24 11:59:26.000000000 -0500 -+++ o2em118src.patched//src/vmachine.c 2011-01-12 16:02:43.000000000 -0500 -@@ -18,6 +18,7 @@ - #include <stdlib.h>
- #include <stdio.h>
- #include <time.h>
-+#include <errno.h>
- #include "audio.h"
- #include "types.h"
- #include "cpu.h"
diff --git a/games/o2em/compile_fix.diff.gz b/games/o2em/compile_fix.diff.gz Binary files differnew file mode 100644 index 0000000000..47f6d46c2b --- /dev/null +++ b/games/o2em/compile_fix.diff.gz diff --git a/games/o2em/o2em.SlackBuild b/games/o2em/o2em.SlackBuild index 7eb2119b4d..321d5d9267 100644 --- a/games/o2em/o2em.SlackBuild +++ b/games/o2em/o2em.SlackBuild @@ -66,10 +66,10 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # make makefile.linux use allegro-config to find cflags/libs for allegro # make various source files #include <errno.h> # add SLKCFLAGS support to makefile.linux -patch -p1 < $CWD/compile_fix.diff +zcat $CWD/compile_fix.diff.gz | patch -p1 # Patch fixes wordsize assumptions on x86_64 and makes no difference on x86 -patch -p1 < $CWD/wordsize.diff +zcat $CWD/wordsize.diff.gz | patch -p1 cd src make -f makefile.linux SLKCFLAGS="$SLKCFLAGS -fcommon" diff --git a/games/o2em/wordsize.diff b/games/o2em/wordsize.diff deleted file mode 100644 index f62b1574f8..0000000000 --- a/games/o2em/wordsize.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naur o2em118src/src/crc32.c o2em118src.patched//src/crc32.c ---- o2em118src/src/crc32.c 2006-10-08 10:46:16.000000000 -0400 -+++ o2em118src.patched//src/crc32.c 2011-01-13 17:40:03.000000000 -0500 -@@ -20,7 +20,7 @@ - #include "crc32.h"
-
-
--static unsigned long crc32tab[256] = {
-+static unsigned int crc32tab[256] = {
- 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
- 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
- 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-@@ -88,8 +88,8 @@ - };
-
-
--unsigned long crc32_buf(const void *buf, long len){
-- unsigned long crc = ~0;
-+unsigned int crc32_buf(const void *buf, int len){
-+ unsigned int crc = ~0;
- unsigned char *p = (unsigned char*)buf;
-
- while (len--) crc = (crc >> 8) ^ crc32tab[(crc ^ (*p++)) & 0xff];
-@@ -97,8 +97,8 @@ - }
-
-
--unsigned long crc32_file(const char *filename){
-- unsigned long crc = ~0;
-+unsigned int crc32_file(const char *filename){
-+ unsigned int crc = ~0;
- FILE *f;
- int c;
- f = fopen(filename,"rb");
-diff -Naur o2em118src/src/crc32.h o2em118src.patched//src/crc32.h ---- o2em118src/src/crc32.h 2004-12-28 01:53:00.000000000 -0500 -+++ o2em118src.patched//src/crc32.h 2011-01-13 17:40:12.000000000 -0500 -@@ -1,7 +1,7 @@ - #ifndef __CRC32_H
- #define __CRC32_H
-
--unsigned long crc32_buf(const void *buf, long len);
--unsigned long crc32_file(const char *filename);
-+unsigned int crc32_buf(const void *buf, int len);
-+unsigned int crc32_file(const char *filename);
-
- #endif
diff --git a/games/o2em/wordsize.diff.gz b/games/o2em/wordsize.diff.gz Binary files differnew file mode 100644 index 0000000000..e5e5b97b00 --- /dev/null +++ b/games/o2em/wordsize.diff.gz |