Update to libwacom-1.10

0001-Add-support-for-BUS_VIRTUAL.patch

@@ -1,4 +1,4 @@
-From c0eaf576f68b2a34136a7c1c3977ff8531d37504 Mon Sep 17 00:00:00 2001
+From d9cc859360c07ed3baa3810bbd4f2074755dba5b Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <[email protected]>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
 Subject: [PATCH 01/11] Add support for BUS_VIRTUAL
@@ -20,31 +20,32 @@ Signed-off-by: Dorian Stoll <[email protected]>
  5 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/data/test_data_files.py b/data/test_data_files.py
-index 5acdbac..cb5ca6d 100755
+index 1953ada..26d274f 100755
 --- a/data/test_data_files.py
 +++ b/data/test_data_files.py
-@@ -29,6 +29,6 @@ def test_device_match(tabletfile):
+@@ -34,7 +34,7 @@ def test_device_match(tabletfile):
              continue
 
          bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
 -        assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
 +        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
          assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
+
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index d57ef2d..17571b6 100644
+index a8987f7..3c7d0de 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -130,6 +130,8 @@ bus_from_str (const char *str)
+@@ -128,6 +128,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_BLUETOOTH;
- 	if (streq(str, "i2c"))
+ 	if (g_str_equal(str, "i2c"))
  		return WBUSTYPE_I2C;
-+	if (streq(str, "virt"))
++	if (g_str_equal(str, "virt"))
 +		return WBUSTYPE_VIRTUAL;
  	return WBUSTYPE_UNKNOWN;
  }
 
-@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus)
+@@ -146,6 +148,8 @@ bus_to_str (WacomBusType bus)
  		return "bluetooth";
  	case WBUSTYPE_I2C:
  		return "i2c";
@@ -54,10 +55,10 @@ index d57ef2d..17571b6 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 062b313..7b97bb1 100644
+index 935344c..88d0777 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_I2C;
  		retval = TRUE;
  		break;
@@ -68,7 +69,7 @@ index 062b313..7b97bb1 100644
  	}
 
  out:
-@@ -765,6 +769,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -797,6 +801,7 @@ static void print_match(int fd, const WacomMatch *match)
  		case WBUSTYPE_USB:		bus_name = "usb";	break;
  		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
  		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
@@ -89,10 +90,10 @@ index 1b9bc2c..24e99cd 100644
 
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 9e5b02f..3883341 100644
+index 2095089..da5fe07 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
-@@ -179,6 +179,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
+@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
  			break;
  		case WBUSTYPE_BLUETOOTH:
  		case WBUSTYPE_I2C:
@@ -101,5 +102,5 @@ index 9e5b02f..3883341 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.30.1
+2.31.1
 

0002-Add-support-for-Intel-Management-Engine-bus.patch

@@ -1,4 +1,4 @@
-From 02df4e0f272dff001ee280ab93e8e1c4600375ff Mon Sep 17 00:00:00 2001
+From 08eb08f64150fd93b178069d1109116cf90720de Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
 Subject: [PATCH 02/11] Add support for Intel Management Engine bus
@@ -15,31 +15,32 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
  5 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/data/test_data_files.py b/data/test_data_files.py
-index cb5ca6d..466b18a 100755
+index 26d274f..bc92658 100755
 --- a/data/test_data_files.py
 +++ b/data/test_data_files.py
-@@ -29,6 +29,6 @@ def test_device_match(tabletfile):
+@@ -34,7 +34,7 @@ def test_device_match(tabletfile):
              continue
 
          bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
 -        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
 +        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt', 'mei'], f'{tabletfile}: unknown bus type'
          assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
+
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 17571b6..4c6df4e 100644
+index 3c7d0de..28c0ac5 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -132,6 +132,8 @@ bus_from_str (const char *str)
+@@ -130,6 +130,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_I2C;
- 	if (streq(str, "virt"))
+ 	if (g_str_equal(str, "virt"))
  		return WBUSTYPE_VIRTUAL;
 +	if (strcmp (str, "mei") == 0)
 +		return WBUSTYPE_MEI;
  	return WBUSTYPE_UNKNOWN;
  }
 
-@@ -152,6 +154,8 @@ bus_to_str (WacomBusType bus)
+@@ -150,6 +152,8 @@ bus_to_str (WacomBusType bus)
  		return "i2c";
  	case WBUSTYPE_VIRTUAL:
  		return "virt";
@@ -49,10 +50,10 @@ index 17571b6..4c6df4e 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 7b97bb1..d84e8fa 100644
+index 88d0777..09e289f 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -151,6 +151,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_VIRTUAL;
  		retval = TRUE;
  		break;
@@ -63,7 +64,7 @@ index 7b97bb1..d84e8fa 100644
  	}
 
  out:
-@@ -770,6 +774,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -802,6 +806,7 @@ static void print_match(int fd, const WacomMatch *match)
  		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
  		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
  		case WBUSTYPE_VIRTUAL:		bus_name = "virt";	break;
@@ -84,10 +85,10 @@ index 24e99cd..0eee2fd 100644
 
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 3883341..352bc43 100644
+index da5fe07..6b45597 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
-@@ -180,6 +180,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
+@@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
  		case WBUSTYPE_BLUETOOTH:
  		case WBUSTYPE_I2C:
  		case WBUSTYPE_VIRTUAL:
@@ -96,5 +97,5 @@ index 3883341..352bc43 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.30.1
+2.31.1
 

