diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-30 02:18:37 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-30 02:18:37 +0000 |
| commit | 22e505a37817140d7142255c0c440ba8951f24b6 (patch) | |
| tree | 48cd68b3037238795647559e61a464b18379231e | |
| parent | c76fbb6394b8371b7262660390c9c4098c1d5f0b (diff) | |
| download | packages-22e505a37817140d7142255c0c440ba8951f24b6.tar.gz packages-22e505a37817140d7142255c0c440ba8951f24b6.tar.bz2 packages-22e505a37817140d7142255c0c440ba8951f24b6.tar.xz packages-22e505a37817140d7142255c0c440ba8951f24b6.zip | |
user/mtdev: Bump to 1.1.6
| -rw-r--r-- | user/mtdev/APKBUILD | 10 | ||||
| -rw-r--r-- | user/mtdev/printf-format.patch | 19 | ||||
| -rw-r--r-- | user/mtdev/time64.patch | 23 |
3 files changed, 24 insertions, 28 deletions
diff --git a/user/mtdev/APKBUILD b/user/mtdev/APKBUILD index 627226f67..18a1826f0 100644 --- a/user/mtdev/APKBUILD +++ b/user/mtdev/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mtdev -pkgver=1.1.5 -pkgrel=4 +pkgver=1.1.6 +pkgrel=0 pkgdesc="Multitouch Protocol Translation Library" url="http://bitmath.org/code/mtdev/" arch="all" @@ -12,7 +12,7 @@ depends_dev="linux-headers" makedepends="$depends_dev" subpackages="$pkgname-dev" source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz - time64.patch + printf-format.patch " prepare() { @@ -45,5 +45,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="f59f8cda9b81e17253ff2da93a14b6f8e48361aff890dd5d1bb89ca385d713c212f961ed34fc5b866affd83013530a036736faca071ec9a424091979a12c9208 mtdev-1.1.5.tar.gz -5192a6e02d647cbb9752ace62eadd3ce4bc9320e8429e98539eb261c3dee70b56ff424241eb74b01059a2c4bef62a9f54e0d8326982857be1ca21570d4c1dbeb time64.patch" +sha512sums="e643264baa880abfc31b53f8e8ed54fe1adea4bc110fab57d36be16caba84f970c09fc864244c64b0a76e85f5f021fd086c12f96badbd886da6ccf254ab678e9 mtdev-1.1.6.tar.gz +5a429ab3f7773e86eafb5beaff466ca6e209a131bfc1fd633e3ba4bfdf92caadf5037a3e84efb512bdc12891b2cc44ebb61b826daf3e66a7735004cc1dcd2713 printf-format.patch" diff --git a/user/mtdev/printf-format.patch b/user/mtdev/printf-format.patch new file mode 100644 index 000000000..46d187f64 --- /dev/null +++ b/user/mtdev/printf-format.patch @@ -0,0 +1,19 @@ +--- mtdev-1.1.6/test/mtdev-test.c.old 2020-01-26 14:00:32.000000000 +0000 ++++ mtdev-1.1.6/test/mtdev-test.c 2020-01-30 02:17:49.009346559 +0000 +@@ -31,6 +31,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <stdint.h> ++#include <inttypes.h> + + #ifndef input_event_sec + #define input_event_sec time.tv_sec +@@ -56,7 +57,7 @@ + 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", ++ fprintf(stderr, "%012"PRIx64" %02d %01d %04x %d\n", + evtime, slot, ev->type, ev->code, ev->value); + } + diff --git a/user/mtdev/time64.patch b/user/mtdev/time64.patch deleted file mode 100644 index 248599d6f..000000000 --- a/user/mtdev/time64.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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", |