Adopting package, upgrade to v4.1.0

3 files changed, 43 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb080a116466..71c444394297 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = atari800
 	pkgdesc = An emulator of the Atari 800/800XL/130XE/5200 with various extensions
-	pkgver = 4.0.0
+	pkgver = 4.1.0
 	pkgrel = 1
 	url = https://atari800.github.io
 	arch = i686
@@ -8,8 +8,10 @@ pkgbase = atari800
 	license = GPL2
 	depends = sdl
 	optdepends = libpng: PNG screenshot support
-	source = https://github.com/atari800/atari800/archive/ATARI800_4_0_0.tar.gz
-	md5sums = 5657fb4ad09258a692387e565aa1429b
+	source = https://github.com/atari800/atari800/archive/ATARI800_4_1_0.tar.gz
+	source = onscreenkeyboard.patch
+	sha256sums = 4b77c876db0c2eb2de2a82301e0cd8855d588db5ceec9594c32a9294c5d9de7c
+	sha256sums = ac52bcea73a20b2bbf8c060eafca96d4697a7dc96961e1ab28836b8a09808ff1
 
 pkgname = atari800
 
diff --git a/PKGBUILD b/PKGBUILD
index 1e1f143cd3f0..fd908a9f4905 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Vinzenz Vietzke <vinz at archlinux dot us>
 
 pkgname=atari800
-pkgver=4.0.0
+pkgver=4.1.0
 _pkgver=${pkgver//./_}
 pkgrel=1
 pkgdesc="An emulator of the Atari 800/800XL/130XE/5200 with various extensions"
@@ -13,19 +13,37 @@ url="https://atari800.github.io"
 license=('GPL2')
 depends=('sdl')
 optdepends=('libpng: PNG screenshot support')
-source=("https://github.com/atari800/${pkgname}/archive/ATARI800_${_pkgver}.tar.gz")
-md5sums=('5657fb4ad09258a692387e565aa1429b')
+source=("https://github.com/atari800/${pkgname}/archive/ATARI800_${_pkgver}.tar.gz"
+	"onscreenkeyboard.patch")
+sha256sums=('4b77c876db0c2eb2de2a82301e0cd8855d588db5ceec9594c32a9294c5d9de7c'
+	'ac52bcea73a20b2bbf8c060eafca96d4697a7dc96961e1ab28836b8a09808ff1')
+
+build() {
+    cd "${pkgname}-ATARI800_${_pkgver}"
+
+    # https://github.com/atari800/atari800/issues/58
+    patch -p0 < ${srcdir}/onscreenkeyboard.patch
 
-build()
-{
-    cd "${pkgname}-ATARI800_${_pkgver}"/src
     ./autogen.sh
-    ./configure --prefix=/usr
+
+    # configure default - neccessary
+    COPTS="--prefix=/usr"
+
+    # The R: Network device
+    #COPTS="${COPTS} --enable-riodevice"
+
+    # SIO Sound for true retro feeling
+    #COPTS="${COPTS} --enable-seriosound"
+
+    # OnScreen Keyboard
+    #COPTS="${COPTS} --enable-onscreenkeyboard"
+
+    ./configure ${COPTS}
     make
 }
 
-package() 
-{
+package() {
     cd "${pkgname}-ATARI800_${_pkgver}"/src
     make DESTDIR="${pkgdir}/" install
+    msg2 "\e[1;32mThis package has some options you might interested in. Have a look to COPTS at PKGBUILD. \e[0m"
 }
diff --git a/onscreenkeyboard.patch b/onscreenkeyboard.patch
new file mode 100644
index 000000000000..1cd79c934330
--- /dev/null
+++ b/onscreenkeyboard.patch
@@ -0,0 +1,11 @@
+--- src/sdl/input.c.org	2019-04-13 17:22:52.000000000 +0200
++++ src/sdl/input.c	2019-06-17 11:14:05.321262892 +0200
+@@ -1654,7 +1654,7 @@
+ 	static int repdelay_timeout = REPEAT_DELAY;
+ 	struct js_state *state = &sdl_js_state[0];
+ 
+-	if (! joystick0) return(AKEY_NONE);  /* no controller present */
++	if (! joysticks_found) return(AKEY_NONE);  /* no controller present */
+ 
+ 	update_SDL_joysticks();
+