commit grubinvaders 1.0.0-4

13 files changed, 318 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54ca1b868642..b96a689001ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,29 @@
 pkgbase = grubinvaders
 	pkgdesc = multi boot compliant game for i386 and compatible x86_64
 	pkgver = 1.0.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.erikyyy.de/invaders/
 	install = grubinvaders.install
 	arch = any
 	license = GPL2
-	makedepends = gcc
 	source = http://www.erikyyy.de/invaders/invaders-1.0.0.tar.gz
-	source = 0001-gcc_binutils_bugfix.patch
-	source = 0002-reboot-on-esc.patch
-	source = 0003-no-stack-protector.patch
-	source = 0004-x86_64_envfix.patch
+	source = 01-misspelling-loose.patch
+	source = 01-uint8-char.patch
+	source = 02-build-flags.patch
+	source = 02-static-inline.patch
+	source = 03-reboot-on-esc.patch
+	source = 04-change-colors.patch
+	source = 05-pause.patch
 	source = grub
 	sha256sums = 304c8b0f82eaec54b07250b0f39886e1d9fa23c48075213bf87c8f375781a845
-	sha256sums = c0c15db81101b6ffce3c6d142e207358155eac37970ddd3b31d4ebe42b703515
-	sha256sums = 36ff7d4a546b9e1f15f62683120f7b7428d14a5ef15b4923e8179cd0ffcc9b99
-	sha256sums = 46819946a00a81f8b8346a52778dd1c4f35ebc6ae82937e3eebde7b25dc4b3f4
-	sha256sums = a21caf867c156a664779a40f5139ca895f4d7915a22a7a792dffc0976a8c8c5b
-	sha256sums = fc36e67c91515aa619ca9616f517116d5cfd1f257fc142703a5ff01ec5dcfdab
+	sha256sums = 02c0a9aa07afaec24af8537850251a1575616547bc760da37308974f90041864
+	sha256sums = 6791e4ff7b1b4c3f8989fcc1565d9ebc2c47e18506a3db283f852ff6cf8f9fd7
+	sha256sums = 0c251e0fba59b9aa548638f145d495ee67e69189a396c1c95b39081a26ac580c
+	sha256sums = 4e3f542e8518b091cf97051468dc3f29cbb304162d60fd892108cf3d8c0f868b
+	sha256sums = eb3414a8b31cd26c5091847a52667903e47056f23ba1a5415ab7568a3f2f6bc5
+	sha256sums = fcea5bc771589d83441d8df44329aa0aa5ff8a987813f44a76a3314714f3a60e
+	sha256sums = dc102190cc815aff769bf3b5d56a4304c972bea647feb9e2e64c63661cfd123b
+	sha256sums = de564857bd69cb5680aa994bcd8b9119bcdb7d07fade0a4df4db950c871830f5
 
 pkgname = grubinvaders
 
