kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update graphics/tslib to latest upstream release

Browse source 
This release is listed on GitHub, not on the tslib site yet. Just
two named changes: 32-bit build fixes, and FreeBSD build fixes
which mean the previously-submitted patch can be dropped.

Reported by:	portscout
This commit is contained in:
Adriaan de Groot 2020-07-05 22:09:46 +00:00
parent ae3abb96e5
commit 34ca1c297e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=541307
4 changed files with 5 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/tslib/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tslib
DISTVERSION= 1.21
DISTVERSION= 1.22
CATEGORIES= graphics
MAINTAINER= adridg@FreeBSD.org

6
graphics/tslib/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1586901679
SHA256 (libts-tslib-1.21_GH0.tar.gz) = 8b3df2af000aff5c1efcab40ba96d3a61859062e6630f6090b6994e6272e0d30
SIZE (libts-tslib-1.21_GH0.tar.gz) = 228626
TIMESTAMP = 1593986111
SHA256 (libts-tslib-1.22_GH0.tar.gz) = 0a6fbc9d245de1e556652c93abb7dda4eee8ad0fa9bfba6f22e1f4f028733c34
SIZE (libts-tslib-1.22_GH0.tar.gz) = 228920

45
graphics/tslib/files/patch-git-b80ebf565ed56be2a59b036c3b3ec5a2afd25dc8
View file

@ -1,45 +0,0 @@
diff --git tools/ts_uinput.c tools/ts_uinput.c
index 9c40bb3..912ff72 100644
--- tools/ts_uinput.c
+++ tools/ts_uinput.c
@@ -1,6 +1,7 @@
/*
* (C) 2017 Ginzinger electronic systems GmbH, A-4952 Weng im Innkreis
*
+ * Adriaan de Groot <adridg@FreeBSD.org> 2020-04-15
* Martin Kepplinger <martin.kepplinger@ginzinger.com> 2016-09-14
* Melchior FRANZ <melchior.franz@ginzinger.com> 2015-09-30
*
@@ -361,6 +362,23 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
static int get_abs_max_fb(struct data_t *data, int *max_x, int *max_y)
{
+#ifdef __FreeBSD__
+ struct fbtype fbinfo;
+
+ if (ioctl(data->fd_fb, FBIOGTYPE, &fbinfo) < 0) {
+ perror("ioctl FBIOGTYPE");
+ return errno;
+ }
+
+ if ((fbinfo.fb_width == 0) || (fbinfo.fb_height == 0)) {
+ /* Bogus w/h, guess something */
+ *max_x = 320 - 1;
+ *max_y = 240 - 1;
+ } else {
+ *max_x = fbinfo.fb_width - 1;
+ *max_y = fbinfo.fb_height - 1;
+ }
+#else
struct fb_var_screeninfo fbinfo;
if (ioctl(data->fd_fb, FBIOGET_VSCREENINFO, &fbinfo) < 0) {
@@ -370,7 +388,7 @@ static int get_abs_max_fb(struct data_t *data, int *max_x, int *max_y)
*max_x = fbinfo.xres - 1;
*max_y = fbinfo.yres - 1;
-
+#endif
return 0;
}

2
graphics/tslib/pkg-plist
View file

@ -16,7 +16,7 @@ lib/cmake/tslib/tslibTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/tslib/tslibTargets.cmake
lib/libts.so
lib/libts.so.0
lib/libts.so.0.10.3
lib/libts.so.0.10.4
lib/ts/debounce.so
lib/ts/dejitter.so
lib/ts/evthres.so