On Fri, Apr 10, 2020 at 12:35:14PM +0200, Marco Felsch wrote:
> A new version of tslib is needed at least for QT 5.14 if build with
> tslib support. The new version adds many new plugins since v1.1 was
> quite old. All local ptxdist patches are mainlined.
>
> 0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch:
> Commit 9623bbe ("Link plugins against libts") replaces this patch.
>
> 0002-ts_test-clear-screen-on-exit.patch:
> Commit 7ed3eef ("tests: clear screen on exit") replaces this patch.
>
> 0003-input-raw-call-check_fd-only-once.patch:
> Commit 2466d73 ("plugins: input-raw: check device properties only when
> filedesc changes") replaces this patch.
>
> Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
> ---
> ...inst-main-library-to-allow-dynamic-l.patch | 23 -----------
> .../0002-ts_test-clear-screen-on-exit.patch | 36 ------------------
> ...03-input-raw-call-check_fd-only-once.patch | 22 -----------
> patches/tslib-1.1/autogen.sh | 1 -
> patches/tslib-1.1/series | 6 ---
> rules/tslib.in | 8 +++-
> rules/tslib.make | 38 ++++++++++++++++---
> 7 files changed, 38 insertions(+), 96 deletions(-)
> delete mode 100644
> patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
> delete mode 100644 patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
> delete mode 100644
> patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
> delete mode 120000 patches/tslib-1.1/autogen.sh
> delete mode 100644 patches/tslib-1.1/series
>
> diff --git
> a/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
>
> b/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
> deleted file mode 100644
> index 941d36410..000000000
> ---
> a/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From: Denis Oliver Kropp <d...@directfb.org>
> -Date: Mon, 3 Feb 2014 09:57:25 +0100
> -Subject: [PATCH] Link plugins against main library to allow dynamic loading
> of
> - libts without RTLD_GLOBAL
> -
> -Signed-off-by: Denis Oliver Kropp <d...@directfb.org>
> ----
> - plugins/Makefile.am | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/plugins/Makefile.am b/plugins/Makefile.am
> -index e938e17..d8cbfd9 100644
> ---- a/plugins/Makefile.am
> -+++ b/plugins/Makefile.am
> -@@ -15,7 +15,7 @@ INCLUDES = -I$(top_srcdir)/src
> - #LTVSN = -version-info
> $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
> - # -release $(LT_RELEASE)
> - LTVSN = -avoid-version
> --LIBS =
> -+LIBS = $(top_srcdir)/src/libts.la
> - pluginexecdir = $(PLUGIN_DIR)
> -
> - if ENABLE_LINEAR_MODULE
> diff --git a/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
> b/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
> deleted file mode 100644
> index a1db4a147..000000000
> --- a/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From: Wolfram Sang <w.s...@pengutronix.de>
> -Date: Mon, 3 Feb 2014 09:57:25 +0100
> -Subject: [PATCH] ts_test: clear screen on exit
> -
> -Make sure that ts_test clears the screen on exit.
> -
> -Signed-off-by: Wolfram Sang <w.s...@pengutronix.de>
> ----
> - tests/ts_calibrate.c | 1 +
> - tests/ts_test.c | 1 +
> - 2 files changed, 2 insertions(+)
> -
> -diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c
> -index eb0aca3..ea503a4 100644
> ---- a/tests/ts_calibrate.c
> -+++ b/tests/ts_calibrate.c
> -@@ -268,6 +268,7 @@ int main()
> - i = -1;
> - }
> -
> -+ fillrect (0, 0, xres - 1, yres - 1, 0);
> - close_framebuffer();
> - return i;
> - }
> -diff --git a/tests/ts_test.c b/tests/ts_test.c
> -index fbbc9b8..d47c6e0 100644
> ---- a/tests/ts_test.c
> -+++ b/tests/ts_test.c
> -@@ -213,6 +213,7 @@ int main()
> - if (quit_pressed)
> - break;
> - }
> -+ fillrect (0, 0, xres - 1, yres - 1, 0);
> - close_framebuffer();
> -
> - return 0;
> diff --git a/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
> b/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
> deleted file mode 100644
> index d977c6365..000000000
> --- a/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -From: Michael Olbrich <m.olbr...@pengutronix.de>
> -Date: Mon, 3 Feb 2014 10:55:42 +0100
> -Subject: [PATCH] input-raw: call check_fd() only once
> -
> -Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
> ----
> - plugins/input-raw.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/plugins/input-raw.c b/plugins/input-raw.c
> -index 10454da..5ce0abb 100644
> ---- a/plugins/input-raw.c
> -+++ b/plugins/input-raw.c
> -@@ -129,7 +129,7 @@ static int check_fd(struct tslib_input *i)
> - i->grab_events = GRAB_EVENTS_ACTIVE;
> - }
> -
> -- return 0;
> -+ return 1;
> - }
> -
> - static int ts_input_read(struct tslib_module_info *inf,
> diff --git a/patches/tslib-1.1/autogen.sh b/patches/tslib-1.1/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7d..000000000
> --- a/patches/tslib-1.1/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/tslib-1.1/series b/patches/tslib-1.1/series
> deleted file mode 100644
> index adb440589..000000000
> --- a/patches/tslib-1.1/series
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
> -0002-ts_test-clear-screen-on-exit.patch
> -0003-input-raw-call-check_fd-only-once.patch
> -# bc8437f799188bde6c8ef1bd1f0ce6b7 - git-ptx-patches magic
> diff --git a/rules/tslib.in b/rules/tslib.in
> index 54a359edd..46a3984c9 100644
> --- a/rules/tslib.in
> +++ b/rules/tslib.in
> @@ -14,10 +14,12 @@ menuconfig TSLIB
> embedded devices to provide a common user space interface
> to touchscreen functionality.
>
> +if TSLIB
> +
> config TSLIB_TS_CALIBRATE
> bool
> + depends on SDL2
This does not work correctly. You need to add this to the main option:
select SDL2 if TSLIB_TS_CALIBRATE || TSLIB_TS_TEST
But I don't think we need this at all. The SDL dependency is optional. And
worse: not all tools are built when SDL is enabled. Specifically ts_test
seems to be missing.
> prompt "Install ts_calibrate on target"
> - depends on TSLIB
> help
> ts_calibrate is a graphical tool to calibrate the
> touch sensor. The app asks the user to tap a
> @@ -26,7 +28,9 @@ config TSLIB_TS_CALIBRATE
>
> config TSLIB_TS_TEST
> bool
> + depends on SDL2
> prompt "Install ts_test on target"
> - depends on TSLIB
> help
> Basic test program for touchscreen library.
> +
> +endif
> diff --git a/rules/tslib.make b/rules/tslib.make
> index e52f19357..5ee46aa4c 100644
> --- a/rules/tslib.make
> +++ b/rules/tslib.make
> @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_TSLIB) += tslib
> #
> # Paths and names
> #
> -TSLIB_VERSION := 1.1
> -TSLIB_MD5 := 6ee9bf26c18f06cfc0ceb278bb927589
> +TSLIB_VERSION := 1.21
> +TSLIB_MD5 := 96ada1cf6c69fbd87f3dd1f316c8e140
> TSLIB := tslib-$(TSLIB_VERSION)
> TSLIB_SUFFIX := tar.bz2
> -TSLIB_URL :=
> https://github.com/kergoth/tslib/releases/download/1.1/$(TSLIB).$(TSLIB_SUFFIX)
> +TSLIB_URL :=
> https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION)/$(TSLIB).$(TSLIB_SUFFIX)
> TSLIB_SOURCE := $(SRCDIR)/$(TSLIB).$(TSLIB_SUFFIX)
> TSLIB_DIR := $(BUILDDIR)/$(TSLIB)
>
> @@ -30,19 +30,45 @@ TSLIB_DIR := $(BUILDDIR)/$(TSLIB)
> #
> # autoconf
> #
> -TSLIB_CONF_TOOL :autoconf
> +
No newline here.
Michael
> +TSLIB_CONF_TOOL := autoconf
> TSLIB_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> --disable-static \
> + --disable-tools \
> + --enable-arctic2 \
> + --enable-collie \
> + --enable-corgi \
> + --enable-cy8mrln-palmpre \
> + --enable-debounce \
> --enable-shared \
> --enable-linear \
> --enable-dejitter \
> + --enable-dmc \
> + --enable-dmc_dus3000 \
> + --enable-evthres \
> + --enable-galax \
> + --enable-h3600 \
> + --enable-iir \
> + --enable-input \
> + --disable-input-evdev \
> + --enable-invert \
> --enable-linear-h2200 \
> + --enable-lowpass \
> + --enable-median \
> + --enable-mk712 \
> + --enable-one-wire-ts-input \
> --enable-variance \
> --enable-pthres \
> + --enable-skip \
> + --enable-tatung \
> + --enable-touchkit \
> + --enable-ucb1x00 \
> + --enable-waveshare \
> + --with-hidden_visibility=yes \
> + --$(call ptx/wwo, $(or PTXCONF_TSLIB_TS_CALIBRATE,
> PTXCONF_TSLIB_TS_TEST))-sdl2 \
> --disable-debug
>
> -
> #
> ----------------------------------------------------------------------------
> # Target-Install
> #
> ----------------------------------------------------------------------------
> @@ -59,7 +85,7 @@ $(STATEDIR)/tslib.targetinstall:
> @$(call install_alternative, tslib, 0, 0, 0644, \
> /etc/ts.conf)
>
> - @$(call install_lib, tslib, 0, 0, 0644, libts-1.0)
> + @$(call install_lib, tslib, 0, 0, 0644, libts)
>
> ifdef PTXCONF_TSLIB_TS_CALIBRATE
> @$(call install_copy, tslib, 0, 0, 0755, -, /usr/bin/ts_calibrate)
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