diff --git a/0001-gcc_binutils_bugfix.patch b/0001-gcc_binutils_bugfix.patch
deleted file mode 100644
index 75f5d0e4601a..000000000000
--- a/0001-gcc_binutils_bugfix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur invaders/clean.sh invaders-fixed/clean.sh
---- invaders/clean.sh	2001-05-21 22:43:13.000000000 +0200
-+++ invaders-fixed/clean.sh	2009-04-13 17:03:14.000000000 +0200
-@@ -2,4 +2,4 @@
- 
- set -e
- set -v
--rm -f *.o *~ invaders.exec
-+rm -f *.o *~ invaders.exec invaders
-diff -ur invaders/compile.sh invaders-fixed/compile.sh
---- invaders/compile.sh	2001-05-21 22:26:46.000000000 +0200
-+++ invaders-fixed/compile.sh	2009-04-13 16:59:44.000000000 +0200
-@@ -4,7 +4,7 @@
- set -v
- 
- CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
--LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
-+LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
- gcc $CFLAGS -c keyboard.c
- gcc $CFLAGS -c delay.c
- gcc $CFLAGS -c common.c
-diff -ur invaders/video.c invaders-fixed/video.c
---- invaders/video.c	2001-05-13 15:56:33.000000000 +0200
-+++ invaders-fixed/video.c	2009-04-13 17:01:22.000000000 +0200
-@@ -36,7 +36,7 @@
-   video_putchar(x+1,y,hextab[hex&15]);
- };
- 
--void video_putstring(int32 x, int32 y, uint8 *str)
-+void video_putstring(int32 x, int32 y, char *str)
- {
-   while (*str) video_putchar(x++,y,*(str++));
- };
-diff -ur invaders/video.h invaders-fixed/video.h
---- invaders/video.h	2001-05-13 15:56:33.000000000 +0200
-+++ invaders-fixed/video.h	2009-04-13 17:01:05.000000000 +0200
-@@ -8,7 +8,7 @@
- void video_putchar(int32 x, int32 y, uint8 code);
- void video_fill(int32 x, int32 y, int32 width, int32 height, uint8 code);
- void video_puthex8(int32 x, int32 y, uint8 hex);
--void video_putstring(int32 x, int32 y, uint8 *str);
-+void video_putstring(int32 x, int32 y, char *str);
- 
- // immediate effect
- void video_update();
-
diff --git a/0003-no-stack-protector.patch b/0003-no-stack-protector.patch
deleted file mode 100644
index 20fefcabb790..000000000000
--- a/0003-no-stack-protector.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/compile.sh b/compile.sh
-index cf379e5..cc6119d 100755
---- a/compile.sh
-+++ b/compile.sh
-@@ -3,7 +3,7 @@
- set -e
- set -v
- 
--CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
-+CFLAGS="-fno-builtin -fno-stack-protector -nostdinc -O2 -I. -Wall -Werror"
- LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
- gcc $CFLAGS -c keyboard.c
- gcc $CFLAGS -c delay.c
diff --git a/0004-x86_64_envfix.patch b/0004-x86_64_envfix.patch
deleted file mode 100644
index 067f3585733c..000000000000
--- a/0004-x86_64_envfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r invaders~/compile.sh invaders/compile.sh
---- invaders~/compile.sh	2010-03-27 17:56:13.000000000 +0100
-+++ invaders/compile.sh	2010-03-27 22:41:37.000000000 +0100
-@@ -3,8 +3,8 @@
- set -e
- set -v
- 
--CFLAGS="-fno-builtin -fno-stack-protector -nostdinc -O2 -I. -Wall -Werror"
--LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
-+CFLAGS="-fno-builtin -fno-stack-protector -nostdinc -O2 -I. -Wall -Werror -m32"
-+LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none -m32"
- gcc $CFLAGS -c keyboard.c
- gcc $CFLAGS -c delay.c
- gcc $CFLAGS -c common.c
diff --git a/01-misspelling-loose.patch b/01-misspelling-loose.patch
new file mode 100644
index 000000000000..2a150fffaaa9
--- /dev/null
+++ b/01-misspelling-loose.patch
@@ -0,0 +1,15 @@
+Author: Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
+Description: Fix misspelling: "YOU LOOSE" should be "YOU LOSE".
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=478928
+
+--- invaders-1.0.0.orig/game.c
++++ invaders-1.0.0/game.c
+@@ -198,7 +198,7 @@ void displaygameover()
+ 
+   video_usecolor(6,1);
+   video_putstring(30,10,"  GAME OVER  ");
+-  video_putstring(30,11,winner ? "  YOU WIN  " : "  YOU LOOSE  ");
++  video_putstring(30,11,winner ? "   YOU WIN   " : "  YOU LOSE   ");
+   video_putstring(30,12,"  PRESS ESC  ");
+   video_update();
+   do{
diff --git a/01-uint8-char.patch b/01-uint8-char.patch
new file mode 100644
index 000000000000..5b7bc573517d
--- /dev/null
+++ b/01-uint8-char.patch
@@ -0,0 +1,27 @@
+Author: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
+Origin: http://www.coreboot.org/pipermail/coreboot/2009-April/046558.html
+Description: Use (char *) instead of (uint8 *) to avoid
+ "pointer targets [...] differ in signedness" warnings when passing a string.
+
+--- invaders-1.0.0.orig/video.c
++++ invaders-1.0.0/video.c
+@@ -36,7 +36,7 @@ void video_puthex8(int32 x, int32 y, uin
+   video_putchar(x+1,y,hextab[hex&15]);
+ };
+ 
+-void video_putstring(int32 x, int32 y, uint8 *str)
++void video_putstring(int32 x, int32 y, char *str)
+ {
+   while (*str) video_putchar(x++,y,*(str++));
+ };
+--- invaders-1.0.0.orig/video.h
++++ invaders-1.0.0/video.h
+@@ -8,7 +8,7 @@ void video_usecolor(uint8 fg, uint8 bg);
+ void video_putchar(int32 x, int32 y, uint8 code);
+ void video_fill(int32 x, int32 y, int32 width, int32 height, uint8 code);
+ void video_puthex8(int32 x, int32 y, uint8 hex);
+-void video_putstring(int32 x, int32 y, uint8 *str);
++void video_putstring(int32 x, int32 y, char *str);
+ 
+ // immediate effect
+ void video_update();
diff --git a/02-build-flags.patch b/02-build-flags.patch
new file mode 100644
index 000000000000..2b7f5301af0a
--- /dev/null
+++ b/02-build-flags.patch
@@ -0,0 +1,34 @@
+Author: Robert Millan <rmh@aybabtu.com>
+Author: Stefan Potyra <sistpoty@ubuntu.com>
+Author: Kees Cook <kees@ubuntu.com>
+Author: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
+Author: Fabian Greffrath <fabian+debian@greffrath.com>
+Origin: http://www.coreboot.org/pipermail/coreboot/2009-April/046558.html
+Description: Support for building on amd64 and others,
+ move -nostdlib to CFLAGS, as it's a compiler flag,
+ use CFLAGS for linking as well (since gcc is used),
+ replace -fno-builtin with -ffreestanding,
+ replace -Werror with -W,
+ and fix an incompatibility with newer gcc and binutils.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=422364
+
+--- invaders-1.0.0.orig/compile.sh
++++ invaders-1.0.0/compile.sh
+@@ -3,8 +3,8 @@
+ set -e
+ set -v
+ 
+-CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
+-LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
++CFLAGS="-ffreestanding -m32 -nostdinc -nostdlib -I. -O2 -W -Wall"
++LDFLAGS="-Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
+ gcc $CFLAGS -c keyboard.c
+ gcc $CFLAGS -c delay.c
+ gcc $CFLAGS -c common.c
+@@ -14,5 +14,5 @@ gcc $CFLAGS -c kernel.c
+ gcc $CFLAGS -c video.c
+ gcc $CFLAGS -c memory.c
+ gcc $CFLAGS -c boot.S
+-gcc $LDFLAGS -o invaders.exec boot.o kernel.o keyboard.o video.o game.o sound.o delay.o common.o memory.o
++gcc $CFLAGS $LDFLAGS -o invaders.exec boot.o kernel.o keyboard.o video.o game.o sound.o delay.o common.o memory.o
+ objcopy -O binary invaders.exec invaders
diff --git a/02-static-inline.patch b/02-static-inline.patch
new file mode 100644
index 000000000000..537fb7c2261c
--- /dev/null
+++ b/02-static-inline.patch
@@ -0,0 +1,39 @@
+Author: Fabian Greffrath <fabian+debian@greffrath.com>
+Description: Replace "extern inline" with "static inline" in io.h
+ to allow for non-optimized builds.
+
+--- invaders-1.0.0.orig/io.h
++++ invaders-1.0.0/io.h
+@@ -50,7 +50,7 @@
+  * Talk about misusing macros..
+  */
+ #define __OUT1(s,x) \
+-extern inline void out##s(unsigned x value, unsigned short port) {
++static inline void out##s(unsigned x value, unsigned short port) {
+ 
+ #define __OUT2(s,s1,s2) \
+ __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
+@@ -60,7 +60,7 @@ __OUT1(s,x) __OUT2(s,s1,"w") : : "a" (va
+ __OUT1(s##_p,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));} \
+ 
+ #define __IN1(s) \
+-extern inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;
++static inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;
+ 
+ #define __IN2(s,s1,s2) \
+ __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
+@@ -70,12 +70,12 @@
+ __IN1(s##_p) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \
+ 
+ #define __INS(s) \
+-extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \
++static inline void ins##s(unsigned short port, void * addr, unsigned long count) \
+ { __asm__ __volatile__ ("rep ; ins" #s \
+ : "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+ 
+ #define __OUTS(s) \
+-extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
++static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
+ { __asm__ __volatile__ ("rep ; outs" #s \
+ : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+ 
diff --git a/0002-reboot-on-esc.patch b/03-reboot-on-esc.patch
index 6b49123e40ec..ae612507acd9 100644
--- a/0002-reboot-on-esc.patch
+++ b/03-reboot-on-esc.patch
@@ -1,4 +1,6 @@
-Reboot the machine when the ESC key is pressed (taken from memtest86_3.5-2).
+Author: Fabian Greffrath <fabian+debian@greffrath.com>
+Description: Reboot the machine when the ESC key is pressed,
+ reboot() taken from memtest86_3.5-2.
 
 --- invaders-1.0.0.orig/game.c
 +++ invaders-1.0.0/game.c
@@ -14,7 +16,7 @@ Reboot the machine when the ESC key is pressed (taken from memtest86_3.5-2).
  
  static bool gameover, winner;
  
-+inline void reboot()
++static inline void reboot()
 +{
 +  /* tell the BIOS to do a warm start */
 +  *((unsigned short *)0x472) = 0x1234;
diff --git a/04-change-colors.patch b/04-change-colors.patch
new file mode 100644
index 000000000000..19e54809a2bf
--- /dev/null
+++ b/04-change-colors.patch
@@ -0,0 +1,107 @@
+Author: Fabian Greffrath <fabian+debian@greffrath.com>
+Description: Use PgUp and PgDown to toggle through the color palette
+ and use a secret key to toggle "psychedelic mode". ;)
+
+--- invaders-1.0.0.orig/game.c
++++ invaders-1.0.0/game.c
+@@ -10,6 +10,8 @@ struct shot_t {
+ #define NUMSHOTS 5
+ static struct shot_t shots[NUMSHOTS];
+ static int8 ship,shipmove;
++static int8 shotcolor=4,shipcolor=5,aliencolor=3;
++static bool psychedelic=false;
+ 
+ struct alien_t {
+   int8 x,y; // x==-1 -> dead alien
+@@ -27,6 +29,19 @@ inline void reboot()
+   outb(0xfe,0x64);
+ };
+ 
++void changecolors(int c)
++{
++        shotcolor+=c;
++        if (shotcolor>15) shotcolor=1;
++        else if (shotcolor<1) shotcolor=15;
++        shipcolor+=c;
++        if (shipcolor>15) shipcolor=1;
++        else if (shipcolor<1) shipcolor=15;
++        aliencolor+=c;
++        if (aliencolor>15) aliencolor=1;
++        else if (aliencolor<1) aliencolor=15;
++}
++
+ void resetgame()
+ {
+   gameover=false;
+@@ -59,7 +74,7 @@ void display()
+   // display shots
+   {
+     uint8 i;
+-    video_usecolor(4,0);
++    video_usecolor(shotcolor,0);
+     for (i=0;i<NUMSHOTS;++i) {
+       if (shots[i].x!=-1) {
+ 	video_putchar(shots[i].x,shots[i].y,'|');
+@@ -69,7 +84,7 @@ void display()
+ 
+   // display ship
+   {
+-    video_usecolor(5,0);
++    video_usecolor(shipcolor,0);
+     video_putchar(ship-1,24,'/');
+     video_putchar(ship,23,'_');
+     video_putchar(ship+1,24,'\\');
+@@ -78,7 +93,7 @@ void display()
+   // display aliens
+   {
+     uint8 i;
+-    video_usecolor(3,0);
++    video_usecolor(aliencolor,0);
+     for (i=0;i<NUMALIENS;++i) {
+       if (aliens[i].x!=-1) {
+ 	video_putchar(aliens[i].x-1,aliens[i].y,'-');
+@@ -133,6 +148,25 @@ void keywork()
+         reboot();
+       }
+       break;
++    case 'u':
++      if (pressed) {
++        changecolors(+1);
++      }
++      break;
++    case 'd':
++      if (pressed) {
++        changecolors(-1);
++      }
++      break;
++    case '0':
++      if (pressed) {
++        if (psychedelic==false) psychedelic=true;
++        else {
++          psychedelic=false;
++          shotcolor=4,shipcolor=5,aliencolor=3;
++        }
++      }
++      break;
+     };
+   };
+ };
+@@ -233,6 +267,7 @@ void game()
+       sounder();
+       keywork();
+       calculate();
++      if (psychedelic==true) changecolors(+1);
+     };
+ 
+     displaygameover();
+--- invaders-1.0.0.orig/keyboard.c
++++ invaders-1.0.0/keyboard.c
+@@ -31,6 +31,8 @@ void key_decode(uint8 *key, bool *presse
+     if (c==0x4b) *key='<';
+     if (c==0x48) *key='^';
+     if (c==0x50) *key='v';
++    if (c==0x49) *key='u';
++    if (c==0x51) *key='d';
+   }else{
+     *pressed = ((c&0x80) == 0) ? true : false;
+     c &= ~0x80;
diff --git a/05-pause.patch b/05-pause.patch
new file mode 100644
index 000000000000..e4a90f6fc6fe
--- /dev/null
+++ b/05-pause.patch
@@ -0,0 +1,49 @@
+Author: Fabian Greffrath <fabian+debian@greffrath.com>
+Description: Use "P" to pause and resume.
+
+--- invaders-1.0.0.orig/game.c
++++ invaders-1.0.0/game.c
+@@ -42,6 +42,21 @@ void changecolors(int c)
+         else if (aliencolor<1) aliencolor=15;
+ }
+ 
++void displaypause()
++{
++  uint8 key;
++  bool pressed;
++
++  video_usecolor(6,1);
++  video_putstring(30,10,"    PAUSE    ");
++  video_putstring(30,11,"  PRESS \'P\'  ");
++  video_update();
++  do{
++    key_decode(&key,&pressed);
++    key_polling();
++  } while (!(pressed&&(key=='p')));
++};
++
+ void resetgame()
+ {
+   gameover=false;
+@@ -167,6 +182,11 @@ void keywork()
+         }
+       }
+       break;
++    case 'p':
++      if (pressed) {
++        displaypause();
++      }
++      break;
+     };
+   };
+ };
+--- invaders-1.0.0.orig/keyboard.c
++++ invaders-1.0.0/keyboard.c
+@@ -42,6 +42,7 @@ void key_decode(uint8 *key, bool *presse
+     if (c==1) *key='@';
+     if (c==0x1c) *key='e';
+     if (c==0x39) *key=' ';
++    if (c==0x19) *key='p';
+   };
+ };
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 23ee4835e8bc..4f0ca24addc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,41 @@
 
 pkgname=grubinvaders
 pkgver=1.0.0
-pkgrel=3
-pkgdesc="multi boot compliant game for i386 and compatible x86_64"
+pkgrel=4
+pkgdesc='multi boot compliant game for i386 and compatible x86_64'
 arch=('any')
 url="http://www.erikyyy.de/invaders/"
 license=('GPL2')
-makedepends=('gcc')
+install=${pkgname}.install
 source=("http://www.erikyyy.de/invaders/invaders-${pkgver}.tar.gz"
-	'0001-gcc_binutils_bugfix.patch'
-	'0002-reboot-on-esc.patch'
-	'0003-no-stack-protector.patch'
-	'0004-x86_64_envfix.patch'
+	'01-misspelling-loose.patch'
+	'01-uint8-char.patch'
+	'02-build-flags.patch'
+	'02-static-inline.patch'
+	'03-reboot-on-esc.patch'
+	'04-change-colors.patch'
+	'05-pause.patch'
 	'grub')
-install=${pkgname}.install
+sha256sums=('304c8b0f82eaec54b07250b0f39886e1d9fa23c48075213bf87c8f375781a845'
+            '02c0a9aa07afaec24af8537850251a1575616547bc760da37308974f90041864'
+            '6791e4ff7b1b4c3f8989fcc1565d9ebc2c47e18506a3db283f852ff6cf8f9fd7'
+            '0c251e0fba59b9aa548638f145d495ee67e69189a396c1c95b39081a26ac580c'
+            '4e3f542e8518b091cf97051468dc3f29cbb304162d60fd892108cf3d8c0f868b'
+            'eb3414a8b31cd26c5091847a52667903e47056f23ba1a5415ab7568a3f2f6bc5'
+            'fcea5bc771589d83441d8df44329aa0aa5ff8a987813f44a76a3314714f3a60e'
+            'dc102190cc815aff769bf3b5d56a4304c972bea647feb9e2e64c63661cfd123b'
+            'de564857bd69cb5680aa994bcd8b9119bcdb7d07fade0a4df4db950c871830f5')
 
 prepare() {
 	cd ${srcdir}/invaders/
 
-	patch -Np1 -i "${srcdir}/0001-gcc_binutils_bugfix.patch"
-	patch -Np1 -i "${srcdir}/0002-reboot-on-esc.patch"
-	patch -Np1 -i "${srcdir}/0003-no-stack-protector.patch"
-
-	[ "${CARCH}" = "x86_64" ] && patch -Np1 -i "${srcdir}/0004-x86_64_envfix.patch" || true
-
-	sed -i -e '/gcc $LDFLAGS/s/gcc/ld/' -e 's/-Wl,-N//' -e 's/-Wl,-Ttext//' -e 's/-Wl,100000//' -e 's/-Wl,--build-id=none//' compile.sh
+	patch -Np1 -i "${srcdir}/01-misspelling-loose.patch"
+	patch -Np1 -i "${srcdir}/01-uint8-char.patch"
+	patch -Np1 -i "${srcdir}/02-build-flags.patch"
+	patch -Np1 -i "${srcdir}/02-static-inline.patch"
+	patch -Np1 -i "${srcdir}/03-reboot-on-esc.patch"
+	patch -Np1 -i "${srcdir}/04-change-colors.patch"
+	patch -Np1 -i "${srcdir}/05-pause.patch"
 }
 
 build() {
@@ -41,9 +52,3 @@ package() {
 	install -m0755 -D ${srcdir}/grub ${pkgdir}/etc/grub.d/50_grubinvaders
 }
 
-sha256sums=('304c8b0f82eaec54b07250b0f39886e1d9fa23c48075213bf87c8f375781a845'
-            'c0c15db81101b6ffce3c6d142e207358155eac37970ddd3b31d4ebe42b703515'
-            '36ff7d4a546b9e1f15f62683120f7b7428d14a5ef15b4923e8179cd0ffcc9b99'
-            '46819946a00a81f8b8346a52778dd1c4f35ebc6ae82937e3eebde7b25dc4b3f4'
-            'a21caf867c156a664779a40f5139ca895f4d7915a22a7a792dffc0976a8c8c5b'
-            'fc36e67c91515aa619ca9616f517116d5cfd1f257fc142703a5ff01ec5dcfdab')
diff --git a/grub b/grub
index b6991d0cce89..1d24f51a4633 100644
--- a/grub
+++ b/grub
@@ -18,7 +18,7 @@ CLASS="--class game"
 if [ -e ${INVADERS_IMAGE} ] && is_path_readable_by_grub ${INVADERS_IMAGE}; then
 	# image exists, create menu entry
 	echo "Found Invaders image: ${INVADERS_IMAGE}" >&2
-	echo "menuentry "Grub Invaders" ${CLASS} {"
+	echo "menuentry \"Grub Invaders\" ${CLASS} {"
 	prepare_grub_to_access_device $(${grub_probe} --target=device ${INVADERS_IMAGE}) | sed -e "s/^/\t/"
 	echo -e "\tmultiboot $(make_system_path_relative_to_its_root ${INVADERS_IMAGE})"
 	echo "}"