From 6f8b63acfe7f15fe89c820b2c1a69004e11667f5 Mon Sep 17 00:00:00 2001
From: Peter Vicman <peter.vicman@gmail.com>
Date: Thu, 27 Jun 2019 11:54:38 +0200
Subject: [PATCH] touchscreen: fix a crash with segfaults on x64 machines

---
 .../tslib-20-fbutils_fix_x64_execution.patch  | 24 +++++++++++++++++++
 .../addons/service/touchscreen/changelog.txt  |  6 ++++-
 .../addons/service/touchscreen/package.mk     |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 packages/addons/addon-depends/tslib/patches/tslib-20-fbutils_fix_x64_execution.patch

diff --git a/packages/addons/addon-depends/tslib/patches/tslib-20-fbutils_fix_x64_execution.patch b/packages/addons/addon-depends/tslib/patches/tslib-20-fbutils_fix_x64_execution.patch
new file mode 100644
index 0000000000..9284e159ca
--- /dev/null
+++ b/packages/addons/addon-depends/tslib/patches/tslib-20-fbutils_fix_x64_execution.patch
@@ -0,0 +1,24 @@
+From c4c59790f3191c1a233fc1a61f8fedad85de1aeb Mon Sep 17 00:00:00 2001
+From: Peter Fink <pfink@christ-es.de>
+Date: Wed, 8 Feb 2017 14:04:45 +0100
+Subject: [PATCH] fbutils: Fix x64 execution. Call malloc not with a hardcoded
+ sizeof(__u32). This caused the application to crash with segfaults on x64
+ machines.
+
+---
+ tests/fbutils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/fbutils.c b/tests/fbutils.c
+index 8ee494bc..fd7fbfe9 100644
+--- a/tests/fbutils.c
++++ b/tests/fbutils.c
+@@ -138,7 +138,7 @@ int open_framebuffer(void)
+ 	memset(fbuffer,0,fix.smem_len);
+ 
+ 	bytes_per_pixel = (var.bits_per_pixel + 7) / 8;
+-	line_addr = malloc (sizeof (__u32) * var.yres_virtual);
++	line_addr = malloc (sizeof (line_addr) * var.yres_virtual);
+ 	addr = 0;
+ 	for (y = 0; y < var.yres_virtual; y++, addr += fix.line_length)
+ 		line_addr [y] = fbuffer + addr;
diff --git a/packages/addons/service/touchscreen/changelog.txt b/packages/addons/service/touchscreen/changelog.txt
index dd7002e078..1f539d5dcb 100644
--- a/packages/addons/service/touchscreen/changelog.txt
+++ b/packages/addons/service/touchscreen/changelog.txt
@@ -1,2 +1,6 @@
-+100
+102
+- Fix a crash with segfaults on x64 machines
+101
+- Update
+100
 - Initial release
diff --git a/packages/addons/service/touchscreen/package.mk b/packages/addons/service/touchscreen/package.mk
index a2e18b533f..cb8e460ccb 100644
--- a/packages/addons/service/touchscreen/package.mk
+++ b/packages/addons/service/touchscreen/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="touchscreen"
 PKG_VERSION="1.0"
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_ADDON_PROJECTS="Generic RPi"
 PKG_LICENSE="GPL"