diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-19 22:34:01 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-19 22:34:01 +0000 |
| commit | 44d3e0b7194a9fa97ed58a4c437c168749b8c58c (patch) | |
| tree | beec5a3000178a6b9faa155873165c71f5470b0c | |
| parent | c0cea500d5cb9e44c40c9f142b5cc006a132d32b (diff) | |
| download | packages-44d3e0b7194a9fa97ed58a4c437c168749b8c58c.tar.gz packages-44d3e0b7194a9fa97ed58a4c437c168749b8c58c.tar.bz2 packages-44d3e0b7194a9fa97ed58a4c437c168749b8c58c.tar.xz packages-44d3e0b7194a9fa97ed58a4c437c168749b8c58c.zip | |
user/mtdev: Fix input_event code for time64 compatibility
| -rw-r--r-- | user/mtdev/APKBUILD | 9 | ||||
| -rw-r--r-- | user/mtdev/time64.patch | 23 |
2 files changed, 29 insertions, 3 deletions
diff --git a/user/mtdev/APKBUILD b/user/mtdev/APKBUILD index 38b63184b..627226f67 100644 --- a/user/mtdev/APKBUILD +++ b/user/mtdev/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mtdev pkgver=1.1.5 -pkgrel=3 +pkgrel=4 pkgdesc="Multitouch Protocol Translation Library" url="http://bitmath.org/code/mtdev/" arch="all" @@ -11,7 +11,9 @@ depends="" depends_dev="linux-headers" makedepends="$depends_dev" subpackages="$pkgname-dev" -source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz" +source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz + time64.patch + " prepare() { default_prepare @@ -43,4 +45,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="f59f8cda9b81e17253ff2da93a14b6f8e48361aff890dd5d1bb89ca385d713c212f961ed34fc5b866affd83013530a036736faca071ec9a424091979a12c9208 mtdev-1.1.5.tar.gz" +sha512sums="f59f8cda9b81e17253ff2da93a14b6f8e48361aff890dd5d1bb89ca385d713c212f961ed34fc5b866affd83013530a036736faca071ec9a424091979a12c9208 mtdev-1.1.5.tar.gz +5192a6e02d647cbb9752ace62eadd3ce4bc9320e8429e98539eb261c3dee70b56ff424241eb74b01059a2c4bef62a9f54e0d8326982857be1ca21570d4c1dbeb time64.patch" diff --git a/user/mtdev/time64.patch b/user/mtdev/time64.patch new file mode 100644 index 000000000..248599d6f --- /dev/null +++ b/user/mtdev/time64.patch @@ -0,0 +1,23 @@ +--- mtdev-1.1.5/src/core.c.old 2013-07-25 07:57:40.000000000 +0000 ++++ mtdev-1.1.5/src/core.c 2020-01-19 19:25:23.141061642 +0000 +@@ -251,7 +251,8 @@ + count++; + if (!count) + return; +- ev.time = syn->time; ++ ev.input_event_sec = syn->input_event_sec; ++ ev.input_event_usec = syn->input_event_usec; + ev.type = EV_ABS; + ev.code = ABS_MT_SLOT; + ev.value = slot; +--- mtdev-1.1.5/test/mtdev-test.c.old 2014-02-28 18:48:23.000000000 +0000 ++++ mtdev-1.1.5/test/mtdev-test.c 2020-01-19 19:26:02.526687670 +0000 +@@ -47,7 +47,7 @@ + { + static const mstime_t ms = 1000; + static int slot; +- mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; ++ mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms; + if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) + slot = ev->value; + fprintf(stderr, "%012llx %02d %01d %04x %d\n", |