From d221e0389dc9bafd72e541090a9c401a25a84ce3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Jul 2020 16:13:21 -0500 Subject: meta-openembedded: subtree update:629696b64b..e93d527a33 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian (1): firewalld: upgrade 0.7.3 -> 0.7.5 Andre Carvalho (1): netcat: Set CVE_PRODUCT Andreas Müller (6): networkmanager: upgrade 1.22.10 -> 1.22.14 blueman: upgrade 2.1.1 -> 2.1.3 modemmanager: upgrade 1.12.10 -> 1.12.12 ibus: upgrade 1.5.21 -> 1.5.22 network-manager-applet: upgrade 1.16.0 -> 1.18.0 sysprof: remove linux-gnueabi-patch Armin Kuster (2): net-snmp: Security fix CVE-2019-20892 wireshark: Update to 3.2.5 Changqing Li (1): libmcrypt: set CLEANBROKEN Daniel Gomez (1): ttf-fonts: Update ttf-ubuntu-font-family recipe Fagundes, Paulo (1): redis-plus-plus: add recipe Hongxu Jia (1): networkmanager: fix Files/directories were installed but not shipped Jacopo Dall'Aglio (2): netplan: upgrade 0.98 -> 0.99 python3-libconf: add recipe version 2.0.1 Khem Raj (1): lirc: Inherit distutils-common-base Konrad Weihmann (6): ntop: remove static libs from dev package ruli: recipe cleanup postgresql: remove vacuumlo from contrib libconfig: remove cmake append from base package gattlib: remove includedir from base package openldap: packaging fixes Leon Anavi (63): python3-pyro4: Upgrade 4.77 -> 4.80 python3-rdflib: Upgrade 4.2.2 -> 5.0.0 python3-httplib2: Upgrade 0.17.3 -> 0.18.1 python3-cppy: Add new recipe python3-kiwisolver: Upgrade 1.1.0 -> 1.2.0 python3-sqlalchemy: Upgrade 1.3.17 -> 1.3.18 python3-greenlet: Upgrade 0.4.15 -> 0.4.16 python3-pkgconfig: Upgrade 1.4.0 -> 1.5.1 python3-msm: Upgrade 0.8.3 -> 0.8.7 python3-pulsectl: Upgrade 20.2.4 -> 20.5.1 python3-pybind11: Consolidate in a single file python3-pybind11: Upgrade 2.4.3 -> 2.5.0 python3-pyparted: Consolidate in a single file python3-pyparted: Upgrade 3.11.3 -> 3.11.6 python3-pywbem: Consolidate in a single file python3-pywbem: Upgrade 0.15.0 -> 0.17.2 python3-jsonrpcserver: Upgrade 4.1.2 -> 4.1.3 python3-humanize: Upgrade 2.4.0 -> 2.4.1 python3-autobahn: Upgrade 20.4.3 -> 20.6.2 python3-yappi: Upgrade 1.0 -> 1.2.5 python3-sympy: Upgrade 1.5.1 -> 1.6 python3-watchdog: Upgrade 0.10.2 -> 0.10.3 python3-tqdm: Upgrade 4.43.0 -> 4.47.0 python3-pyflakes: Upgrade 2.1.1 -> 2.2.0 python3-pymisp: Upgrade 2.4.122 -> 2.4.128 python3-pychromecast: Upgrade 4.2.3 -> 7.0.1 python3-py: Upgrade 1.8.2 -> 1.9.0 python3-html5lib: Upgrade 1.0.1 -> 1.1 python3-lz4: Upgrade 3.0.2 -> 3.1.0 python3-cassandra-driver: Upgrade 3.14.0 -> 3.24.0 python3-configargparse: Upgrade 0.15.1 -> 1.2.3 python3-cachetools: Upgrade 4.1.0 -> 4.1.1 python3-keras-preprocessing: Upgrade 1.1.0 -> 1.1.2 python3-pywbem: Upgrade 0.17.2 -> 0.17.3 python3-h2: Consolidate in a single file python3-h2: Upgrade 3.1.1 -> 3.2.0 python3-requests: Upgrade 2.23.0 -> 2.24.0 python3-google-api-python-client: Upgrade 1.7.11 -> 1.9.3 python3-pyperclip: Upgrade 1.7.0 -> 1.8.0 python3-pyhamcrest: Upgrade 1.9.0 -> 2.0.2 python3-pint: Upgrade 0.13 -> 0.14 python3-dbus-next: Upgrade 0.1.2 -> 0.1.3 python3-pybluez: Upgrade 0.22 -> 0.23 python3-stevedore: Upgrade 1.31.0 -> 2.0.1 python3-h5py: Upgrade 2.9.0 -> 2.10.0 python3-cryptography-vectors: Upgrade 2.8 -> 2.9.2 python3-importlib-metadata: Upgrade 1.6.1 -> 1.7.0 python3-websocket-client: Upgrade 0.56.0 -> 0.57.0 python3-sentry-sdk: Upgrade 0.14.0 -> 0.16.0 python3-regex: Upgrade 2020.1.8 -> 2020.6.8 python3-python-vlc: Upgrade 3.0.9113 -> 3.0.10114 python3-robotframework: Upgrade 3.0.4 -> 3.2.1 python3-pychromecast: Upgrade 7.0.1 -> 7.1.0 python3-pyasn1-modules: Consolidate in a single file python3-pyasn1-modules: Upgrade 0.2.7 -> 0.2.8 python3-sympy: Upgrade 1.6 -> 1.6.1 python3-pychromecast: Upgrade 7.1.0 -> 7.1.1 python3-imageio: Upgrade 2.8.0 -> 2.9.0 python3-humanize: Upgrade 2.4.1 -> 2.5.0 python3-tinyrecord: Upgrade 0.1.5 -> 0.2.0 python3-luma-oled: Upgrade 3.4.0 -> 3.5.0 python3-pyconnman: Consolidate in a single file python3-jsonref: Consolidate in a single file Pierre-Jean Texier (4): minicoredumper: update SRC_URI to use github instead tslib: upgrade 1.21 -> 1.22 haveged: upgrade 1.9.9 -> 1.9.13 xxhash: upgrade 0.7.3 -> 0.7.4 Qi.Chen@windriver.com (1): multipath-tools: disable parallel build as a workaround Robert Yang (1): drbd-utils: Add CLEANBROKEN to fix rebuild errors Sakib Sajal (2): python3-betamax: add recipe cunit: add ptest Wang Mingyu (2): nspr: upgrade 4.25 -> 4.26 python3-pytest: upgrade 5.4.2 -> 5.4.3 Zang Ruochen (20): python3-ansicolors: Enable ptest python3-anyjson: Enable ptest python3-atomicwrites: upgrade 1.3.0 -> 1.4.0 python3-backports-functools-lru-cache: Enable ptest python3-bcrypt: Enable ptest nftables: upgrade 0.9.5 -> 0.9.6 ccid: upgrade 1.4.32 -> 1.4.33 docopt.cpp: upgrade 0.6.2 -> 0.6.3 libiio: upgrade 0.20 -> 0.21 librelp: upgrade 1.5.0 -> 1.6.0 redis: upgrade 6.0.4 -> 6.0.5 rsyslog: upgrade 0.2004.0 -> 0.2006.0 libnet-dns-perl: upgrade 1.24 -> 1.25 python3-blinker: Enable ptest python3-cbor2: Enable ptest python3-click: Enable ptest python3-u-msgpack-python: Enable ptest fuse3: Enable ptest sshfs-fuse: Enable ptest python3-wcwidth: Enable ptest Zheng Ruoqin (7): Fix build error when enable multilib. tracker: Fix build error when enable multilib. mraa: Disable python2, otherwise, there is a build error when enable multilib. paho-mqtt-c: Fix build error when enable multilib. upm:Fix build error when enable multilib. python3-unidiff: Enable ptest python3-uritemplate: Enable ptest Signed-off-by: Andrew Geissler Change-Id: I26a4e709d5f1416e73ec42e6dfc0e702dd1079bb --- ...error-with-input_event_sec-for-old-kernel.patch | 30 -- ...x-build-on-32bit-arches-with-64bit-time_t.patch | 389 --------------------- .../meta-oe/recipes-graphics/tslib/tslib_1.21.bb | 84 ----- .../meta-oe/recipes-graphics/tslib/tslib_1.22.bb | 81 +++++ .../ttf-fonts/ttf-ubuntu-font-family_0.80.bb | 20 -- .../ttf-fonts/ttf-ubuntu-font-family_0.83.bb | 23 ++ 6 files changed, 104 insertions(+), 523 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb (limited to 'meta-openembedded/meta-oe/recipes-graphics') diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch deleted file mode 100644 index ea8a9e5651..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 050bf24c16e95f63a76e13156346a072035d45b4 Mon Sep 17 00:00:00 2001 -From: Evan Harvey -Date: Thu, 19 Mar 2020 01:32:03 -0700 -Subject: [PATCH] Fix build error with input_event_sec for old kernel - -Upstream-Status: Backport [https://github.com/libts/tslib/commit/050bf24c16e95f63a76e13156346a072035d45b4] -Signed-off-by: Khem Raj ---- - tools/ts_uinput.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c -index 1832a07..9c40bb3 100644 ---- a/tools/ts_uinput.c -+++ b/tools/ts_uinput.c -@@ -51,6 +51,11 @@ - #include - #endif - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #define RESET "\033[0m" - #define RED "\033[31m" - #define GREEN "\033[32m" --- -2.26.2 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index 59bd97a0f2..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null @@ -1,389 +0,0 @@ -From 5455055660700be18eb8800e56e2423031ed4c76 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Nov 2019 19:59:29 -0800 -Subject: [PATCH] Fix build on 32bit arches with 64bit time_t - -time element is deprecated on new input_event structure in kernel's -input.h [1] - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f - -Upstream-Status: Submitted [https://github.com/libts/tslib/pull/162] - -Signed-off-by: Khem Raj ---- - plugins/input-raw.c | 59 +++++++++++++++++++++++++++------------- - tools/ts_uinput.c | 66 ++++++++++++++++++++++++++++++--------------- - 2 files changed, 85 insertions(+), 40 deletions(-) - -diff --git a/plugins/input-raw.c b/plugins/input-raw.c -index 64f0156..f030836 100644 ---- a/plugins/input-raw.c -+++ b/plugins/input-raw.c -@@ -40,6 +40,11 @@ - # include - #endif - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #ifndef EV_SYN /* 2.4 kernel headers */ - # define EV_SYN 0x00 - #endif -@@ -384,7 +389,8 @@ static int ts_input_read(struct tslib_module_info *inf, - samp->y = i->current_y; - samp->pressure = i->current_p; - } -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - #ifdef DEBUG - fprintf(stderr, - "RAW---------------------> %d %d %d %ld.%ld\n", -@@ -519,7 +525,8 @@ static int ts_input_read(struct tslib_module_info *inf, - samp->pressure = i->current_p = ev.value; - break; - } -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - #ifdef DEBUG - fprintf(stderr, - "RAW---------------------------> %d %d %d\n", -@@ -536,7 +543,8 @@ static int ts_input_read(struct tslib_module_info *inf, - samp->x = 0; - samp->y = 0; - samp->pressure = 0; -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - samp++; - total++; - } -@@ -651,7 +659,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - switch (i->ev[it].code) { - case BTN_TOUCH: - i->buf[total][i->slot].pen_down = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - if (i->ev[it].value == 0) - pen_up = 1; -@@ -751,7 +760,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - // fall through - case ABS_MT_POSITION_X: - i->buf[total][i->slot].x = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_Y: -@@ -760,7 +770,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - // fall through - case ABS_MT_POSITION_Y: - i->buf[total][i->slot].y = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_PRESSURE: -@@ -769,12 +780,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - // fall through - case ABS_MT_PRESSURE: - i->buf[total][i->slot].pressure = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_TOOL_X: - i->buf[total][i->slot].tool_x = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - /* for future use - * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; -@@ -782,7 +795,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - break; - case ABS_MT_TOOL_Y: - i->buf[total][i->slot].tool_y = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - /* for future use - * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; -@@ -790,7 +804,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - break; - case ABS_MT_TOOL_TYPE: - i->buf[total][i->slot].tool_type = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - /* for future use - * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; -@@ -798,12 +813,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - break; - case ABS_MT_ORIENTATION: - i->buf[total][i->slot].orientation = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_DISTANCE: - i->buf[total][i->slot].distance = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - - if (i->special_device == EGALAX_VERSION_210) { -@@ -816,34 +833,40 @@ static int ts_input_read_mt(struct tslib_module_info *inf, - break; - case ABS_MT_BLOB_ID: - i->buf[total][i->slot].blob_id = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_TOUCH_MAJOR: - i->buf[total][i->slot].touch_major = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - if (i->ev[it].value == 0) - i->buf[total][i->slot].pressure = 0; - break; - case ABS_MT_WIDTH_MAJOR: - i->buf[total][i->slot].width_major = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_TOUCH_MINOR: - i->buf[total][i->slot].touch_minor = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_WIDTH_MINOR: - i->buf[total][i->slot].width_minor = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - break; - case ABS_MT_TRACKING_ID: - i->buf[total][i->slot].tracking_id = i->ev[it].value; -- i->buf[total][i->slot].tv = i->ev[it].time; -+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; -+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; - i->buf[total][i->slot].valid |= TSLIB_MT_VALID; - if (i->ev[it].value == -1) - i->buf[total][i->slot].pressure = 0; -diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c -index 6ca4c3d..1832a07 100644 ---- a/tools/ts_uinput.c -+++ b/tools/ts_uinput.c -@@ -170,14 +170,16 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, - continue; - - if (s[j][i].pen_down == 1) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_KEY; - data->ev[c].code = BTN_TOUCH; - data->ev[c].value = s[j][i].pen_down; - c++; - } - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_SLOT; - data->ev[c].value = s[j][i].slot; -@@ -190,111 +192,129 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, - * we should use slot 1 and so on. - */ - if (i == 0) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_X; - data->ev[c].value = s[j][i].x; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_Y; - data->ev[c].value = s[j][i].y; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_PRESSURE; - data->ev[c].value = s[j][i].pressure; - c++; - } - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_POSITION_X; - data->ev[c].value = s[j][i].x; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_POSITION_Y; - data->ev[c].value = s[j][i].y; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_PRESSURE; - data->ev[c].value = s[j][i].pressure; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOUCH_MAJOR; - data->ev[c].value = s[j][i].touch_major; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_WIDTH_MAJOR; - data->ev[c].value = s[j][i].width_major; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOUCH_MINOR; - data->ev[c].value = s[j][i].touch_minor; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_WIDTH_MINOR; - data->ev[c].value = s[j][i].width_minor; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOOL_TYPE; - data->ev[c].value = s[j][i].tool_type; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOOL_X; - data->ev[c].value = s[j][i].tool_x; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TOOL_Y; - data->ev[c].value = s[j][i].tool_y; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_ORIENTATION; - data->ev[c].value = s[j][i].orientation; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_DISTANCE; - data->ev[c].value = s[j][i].distance; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_BLOB_ID; - data->ev[c].value = s[j][i].blob_id; - c++; - -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_ABS; - data->ev[c].code = ABS_MT_TRACKING_ID; - data->ev[c].value = s[j][i].tracking_id; - c++; - - if (data->mt_type_a == 1) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_SYN; - data->ev[c].code = SYN_MT_REPORT; - data->ev[c].value = 0; -@@ -302,7 +322,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, - } - - if (s[j][i].pen_down == 0) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_KEY; - data->ev[c].code = BTN_TOUCH; - data->ev[c].value = s[j][i].pen_down; -@@ -312,7 +333,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, - } - - if (c > 0) { -- data->ev[c].time = s[j][i].tv; -+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; -+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; - data->ev[c].type = EV_SYN; - data->ev[c].code = SYN_REPORT; - data->ev[c].value = 0; --- -2.24.0 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb deleted file mode 100644 index 76c4231441..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb +++ /dev/null @@ -1,84 +0,0 @@ -SUMMARY = "An abstraction layer for touchscreen panel events" -DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ -events, as well as a filter stack for the manipulation of those events. \ -Tslib is generally used on embedded devices to provide a common user \ -space interface to touchscreen functionality." -HOMEPAGE = "http://tslib.org/" - -AUTHOR = "Martin Kepplinger " -SECTION = "base" -LICENSE = "LGPLv2+ & GPLv2+" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594 \ - file://tests/COPYING;md5=a23a74b3f4caf9616230789d94217acb \ -" - -SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ - file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ - file://0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch \ - file://ts.conf \ - file://tslib.sh \ -" -SRC_URI[md5sum] = "b2b20d3ed520128513f8d3135b42e142" -SRC_URI[sha256sum] = "d2a57b823ea59e53a3b130eef05dfed1190b857854f886eec764e1ca1957cf56" - -UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" -PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" -PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" -PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" -PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" -PACKAGECONFIG[median] = "--enable-median,--disable-median" -PACKAGECONFIG[pthres] = "--enable-pthres,--disable-pthres" -PACKAGECONFIG[skip] = "--enable-skip,--disable-skip" -PACKAGECONFIG[lowpass] = "--enable-lowpass,--disable-lowpass" -PACKAGECONFIG[invert] = "--enable-invert,--disable-invert" -PACKAGECONFIG[variance] = "--enable-variance,--disable-variance" -PACKAGECONFIG[input] = "--enable-input,--disable-input" -PACKAGECONFIG[tatung] = "--enable-tatung,--disable-tatung" -PACKAGECONFIG[touchkit] = "--enable-touchkit,--disable-touchkit" -PACKAGECONFIG[waveshare] = "--enable-waveshare,--disable-waveshare" -PACKAGECONFIG[ucb1x00] = "--enable-ucb1x00,--disable-ucb1x00" -PACKAGECONFIG[mk712] = "--enable-mk712,--disable-mk712" -PACKAGECONFIG[h3600] = "--enable-h3600,--disable-h3600" -PACKAGECONFIG[dmc] = "--enable-dmc,--disable-dmc" -PACKAGECONFIG[linear-h2200] = "--enable-linear-h2200,--disable-linear-h2200" -PACKAGECONFIG[corgi] = "--enable-corgi,--disable-corgi" -PACKAGECONFIG[collie] = "--enable-collie,--disable-collie" -PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" -PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" -PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" -PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" - -do_install_prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ -} - -RPROVIDES_tslib-conf = "libts-0.0-conf" - -PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate tslib-uinput" -DEBIAN_NOAUTONAME_tslib-conf = "1" -DEBIAN_NOAUTONAME_tslib-tests = "1" -DEBIAN_NOAUTONAME_tslib-calibrate = "1" -DEBIAN_NOAUTONAME_tslib-uinput = "1" - -RDEPENDS_${PN} = "tslib-conf" -RRECOMMENDS_${PN} = "pointercal" - -FILES_${PN}-dev += "${libdir}/ts/*.la" -FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" -FILES_tslib-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-uinput += "${bindir}/ts_uinput" - -FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ - ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev ${bindir}/ts_conf" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb new file mode 100644 index 0000000000..5d35088572 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb @@ -0,0 +1,81 @@ +SUMMARY = "An abstraction layer for touchscreen panel events" +DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ +events, as well as a filter stack for the manipulation of those events. \ +Tslib is generally used on embedded devices to provide a common user \ +space interface to touchscreen functionality." +HOMEPAGE = "http://tslib.org/" + +AUTHOR = "Martin Kepplinger " +SECTION = "base" +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594 \ + file://tests/COPYING;md5=a23a74b3f4caf9616230789d94217acb \ +" + +SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ + file://ts.conf \ + file://tslib.sh \ + " +SRC_URI[sha256sum] = "aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a" + +UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" +PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" +PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" +PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" +PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" +PACKAGECONFIG[median] = "--enable-median,--disable-median" +PACKAGECONFIG[pthres] = "--enable-pthres,--disable-pthres" +PACKAGECONFIG[skip] = "--enable-skip,--disable-skip" +PACKAGECONFIG[lowpass] = "--enable-lowpass,--disable-lowpass" +PACKAGECONFIG[invert] = "--enable-invert,--disable-invert" +PACKAGECONFIG[variance] = "--enable-variance,--disable-variance" +PACKAGECONFIG[input] = "--enable-input,--disable-input" +PACKAGECONFIG[tatung] = "--enable-tatung,--disable-tatung" +PACKAGECONFIG[touchkit] = "--enable-touchkit,--disable-touchkit" +PACKAGECONFIG[waveshare] = "--enable-waveshare,--disable-waveshare" +PACKAGECONFIG[ucb1x00] = "--enable-ucb1x00,--disable-ucb1x00" +PACKAGECONFIG[mk712] = "--enable-mk712,--disable-mk712" +PACKAGECONFIG[h3600] = "--enable-h3600,--disable-h3600" +PACKAGECONFIG[dmc] = "--enable-dmc,--disable-dmc" +PACKAGECONFIG[linear-h2200] = "--enable-linear-h2200,--disable-linear-h2200" +PACKAGECONFIG[corgi] = "--enable-corgi,--disable-corgi" +PACKAGECONFIG[collie] = "--enable-collie,--disable-collie" +PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" +PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" +PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" +PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ +} + +RPROVIDES_tslib-conf = "libts-0.0-conf" + +PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate tslib-uinput" +DEBIAN_NOAUTONAME_tslib-conf = "1" +DEBIAN_NOAUTONAME_tslib-tests = "1" +DEBIAN_NOAUTONAME_tslib-calibrate = "1" +DEBIAN_NOAUTONAME_tslib-uinput = "1" + +RDEPENDS_${PN} = "tslib-conf" +RRECOMMENDS_${PN} = "pointercal" + +FILES_${PN}-dev += "${libdir}/ts/*.la" +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-uinput += "${bindir}/ts_uinput" + +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ + ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev ${bindir}/ts_conf" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb deleted file mode 100644 index d5d1b9a177..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb +++ /dev/null @@ -1,20 +0,0 @@ -require ttf.inc - -SUMMARY = "Ubuntu Font Family - TTF Version" -HOMEPAGE = "http://font.ubuntu.com" -LICENSE = "UFL" -LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=325a1a9029112a2405e743c7f816427b" -PR = "r1" - -SRC_URI = "http://font.ubuntu.com/download/ubuntu-font-family-${PV}.zip" - -SRC_URI[md5sum] = "a1fc70f5a5b1d096ab8310886cddaa1c" -SRC_URI[sha256sum] = "107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c" - -S = "${WORKDIR}/ubuntu-font-family-${PV}" - -PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans" -FONT_PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans" - -FILES_ttf-ubuntu-mono = "${datadir}/fonts/truetype/*Mono*" -FILES_ttf-ubuntu-sans = "${datadir}/fonts/truetype/Ubuntu-*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb new file mode 100644 index 0000000000..b8aa4c01c5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb @@ -0,0 +1,23 @@ +require ttf.inc + +SUMMARY = "Ubuntu Font Family - TTF Version" +HOMEPAGE = "http://font.ubuntu.com" +LICENSE = "UFL" +LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=325a1a9029112a2405e743c7f816427b" +PR = "r1" + +SHA1SUM = "0cef8205" + +SRC_URI = "https://assets.ubuntu.com/v1/${SHA1SUM}-ubuntu-font-family-${PV}.zip" + + +SRC_URI[md5sum] = "c5a5059d6856b4ddf79d824dcaf5ad32" +SRC_URI[sha256sum] = "61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf" + +S = "${WORKDIR}/ubuntu-font-family-${PV}" + +PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans" +FONT_PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans" + +FILES_ttf-ubuntu-mono = "${datadir}/fonts/truetype/*Mono*" +FILES_ttf-ubuntu-sans = "${datadir}/fonts/truetype/Ubuntu-*" -- cgit v1.2.3