libwacom 1.10

This commit is contained in:
Peter Hutterer 2021-04-28 15:57:09 +10:00
parent 16f017c5e3
commit ba7723e771
4 changed files with 38 additions and 236 deletions

View File

@ -1,232 +0,0 @@
From 6ec085291021fe9126ffec507e87c8d6673b9035 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <killertofu@gmail.com>
Date: Tue, 16 Mar 2021 15:26:54 -0700
Subject: [PATCH libwacom] data: Add multiple Lenovo ThinkPad X1 Yoga Gen 6
PIDs
Adds the following devices:
* ISDv4 5276
* ISDv4 5277
* ISDv4 5278
* ISDv4 5279
* ISDv4 527a
* ISDv4 527e
* ISDv4 527f
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
---
data/isdv4-5276.tablet | 22 ++++++++++++++++++++++
data/isdv4-5277.tablet | 22 ++++++++++++++++++++++
data/isdv4-5278.tablet | 22 ++++++++++++++++++++++
data/isdv4-5279.tablet | 22 ++++++++++++++++++++++
data/isdv4-527a.tablet | 22 ++++++++++++++++++++++
data/isdv4-527e.tablet | 22 ++++++++++++++++++++++
data/isdv4-527f.tablet | 22 ++++++++++++++++++++++
7 files changed, 154 insertions(+)
create mode 100644 data/isdv4-5276.tablet
create mode 100644 data/isdv4-5277.tablet
create mode 100644 data/isdv4-5278.tablet
create mode 100644 data/isdv4-5279.tablet
create mode 100644 data/isdv4-527a.tablet
create mode 100644 data/isdv4-527e.tablet
create mode 100644 data/isdv4-527f.tablet
diff --git a/data/isdv4-5276.tablet b/data/isdv4-5276.tablet
new file mode 100644
index 0000000..52549db
--- /dev/null
+++ b/data/isdv4-5276.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.gO13VjL2Ut
+# From private bug report
+
+[Device]
+Name=ISDv4 5276
+ModelName=
+DeviceMatch=i2c:056a:5276
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-5277.tablet b/data/isdv4-5277.tablet
new file mode 100644
index 0000000..453e376
--- /dev/null
+++ b/data/isdv4-5277.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30165 x 18853 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.rhiB11PAfy
+# From private bug report
+
+[Device]
+Name=ISDv4 5277
+ModelName=
+DeviceMatch=i2c:056a:5277
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-5278.tablet b/data/isdv4-5278.tablet
new file mode 100644
index 0000000..dd86c26
--- /dev/null
+++ b/data/isdv4-5278.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.jlmKxHDD9N
+# From private bug report
+
+[Device]
+Name=ISDv4 5278
+ModelName=
+DeviceMatch=i2c:056a:5278
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-5279.tablet b/data/isdv4-5279.tablet
new file mode 100644
index 0000000..12a1d6c
--- /dev/null
+++ b/data/isdv4-5279.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.8euIJDBa1t
+# From private bug report
+
+[Device]
+Name=ISDv4 5279
+ModelName=
+DeviceMatch=i2c:056a:5279
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-527a.tablet b/data/isdv4-527a.tablet
new file mode 100644
index 0000000..f46da56
--- /dev/null
+++ b/data/isdv4-527a.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30160 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.lhwHw4oxV0
+# From private bug report
+
+[Device]
+Name=ISDv4 527a
+ModelName=
+DeviceMatch=i2c:056a:527a
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-527e.tablet b/data/isdv4-527e.tablet
new file mode 100644
index 0000000..2466b9b
--- /dev/null
+++ b/data/isdv4-527e.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.azexD4AUXu
+# From private bug report
+
+[Device]
+Name=ISDv4 527e
+ModelName=
+DeviceMatch=i2c:056a:527e
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-527f.tablet b/data/isdv4-527f.tablet
new file mode 100644
index 0000000..25335be
--- /dev/null
+++ b/data/isdv4-527f.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.KNSxghuR5y
+# From private bug report
+
+[Device]
+Name=ISDv4 527f
+ModelName=
+DeviceMatch=i2c:056a:527f
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.30.2

View File

@ -0,0 +1,28 @@
From 7d0cf8a5842e61ac099339aa6899a5e3a7d4cb13 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 28 Apr 2021 15:31:22 +1000
Subject: [PATCH libwacom] meson.build: exclude the layouts/README.md and
pycache files from install
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 38fc89f..c44043e 100644
--- a/meson.build
+++ b/meson.build
@@ -124,7 +124,8 @@ install_subdir('data',
'Makefile.in',
'layouts/Makefile.am',
'layouts/Makefile.in',
- 'layouts/README'])
+ 'layouts/README.md'],
+ exclude_directories: ['__pycache__'])
test('files-in-git',
find_program('data/check-files-in-git.sh'),
--
2.31.1

View File

@ -1,6 +1,6 @@
Name: libwacom
Version: 1.9
Release: 2%{?dist}
Version: 1.10
Release: 1%{?dist}
Summary: Tablet Information Client Library
Requires: %{name}-data
@ -8,7 +8,7 @@ License: MIT
URL: https://github.com/linuxwacom/libwacom
Source0: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
Patch01: 0001-data-Add-multiple-Lenovo-ThinkPad-X1-Yoga-Gen-6-PIDs.patch
Patch01: 0001-meson.build-exclude-the-layouts-README.md-and-pycach.patch
BuildRequires: meson gcc
BuildRequires: glib2-devel libgudev1-devel
@ -58,9 +58,12 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
%license COPYING
%doc README.md
%{_libdir}/libwacom.so.*
%{_bindir}/libwacom-list-devices
%{_bindir}/libwacom-list-local-devices
%{_bindir}/libwacom-show-stylus
%{_bindir}/libwacom-update-db
%{_mandir}/man1/libwacom-list-devices.1*
%{_mandir}/man1/libwacom-list-local-devices.1*
%files devel
@ -81,6 +84,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
%{_datadir}/libwacom/layouts/*.svg
%changelog
* Wed Apr 28 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.10-1
- libwacom 1.10
* Thu Mar 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.9-2
- Add X1 Yoga6 data files (#1940872)

View File

@ -1 +1 @@
SHA512 (libwacom-1.9.tar.bz2) = d62da97038caeaf727800a680a4ef2ef49a56e632844b9a0d6c0eed9c808e033bc1d969aa1c523b4a1724dfb9b8b3665290ecb90fcdcfbf5f50cae2d06c0bffa
SHA512 (libwacom-1.10.tar.bz2) = 8c3e795a180503fb6ad3d5f514f24aa3ba202f63a89fd637ed4e50d494a29d86ad62f529180d0c384d387af7456c77904dfcd361a70807feeaf0e7a88dac2bfe