libwacom 0.6
This commit is contained in:
Peter Hutterer
parent
d8b5169eac
commit
3d8e2aa630
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/libwacom-0.3.tar.bz2
|
||||
/libwacom-0.4.tar.xz
|
||||
/libwacom-0.5.tar.bz2
|
||||
/libwacom-0.6.tar.bz2
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From 8e254c4c92c3d09dcfef1ba98b7023bea246adeb Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Thu, 3 May 2012 09:24:32 +1000
|
||||
Subject: [PATCH] data: add generic eraser to Bamboo Pen & Touch
|
||||
|
||||
Crashes gnome-control-center without it.
|
||||
|
||||
(gnome-control-center:18115): wacom-cc-panel-WARNING **: Could not set the
|
||||
current stylus ID 0x0 for tablet 'Wacom Bamboo Pen & Touch', no general pen
|
||||
found
|
||||
wacom-cc-panel:ERROR:gsd-wacom-device.c:1491:gsd_wacom_device_set_current_stylus:
|
||||
assertion failed: (device->priv->styli)
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
data/bamboo-pen-and-touch.tablet | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/bamboo-pen-and-touch.tablet b/data/bamboo-pen-and-touch.tablet
|
||||
index 125db37..3fff338 100644
|
||||
--- a/data/bamboo-pen-and-touch.tablet
|
||||
+++ b/data/bamboo-pen-and-touch.tablet
|
||||
@@ -13,7 +13,7 @@ Width=6
|
||||
Height=4
|
||||
|
||||
# The other stylusses don't match it, it has two buttons and an eraser.
|
||||
-Styli=0xfffff
|
||||
+Styli=0xfffff;0xffffe;
|
||||
|
||||
[Features]
|
||||
Stylus=true
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From 17eb272e0cc6dd8404d210770ab9c2c0c9624a09 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 2 May 2012 16:57:04 +0100
|
||||
Subject: [PATCH] lib: Fix generic stylus missing an eraser
|
||||
|
||||
HasEraser=yes, but we didn't add an eraser for the stylus,
|
||||
leading to bugs in the display UI for consumer products.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=675299
|
||||
---
|
||||
libwacom/libwacom-database.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
|
||||
index 0c60d6d..9fc9e35 100644
|
||||
--- a/libwacom/libwacom-database.c
|
||||
+++ b/libwacom/libwacom-database.c
|
||||
@@ -369,9 +369,10 @@ libwacom_parse_tablet_keyfile(const char *path)
|
||||
g_strfreev (styli_list);
|
||||
device->supported_styli = (int *) g_array_free (array, FALSE);
|
||||
} else {
|
||||
- device->supported_styli = g_new (int, 1);
|
||||
- *device->supported_styli = 0xfffff;
|
||||
- device->num_styli = 1;
|
||||
+ device->supported_styli = g_new (int, 2);
|
||||
+ device->supported_styli[0] = WACOM_STYLUS_FALLBACK_ID;
|
||||
+ device->supported_styli[1] = WACOM_ERASER_FALLBACK_ID;
|
||||
+ device->num_styli = 2;
|
||||
}
|
||||
|
||||
/* Features */
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From ee783c532efef4300360d0d84936650ab0091ef2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Tue, 8 May 2012 13:55:17 +1000
|
||||
Subject: [PATCH] lib: fix an error message
|
||||
|
||||
Leftover error message from when this was serial-only code.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
libwacom/libwacom.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
|
||||
index 821e3ee..359e945 100644
|
||||
--- a/libwacom/libwacom.c
|
||||
+++ b/libwacom/libwacom.c
|
||||
@@ -229,7 +229,7 @@ get_device_info (const char *path,
|
||||
|
||||
g_assert (product_str);
|
||||
if (sscanf(product_str, "%d/%x/%x/%d", &garbage, vendor_id, product_id, &garbage) != 4) {
|
||||
- libwacom_error_set(error, WERROR_UNKNOWN_MODEL, "Unimplemented serial bus");
|
||||
+ libwacom_error_set(error, WERROR_UNKNOWN_MODEL, "Unable to parse model identification");
|
||||
g_object_unref(parent);
|
||||
goto bail;
|
||||
}
|
||||
--
|
||||
1.7.10.1
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From bbaec8323f2a6930c851d7ffe8461ce6a5280f4f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Tue, 8 May 2012 13:57:00 +1000
|
||||
Subject: [PATCH] lib: serial devices may end up with a NULL product_str
|
||||
|
||||
If not inputattached, the product_str is NULL and udev doesn't provide a way
|
||||
to query it. Assume it as 0 instead of crashing.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=819191
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
libwacom/libwacom.c | 16 +++++++++++-----
|
||||
1 file changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
|
||||
index 359e945..482baa5 100644
|
||||
--- a/libwacom/libwacom.c
|
||||
+++ b/libwacom/libwacom.c
|
||||
@@ -227,11 +227,17 @@ get_device_info (const char *path,
|
||||
g_object_unref (old_parent);
|
||||
}
|
||||
|
||||
- g_assert (product_str);
|
||||
- if (sscanf(product_str, "%d/%x/%x/%d", &garbage, vendor_id, product_id, &garbage) != 4) {
|
||||
- libwacom_error_set(error, WERROR_UNKNOWN_MODEL, "Unable to parse model identification");
|
||||
- g_object_unref(parent);
|
||||
- goto bail;
|
||||
+ if (product_str) {
|
||||
+ if (sscanf(product_str, "%d/%x/%x/%d", &garbage, vendor_id, product_id, &garbage) != 4) {
|
||||
+ libwacom_error_set(error, WERROR_UNKNOWN_MODEL, "Unable to parse model identification");
|
||||
+ g_object_unref(parent);
|
||||
+ goto bail;
|
||||
+ }
|
||||
+ } else {
|
||||
+ g_assert(*bus == WBUSTYPE_SERIAL);
|
||||
+
|
||||
+ *vendor_id = 0;
|
||||
+ *product_id = 0;
|
||||
}
|
||||
if (parent)
|
||||
g_object_unref (parent);
|
||||
--
|
||||
1.7.10.1
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From f647284b4c544697e90e35fa6297645087acfdf3 Mon Sep 17 00:00:00 2001
|
||||
From: Cosimo Cecchi <cosimoc@gnome.org>
|
||||
Date: Wed, 2 May 2012 12:26:05 -0400
|
||||
Subject: [PATCH] tools: add missing linker flags for list-local-devices bin
|
||||
|
||||
---
|
||||
tools/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index fcc2069..a6fa8b4 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -9,6 +9,6 @@ list_devices_LDADD=$(top_builddir)/libwacom/libwacom.la
|
||||
|
||||
bin_PROGRAMS = libwacom-list-local-devices
|
||||
libwacom_list_local_devices_SOURCES = list-local-devices.c
|
||||
-libwacom_list_local_devices_LDADD=$(top_builddir)/libwacom/libwacom.la
|
||||
+libwacom_list_local_devices_LDADD=$(top_builddir)/libwacom/libwacom.la $(GLIB_LIBS)
|
||||
libwacom_list_local_devices_CFLAGS=$(GLIB_CFLAGS)
|
||||
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: libwacom
|
||||
Version: 0.5
|
||||
Release: 3%{?dist}
|
||||
Version: 0.6
|
||||
Release: 1%{?dist}
|
||||
Summary: Tablet Information Client Library
|
||||
Requires: %{name}-data
|
||||
|
||||
@ -11,12 +11,6 @@ URL: http://linuxwacom.sourceforge.net
|
||||
Source0: http://prdownloads.sourceforge.net/linuxwacom/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source1: libwacom.rules
|
||||
|
||||
Patch01: 0001-data-add-generic-eraser-to-Bamboo-Pen-Touch.patch
|
||||
Patch02: 0001-lib-Fix-generic-stylus-missing-an-eraser.patch
|
||||
Patch03: 0001-tools-add-missing-linker-flags-for-list-local-device.patch
|
||||
Patch04: 0001-lib-fix-an-error-message.patch
|
||||
Patch05: 0001-lib-serial-devices-may-end-up-with-a-NULL-product_st.patch
|
||||
|
||||
BuildRequires: autoconf automake libtool doxygen
|
||||
BuildRequires: glib2-devel libgudev1-devel
|
||||
|
||||
@ -42,11 +36,6 @@ Tablet information client library library data files.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch01 -p1
|
||||
%patch02 -p1
|
||||
%patch03 -p1
|
||||
%patch04 -p1
|
||||
%patch05 -p1
|
||||
|
||||
%build
|
||||
autoreconf --force -v --install || exit 1
|
||||
@ -88,6 +77,9 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
%{_datadir}/libwacom/*.stylus
|
||||
|
||||
%changelog
|
||||
* Tue Jul 03 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.6-1
|
||||
- libwacom 0.6
|
||||
|
||||
* Tue May 08 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.5-3
|
||||
- Fix crash with WACf* serial devices (if not inputattach'd) (#819191)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user