Revert to libwacom-1.12.1

qzed · qzed · commit 3e4dfa166626 · 2022-01-18T13:28:26.000+01:00
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From 5b2d219b4ef206e6501ae5b2fbd1e90e37986ecf Mon Sep 17 00:00:00 2001
+From 3f437a3a53b2159bb385335be0598f8859ff385f Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
 Subject: [PATCH 01/11] Add support for BUS_VIRTUAL
@@ -42,7 +42,7 @@ index a8987f7..3c7d0de 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index ccfe43a..d9b8a22 100644
+index 935344c..88d0777 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -56,7 +56,7 @@ index ccfe43a..d9b8a22 100644
  	}
  
  out:
-@@ -817,6 +821,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;
@@ -65,7 +65,7 @@ index ccfe43a..d9b8a22 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index cafed64..b184ed7 100644
+index d611c9d..a4cbb23 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -149,6 +149,7 @@ typedef enum {
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,4 +1,4 @@
-From a5d0ce373887e3c8af7061e02b097fa9e7a95e07 Mon Sep 17 00:00:00 2001
+From 52157eec5eb3c6f172531f741d2897b0401ac6c2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
 Subject: [PATCH 02/11] Add support for Intel Management Engine bus
@@ -37,7 +37,7 @@ index 3c7d0de..28c0ac5 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index d9b8a22..e3364f4 100644
+index 88d0777..09e289f 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -51,7 +51,7 @@ index d9b8a22..e3364f4 100644
  	}
  
  out:
-@@ -822,6 +826,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;
@@ -60,7 +60,7 @@ index d9b8a22..e3364f4 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index b184ed7..5cd6736 100644
+index a4cbb23..034a894 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -150,6 +150,7 @@ typedef enum {
diff --git a/0003-data-Add-Microsoft-Surface-pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch
@@ -1,4 +1,4 @@
-From d6cd3074ebf929bf6bcdf3f645c279afb18e7b9d Mon Sep 17 00:00:00 2001
+From 3abcd457cb0b6a2d3fe3275ac8590b2a8cc138fd Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
 Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4
diff --git a/0004-data-Add-Microsoft-Surface-pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch
@@ -1,4 +1,4 @@
-From 4cfead3582c875b09f2af992a2a74dce51768c2d Mon Sep 17 00:00:00 2001
+From e094d589a92163e3490d35cda608d16283e2131b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
 Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5
diff --git a/0005-data-Add-Microsoft-Surface-pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch
@@ -1,4 +1,4 @@
-From 01da7c902d6902285a0d48bf889dc73ec33ee44b Mon Sep 17 00:00:00 2001
+From 400291cf0e63eada2c26d59b23a9b24dd8f6f44a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
 Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6
diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch
@@ -1,4 +1,4 @@
-From 6369471bb5ca5c3668c05fbdec7dab4cddfd9f3e Mon Sep 17 00:00:00 2001
+From fb66daa6e63cf88a98012ab751f71610b0fff854 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
 Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 77513a1331e9a38cd2e80533d1f6688fe9e4a930 Mon Sep 17 00:00:00 2001
+From 5ee91e95219c5ffb9bf27f22495eae4f85072baa Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 07/11] data: Add Microsoft Surface Book
diff --git a/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From 2a724bfff96cc05394593b8a3ca8a0dab4b2c19b Mon Sep 17 00:00:00 2001
+From 1201f3dff4e62accc517d427bd4f1c89890d799c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 08/11] data: Add Microsoft Surface Book 2 (13.5")
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From 6317007aec054989b8a992fa7481d00d4ef89c38 Mon Sep 17 00:00:00 2001
+From 6a802f267c31855decdca31e6f49b51f02d04c38 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 09/11] data: Add Microsoft Surface Book 2 (15")
diff --git a/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,4 +1,4 @@
-From 9c5c879ebd7f2f692cdd33d2643300d66b12ec06 Mon Sep 17 00:00:00 2001
+From 0db3bbd8c8dc1aebafcfff1b6a94063ffd93b584 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
 Subject: [PATCH 10/11] data: Add Microsoft Surface Book 3 (13.5")
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,4 +1,4 @@
-From aeb6452b61ae8b88dff810e9ae11c2923d967a9d Mon Sep 17 00:00:00 2001
+From 9eedc8963136a06557f2e63d4ea69b0108b1c0b6 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
 Subject: [PATCH 11/11] data: Add Microsoft Surface Book 3 (15")
diff --git a/pkg/debian/makedeb b/pkg/debian/makedeb
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-pkgver="2.0.0"
-source="https://github.com/linuxwacom/libwacom/releases/download/libwacom-$pkgver/libwacom-$pkgver.tar.xz"
+pkgver="1.12.1"
+source="https://github.com/linuxwacom/libwacom/releases/download/libwacom-$pkgver/libwacom-$pkgver.tar.bz2"
 
 basepath="$( cd "$(dirname "$0")" ; pwd -P )"
 
@@ -11,7 +11,7 @@ rm -rf "source"
 
 cd "${basepath}"
 wget "$source"
-tar -xf "libwacom-$pkgver.tar.xz"
+tar -xf "libwacom-$pkgver.tar.bz2"
 mv "libwacom-$pkgver" "source"
 
 cd "${basepath}"
diff --git a/pkg/fedora/libwacom-surface.spec b/pkg/fedora/libwacom-surface.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:           libwacom-surface
-Version:        2.0.0
+Version:        1.12.1
 Release:        1%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
@@ -11,7 +11,7 @@ Conflicts:      libwacom
 License:        MIT
 URL:            https://github.com/linuxwacom/libwacom
 
-Source0:        https://github.com/linuxwacom/libwacom/releases/download/libwacom-%{version}/libwacom-%{version}.tar.xz
+Source0:        https://github.com/linuxwacom/libwacom/releases/download/libwacom-%{version}/libwacom-%{version}.tar.bz2
 
 BuildRequires:  meson gcc
 BuildRequires:  glib2-devel libgudev1-devel
@@ -97,11 +97,8 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %{_datadir}/libwacom/layouts/*.svg
 
 %changelog
-* Mon Jan 17 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.0.0-1
-- libwacom 2.0.0
-
-* Mon Dec 13 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.99.1-1
-- libwacom 1.99.1
+* Mon Jan 17 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.12.1-1
+- libwacom 1.12.1
 
 * Wed Sep 01 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.12-1
 - libwacom 1.12

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From d6cd3074ebf929bf6bcdf3f645c279afb18e7b9d Mon Sep 17 00:00:00 2001`
	`1`	`+From 3abcd457cb0b6a2d3fe3275ac8590b2a8cc138fd Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Maximilian Luz <[email protected]>`
`3`	`3`	`Date: Tue, 18 Aug 2020 20:18:55 +0200`
`4`	`4`	`Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 4cfead3582c875b09f2af992a2a74dce51768c2d Mon Sep 17 00:00:00 2001`
	`1`	`+From e094d589a92163e3490d35cda608d16283e2131b Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Maximilian Luz <[email protected]>`
`3`	`3`	`Date: Tue, 18 Aug 2020 20:19:02 +0200`
`4`	`4`	`Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 01da7c902d6902285a0d48bf889dc73ec33ee44b Mon Sep 17 00:00:00 2001`
	`1`	`+From 400291cf0e63eada2c26d59b23a9b24dd8f6f44a Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Maximilian Luz <[email protected]>`
`3`	`3`	`Date: Tue, 18 Aug 2020 20:19:07 +0200`
`4`	`4`	`Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 6369471bb5ca5c3668c05fbdec7dab4cddfd9f3e Mon Sep 17 00:00:00 2001`
	`1`	`+From fb66daa6e63cf88a98012ab751f71610b0fff854 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Maximilian Luz <[email protected]>`
`3`	`3`	`Date: Tue, 18 Aug 2020 20:19:13 +0200`
`4`	`4`	`Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 77513a1331e9a38cd2e80533d1f6688fe9e4a930 Mon Sep 17 00:00:00 2001`
	`1`	`+From 5ee91e95219c5ffb9bf27f22495eae4f85072baa Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Maximilian Luz <[email protected]>`
`3`	`3`	`Date: Tue, 18 Aug 2020 20:19:38 +0200`
`4`	`4`	`Subject: [PATCH 07/11] data: Add Microsoft Surface Book`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 2a724bfff96cc05394593b8a3ca8a0dab4b2c19b Mon Sep 17 00:00:00 2001`
	`1`	`+From 1201f3dff4e62accc517d427bd4f1c89890d799c Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Maximilian Luz <[email protected]>`
`3`	`3`	`Date: Tue, 18 Aug 2020 20:20:04 +0200`
`4`	`4`	`Subject: [PATCH 08/11] data: Add Microsoft Surface Book 2 (13.5")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 6317007aec054989b8a992fa7481d00d4ef89c38 Mon Sep 17 00:00:00 2001`
	`1`	`+From 6a802f267c31855decdca31e6f49b51f02d04c38 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Maximilian Luz <[email protected]>`
`3`	`3`	`Date: Tue, 18 Aug 2020 20:20:13 +0200`
`4`	`4`	`Subject: [PATCH 09/11] data: Add Microsoft Surface Book 2 (15")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 9c5c879ebd7f2f692cdd33d2643300d66b12ec06 Mon Sep 17 00:00:00 2001`
	`1`	`+From 0db3bbd8c8dc1aebafcfff1b6a94063ffd93b584 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Maximilian Luz <[email protected]>`
`3`	`3`	`Date: Tue, 18 Aug 2020 20:20:29 +0200`
`4`	`4`	`Subject: [PATCH 10/11] data: Add Microsoft Surface Book 3 (13.5")`