tslib: fix the bug with loading libts-1.0.so

Touchpad did not work in the qtdemoE if the library libts-1.0.so was not loaded
manually using the LD_PRELOAD variable. This problem was fixed in the tslib mainline
https://github.com/kergoth/tslib after the 1.0 release. We just import the patch.

(From OE-Core rev: 0ba6d91dc527908740890c896b834e7216b0d2fb)

(From OE-Core rev: cf9fbfcb65c09d70613eb6ab87e0b9121cfcc34c)

Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dmitry Cherukhin 2011-11-02 13:03:19 +01:00 committed by Richard Purdie
parent aaea770f1f
commit 5a41a612c9
2 changed files with 59 additions and 1 deletions

View File

@ -0,0 +1,57 @@
From 9623bbedf4ff409e5036edfcfe52b2595932a6d7 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sat, 1 Nov 2008 20:46:07 +0000
Subject: [PATCH] Link plugins against libts
Some plugins use tslib functions. Link those plugins against libts.
The problem is easy to see with LDFLAGS="-Wl,-no-undefined".
Without this change DirectFB in unable to use tslib because symbols
in the tslib plugins can't be resolved.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Chris Larson <clarson@kergoth.com>
The patch was imported from git server git://github.com/kergoth/tslib.git
as of commit id 9623bbedf4ff409e5036edfcfe52b2595932a6d7.
Upstream-Status: Accepted
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
plugins/Makefile.am | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 3b902c2..4c4ef8b 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -114,15 +114,19 @@ pluginexec_LTLIBRARIES = \
variance_la_SOURCES = variance.c
variance_la_LDFLAGS = -module $(LTVSN)
+variance_la_LIBADD = $(top_builddir)/src/libts.la
dejitter_la_SOURCES = dejitter.c
dejitter_la_LDFLAGS = -module $(LTVSN)
+dejitter_la_LIBADD = $(top_builddir)/src/libts.la
linear_la_SOURCES = linear.c
linear_la_LDFLAGS = -module $(LTVSN)
+linear_la_LIBADD = $(top_builddir)/src/libts.la
pthres_la_SOURCES = pthres.c
pthres_la_LDFLAGS = -module $(LTVSN)
+pthres_la_LIBADD = $(top_builddir)/src/libts.la
# hw access
corgi_la_SOURCES = corgi-raw.c
@@ -148,6 +152,7 @@ tatung_la_LDFLAGS = -module $(LTVSN)
input_la_SOURCES = input-raw.c
input_la_LDFLAGS = -module $(LTVSN)
+input_la_LIBADD = $(top_builddir)/src/libts.la
linear_h2200_la_SOURCES = linear-h2200.c
linear_h2200_la_LDFLAGS = -module $(LTVSN)
--
1.7.6.4

View File

@ -10,10 +10,11 @@ SECTION = "base"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
PR = "r18"
PR = "r19"
SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
file://fix_version.patch \
file://0001-Link-plugins-against-libts.patch \
file://ts.conf \
file://tslib.sh"