From ea46112db71224a91e142ba0b5d4b30a0f892047 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 14 Jan 2021 08:10:34 +0000 Subject: [PATCH] import libwacom-1.6-2.el8 --- ...4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch | 45 ++++++++++++++++++ ...vo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch | 44 ++++++++++++++++++ ...4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch | 46 +++++++++++++++++++ ...SDv4-5202-Lenovo-YOGA-C640-13IML-322.patch | 45 ++++++++++++++++++ ...-X1-Yoga-3-Generation-ISDv4-5148-320.patch | 40 ++++++++++++++++ SPECS/libwacom.spec | 11 ++++- 6 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch create mode 100644 SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch create mode 100644 SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch create mode 100644 SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch create mode 100644 SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch diff --git a/SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch b/SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch new file mode 100644 index 0000000..482d707 --- /dev/null +++ b/SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch @@ -0,0 +1,45 @@ +From 4d812e1f7031a1021d09cbcf2e58d7456759c6a1 Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Sun, 22 Nov 2020 13:47:52 -0800 +Subject: [PATCH libwacom 1/5] data: Add ISDv4 51c7 (Lenovo IdeaPad FLEX-14API) + (#304) + +Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/109 +Signed-off-by: Jason Gerecke +(cherry picked from commit 1354d473e5dc7652ca2927f7b218f798c6301ad0) +--- + data/isdv4-51c7.tablet | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + create mode 100644 data/isdv4-51c7.tablet + +diff --git a/data/isdv4-51c7.tablet b/data/isdv4-51c7.tablet +new file mode 100644 +index 0000000..f8d887d +--- /dev/null ++++ b/data/isdv4-51c7.tablet +@@ -0,0 +1,22 @@ ++# Lenovo IdeaPad FLEX-14API ++# Sensor Type: AES ++# Features: Touch (Integrated), Tilt ++# HW Resolution: 30931 x 17399 (2540 x 2540 lpi) ++# ++# Autogenerated from sysinfo.MuVcg9kgJJ ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/109#issue-746220933 ++ ++[Device] ++Name=ISDv4 51C7 ++ModelName= ++DeviceMatch=i2c:056A:51C7 ++Class=ISDV4 ++Width=12 ++Height=7 ++IntegratedIn=Display;System ++Styli=@isdv4-aes; ++ ++[Features] ++Stylus=true ++Touch=true ++Buttons=0 +-- +2.29.2 + diff --git a/SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch b/SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch new file mode 100644 index 0000000..2fa9327 --- /dev/null +++ b/SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch @@ -0,0 +1,44 @@ +From 9c8b75f072369cfce39fcde6b758eba1b3948852 Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Mon, 30 Nov 2020 10:31:58 -0800 +Subject: [PATCH libwacom 2/5] data: Add enovo IdeaPad Flex 5 14ARE05 (ISDv4 + 5215) + +Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/112 +(cherry picked from commit c3c8b8357a3a63b5c45fd167c750a4fdef2d30cb) +--- + data/isdv4-5215.tablet | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + create mode 100644 data/isdv4-5215.tablet + +diff --git a/data/isdv4-5215.tablet b/data/isdv4-5215.tablet +new file mode 100644 +index 0000000..db23c9f +--- /dev/null ++++ b/data/isdv4-5215.tablet +@@ -0,0 +1,22 @@ ++# Lenovo IdeaPad Flex 5 14ARE05 ++# Sensor Type: AES ++# Features: Touch (Integrated), Tilt ++# HW Resolution: 30931 x 17399 (2540 x 2540 lpi) ++# ++# Autogenerated from sysinfo.fGWhYaLpPe ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/112#issue-751103246 ++ ++[Device] ++Name=ISDv4 5215 ++ModelName= ++DeviceMatch=i2c:056a:5215 ++Class=ISDV4 ++Width=12 ++Height=7 ++IntegratedIn=Display;System ++Styli=@isdv4-aes; ++ ++[Features] ++Stylus=true ++Touch=true ++Buttons=0 +-- +2.29.2 + diff --git a/SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch b/SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch new file mode 100644 index 0000000..978ca8d --- /dev/null +++ b/SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch @@ -0,0 +1,46 @@ +From cc965fbbf2659ea6a6c7b484d2e2ec910a314833 Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Wed, 6 Jan 2021 13:01:29 -0800 +Subject: [PATCH libwacom 3/5] data: Add ISDv4 51e9 (Lenovo ThinkPad P15 Gen 1) + (#325) + +Tablet definition was tested and verified to work by the bug reporter. + +Signed-off-by: Jason Gerecke +(cherry picked from commit ba02abf58f8d0405140e658d8238b69e89120576) +--- + data/isdv4-51e9.tablet | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + create mode 100644 data/isdv4-51e9.tablet + +diff --git a/data/isdv4-51e9.tablet b/data/isdv4-51e9.tablet +new file mode 100644 +index 0000000..8684b26 +--- /dev/null ++++ b/data/isdv4-51e9.tablet +@@ -0,0 +1,22 @@ ++# Lenovo ThinkPad P15 Gen 1 ++# Sensor Type: AES ++# Features: Touch (Integrated), Tilt ++# HW Resolution: 34422 x 19362 (2540 x 2540 lpi) ++# ++# Autogenerated from sysinfo.VSiBXWPx2J ++# From private bug report ++ ++[Device] ++Name=ISDv4 51e9 ++ModelName= ++DeviceMatch=usb:056a:51e9 ++Class=ISDV4 ++Width=14 ++Height=8 ++IntegratedIn=Display;System ++Styli=@isdv4-aes; ++ ++[Features] ++Stylus=true ++Touch=true ++Buttons=0 +-- +2.29.2 + diff --git a/SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch b/SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch new file mode 100644 index 0000000..17f1383 --- /dev/null +++ b/SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch @@ -0,0 +1,45 @@ +From eff4978104a3a2bd2838638df52cb2238c316b65 Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Wed, 6 Jan 2021 13:07:48 -0800 +Subject: [PATCH libwacom 4/5] data: Add ISDv4 5202 (Lenovo YOGA C640-13IML) + (#322) + +Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/118 +Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/121 +(cherry picked from commit 9b02a1fac5dc3df986151f82bf91daf387d34e75) +--- + data/isdv4-5202.tablet | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + create mode 100644 data/isdv4-5202.tablet + +diff --git a/data/isdv4-5202.tablet b/data/isdv4-5202.tablet +new file mode 100644 +index 0000000..8014b5d +--- /dev/null ++++ b/data/isdv4-5202.tablet +@@ -0,0 +1,22 @@ ++# Lenovo YOGA C640-13IML ++# Sensor Type: AES ++# Features: Touch (Integrated), Tilt ++# HW Resolution: 29376 x 16524 (2540 x 2540 lpi) ++# ++# Autogenerated from sysinfo.M5WQPQfqXg ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/118#issue-772431716 ++ ++[Device] ++Name=ISDv4 5202 ++ModelName= ++DeviceMatch=i2c:056a:5202 ++Class=ISDV4 ++Width=12 ++Height=7 ++IntegratedIn=Display;System ++Styli=@isdv4-aes; ++ ++[Features] ++Stylus=true ++Touch=true ++Buttons=0 +-- +2.29.2 + diff --git a/SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch b/SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch new file mode 100644 index 0000000..440df4d --- /dev/null +++ b/SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch @@ -0,0 +1,40 @@ +From 1fa7c62f266e1c7ff15470422561490169987493 Mon Sep 17 00:00:00 2001 +From: Leon Fattakhov +Date: Wed, 6 Jan 2021 21:53:59 -0500 +Subject: [PATCH libwacom 5/5] data: Add Lenovo X1 Yoga 3 Generation (ISDv4 + 5148) (#320) + +(cherry picked from commit 0234d3793264f551b52ae636be5b599fcfca3309) +--- + data/isdv4-5148.tablet | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + create mode 100644 data/isdv4-5148.tablet + +diff --git a/data/isdv4-5148.tablet b/data/isdv4-5148.tablet +new file mode 100644 +index 0000000..8639a30 +--- /dev/null ++++ b/data/isdv4-5148.tablet +@@ -0,0 +1,19 @@ ++# this is for the Wacom pen + touchscreen as found in the Lenovo ThinkPad X1 Yoga (3rd-gen) ++# ++# sysinfo.4xQ82uOLCD ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/117 ++ ++[Device] ++Name=Wacom ISDv4 5148 ++ModelName= ++DeviceMatch=usb:056a:5148 ++Class=ISDV4 ++Width=12 ++Height=7 ++IntegratedIn=Display;System ++Styli=@isdv4-aes; ++ ++[Features] ++Stylus=true ++Touch=true ++Buttons=0 +-- +2.29.2 + diff --git a/SPECS/libwacom.spec b/SPECS/libwacom.spec index fc501be..7e6150e 100644 --- a/SPECS/libwacom.spec +++ b/SPECS/libwacom.spec @@ -1,6 +1,6 @@ Name: libwacom Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tablet Information Client Library Requires: %{name}-data @@ -10,6 +10,12 @@ URL: https://github.com/linuxwacom/libwacom Source0: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +Patch001: 0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch +Patch002: 0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch +Patch003: 0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch +Patch004: 0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch +Patch005: 0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch + BuildRequires: meson gcc BuildRequires: glib2-devel libgudev1-devel BuildRequires: systemd systemd-devel @@ -86,6 +92,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir} %{_datadir}/libwacom/layouts/*.svg %changelog +* Wed Jan 13 2021 Peter Hutterer 1.6-2 +- Add Lenovo tablet files from upstream (#1914411) + * Tue Nov 03 2020 Peter Hutterer 1.6-1 - libwacom 1.6 (#1878160)