0003-data-Add-Microsoft-Surface-pro-4.patch

@@ -1,4 +1,4 @@
-From 29c9b7283741e717b61f07bdf14b678c13a6768d Mon Sep 17 00:00:00 2001
+From dacd69611f2659f3471bec57b37c842547121b30 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
 Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

0004-data-Add-Microsoft-Surface-pro-5.patch

@@ -1,4 +1,4 @@
-From ccfc97812543a3db11a2c3dcd0ed25903730dfe3 Mon Sep 17 00:00:00 2001
+From f1cf0375b3e8c2e3e2ffa9c1ecff6266e0defa47 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
 Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

0005-data-Add-Microsoft-Surface-pro-6.patch

@@ -1,4 +1,4 @@
-From b378c3636c71c29470b8274de3e69f0fa3dbaa7e Mon Sep 17 00:00:00 2001
+From df44bc318ba3be62d71a02f7ae5f7945e1bc84d1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
 Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

0006-data-Add-Microsoft-Surface-pro-7.patch

@@ -1,4 +1,4 @@
-From 0b12a623e70d877fa6bf1df615d06229f7b2eb83 Mon Sep 17 00:00:00 2001
+From d7375f57f1ce83c43663d3dd3f9e8e7acd0642b4 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
 Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

0007-data-Add-Microsoft-Surface-Book.patch

@@ -1,4 +1,4 @@
-From da5c0255ab397bc5537861f9b48d3036f2fc8e98 Mon Sep 17 00:00:00 2001
+From 97a7c34729ac47a2589583356bce90db0f8dcdc0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 07/11] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

0008-data-Add-Microsoft-Surface-Book-2-13.5.patch

@@ -1,4 +1,4 @@
-From 3779329faa2e5e4d974ef2ad92dee3e0a8c90888 Mon Sep 17 00:00:00 2001
+From f2dc8dffdfc0d48fbdd5a12fe7faccf1ceebcdb8 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 08/11] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

0009-data-Add-Microsoft-Surface-Book-2-15.patch

@@ -1,4 +1,4 @@
-From 13e81b74340251dba524b6f414e3452e93458929 Mon Sep 17 00:00:00 2001
+From 677edc8b43d57546f756e94d81f789bfddeb8541 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 09/11] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

0010-data-Add-Microsoft-Surface-Book-3-13.5.patch

@@ -1,4 +1,4 @@
-From 84f8519285c39cf3b35175f94a38cd48b3a7d922 Mon Sep 17 00:00:00 2001
+From 5febbddb27f61c4b0bb2b2dc551c2dc6e3930c16 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
 Subject: [PATCH 10/11] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

0011-data-Add-Microsoft-Surface-Book-3-15.patch

@@ -1,4 +1,4 @@
-From d105e4c6fd7512eefa4c703224a24cea19e0f457 Mon Sep 17 00:00:00 2001
+From bccca7dd7b78c22c42234efcc74cd3d2acd4d3eb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
 Subject: [PATCH 11/11] data: Add Microsoft Surface Book 3 (15")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.30.1
+2.31.1
 

pkg/debian/debian/changelog

@@ -1,3 +1,9 @@
+libwacom-surface (1.10-1) unstable; urgency=medium
+
+  * Update to libwacom-1.10
+
+ -- Maximilian Luz <[email protected]>  Thu, 29 Apr 2021 01:57:43 +0100
+
 libwacom-surface (1.9-2) unstable; urgency=medium
 
   * Bump release to build for Fedora 34

pkg/debian/makedeb

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-pkgver="1.9"
+pkgver="1.10"
 source="https://github.com/linuxwacom/libwacom/releases/download/libwacom-$pkgver/libwacom-$pkgver.tar.bz2"
 
 basepath="$( cd "$(dirname "$0")" ; pwd -P )"

pkg/fedora/0001-meson.build-exclude-the-layouts-README.md-and-pycach.patch

@@ -0,0 +1,27 @@
+From 7d0cf8a5842e61ac099339aa6899a5e3a7d4cb13 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <[email protected]>
+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 <[email protected]>
+---
+ 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

pkg/fedora/libwacom-surface.spec

@@ -1,8 +1,8 @@
 %global debug_package %{nil}
 
 Name:           libwacom-surface
-Version:        1.9
-Release:        2%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
 Provides:       libwacom
@@ -12,6 +12,7 @@ License:        MIT
 URL:            https://github.com/linuxwacom/libwacom
 
 Source0:        https://github.com/linuxwacom/libwacom/releases/download/libwacom-%{version}/libwacom-%{version}.tar.bz2
+Patch01:        0001-meson.build-exclude-the-layouts-README.md-and-pycach.patch
 
 BuildRequires:  meson gcc
 BuildRequires:  glib2-devel libgudev1-devel
@@ -71,8 +72,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
@@ -93,8 +98,11 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %{_datadir}/libwacom/layouts/*.svg
 
 %changelog
-* Fri Mar 19 2021 Dorian Stoll <[email protected]> 1.9-2
-- Bump release to build for Fedora 34
+* Wed Apr 28 2021 Peter Hutterer <[email protected]> 1.10-1
+- libwacom 1.10
+
+* Thu Mar 25 2021 Peter Hutterer <[email protected]> 1.9-2
+- Add X1 Yoga6 data files (#1940872)
 
 * Wed Feb 24 2021 Peter Hutterer <[email protected]> 1.9-1
 - libwacom 1.9