Update device IDs

5 files changed, 42 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d9b0f4fade1..ec19d82bce1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
 	pkgver = 0.32
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/geoffholden/libwacom
 	arch = x86_64
 	license = MIT
@@ -12,13 +12,13 @@ pkgbase = libwacom-surface
 	depends = libgudev
 	provides = libwacom=0.32
 	conflicts = libwacom
-	source = mei-bus.patch
-	source = surface-tablet-data.patch
+	source = 00_mei-bus.patch
+	source = 01_surface-tablet-data.patch
 	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-0.32/libwacom-0.32.tar.bz2
 	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-0.32/libwacom-0.32.tar.bz2.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	sha256sums = 1e5301bf93bf75352e559b89fbb84aca2d3edb5ec2951dd848546404f9d8fb7f
-	sha256sums = 32f7a27225af200430c2f3d5e497f9ee51bda5a4921647472879d62e890551ad
+	sha256sums = faf69fa3795a5147665b285f28d82c0977a3870522c98ffccaf819730089599e
+	sha256sums = 9b7f8d681bf12e81e21cde33b7d77b10b4f2a78f3d0c46c5efe147c278c24bf9
 	sha256sums = 6b9dab8bce0471b839c89d34a1b30839de2c24db03796fa8d572817830f85380
 	sha256sums = SKIP
 
diff --git a/mei-bus.patch b/00_mei-bus.patch
index 1dc84e820d9a..ecb5ab6fd8e5 100644
--- a/mei-bus.patch
+++ b/00_mei-bus.patch
@@ -1,7 +1,7 @@
-diff --git libwacom/libwacom-database.c libwacom/libwacom-database.c
+diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
 index 1da9adf..e121c88 100644
---- libwacom/libwacom-database.c
-+++ libwacom/libwacom-database.c
+--- a/libwacom/libwacom-database.c
++++ b/libwacom/libwacom-database.c
 @@ -112,6 +112,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_BLUETOOTH;
  	if (strcmp (str, "i2c") == 0)
@@ -20,10 +20,10 @@ index 1da9adf..e121c88 100644
  	}
  	g_assert_not_reached ();
  }
-diff --git libwacom/libwacom.c libwacom/libwacom.c
-index b813d5e..884a37b 100644
---- libwacom/libwacom.c
-+++ libwacom/libwacom.c
+diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
+index 8979a53..c09e07d 100644
+--- a/libwacom/libwacom.c
++++ b/libwacom/libwacom.c
 @@ -144,6 +144,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_I2C;
  		retval = TRUE;
@@ -43,10 +43,10 @@ index b813d5e..884a37b 100644
  		case WBUSTYPE_UNKNOWN:		bus_name = "unknown";	break;
  		default:			g_assert_not_reached(); break;
  	}
-diff --git libwacom/libwacom.h libwacom/libwacom.h
+diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
 index bb968e7..24ab9f3 100644
---- libwacom/libwacom.h
-+++ libwacom/libwacom.h
+--- a/libwacom/libwacom.h
++++ b/libwacom/libwacom.h
 @@ -116,6 +116,7 @@ typedef enum {
  	WBUSTYPE_SERIAL,	/**< Serial tablet */
  	WBUSTYPE_BLUETOOTH,	/**< Bluetooth tablet */
diff --git a/01_surface-tablet-data.patch b/01_surface-tablet-data.patch
new file mode 100644
index 000000000000..8ee7336e1255
--- /dev/null
+++ b/01_surface-tablet-data.patch
@@ -0,0 +1,20 @@
+diff --git a/data/surface.tablet b/data/surface.tablet
+new file mode 100644
+index 0000000..56859e0
+--- /dev/null
++++ b/data/surface.tablet
+@@ -0,0 +1,14 @@
++# IPTS Based Microsoft Surface Series Devices
++
++[Device]
++Name=Microsoft Surface Device
++DeviceMatch=mei:1b96:0020;mei:1b96:005e;mei:1b96:006a;mei:1b96:001F;mei:1b96:1b05;mei:1b96:001F;mei:045e:0020;mei:045e:0021;mei:04F3:261A
++Class=ISDV4
++Widht=10
++Height=6
++IntegratedIn=Display;System
++
++[Features]
++Stylus=true
++Touch=true
++Buttons=0
diff --git a/PKGBUILD b/PKGBUILD
index cc57af64fc8f..cf5ee6f6129a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libwacom-surface
 pkgver=0.32
-pkgrel=1
+pkgrel=2
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
 url="https://github.com/geoffholden/libwacom"
@@ -14,21 +14,21 @@ conflicts=('libwacom')
 provides=("libwacom=${pkgver}")
 
 source=(
-    'mei-bus.patch'
-    'surface-tablet-data.patch'
+    '00_mei-bus.patch'
+    '01_surface-tablet-data.patch'
     "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
 )
 sha256sums=(
-    '1e5301bf93bf75352e559b89fbb84aca2d3edb5ec2951dd848546404f9d8fb7f'
-    '32f7a27225af200430c2f3d5e497f9ee51bda5a4921647472879d62e890551ad'
+    'faf69fa3795a5147665b285f28d82c0977a3870522c98ffccaf819730089599e'
+    '9b7f8d681bf12e81e21cde33b7d77b10b4f2a78f3d0c46c5efe147c278c24bf9'
     '6b9dab8bce0471b839c89d34a1b30839de2c24db03796fa8d572817830f85380'
     'SKIP'
 )
 
 prepare() {
     cd "libwacom-${pkgver}"
-    patch -p0 -i "${srcdir}/mei-bus.patch"
-    patch -Np0 -i "${srcdir}/surface-tablet-data.patch" || true
+    patch -p1 -i "${srcdir}/00_mei-bus.patch"
+    patch -Np1 -i "${srcdir}/01_surface-tablet-data.patch" || true
     # If the patched source has been cached this will fail to apply, ignore that with `|| true`
     # XXX: There must be a better option?
 }
diff --git a/surface-tablet-data.patch b/surface-tablet-data.patch
deleted file mode 100644
index 423fc9f1289f..000000000000
--- a/surface-tablet-data.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git data/surface.tablet data/surface.tablet
-new file mode 100644
-index 0000000..401fd62
---- /dev/null
-+++ data/surface.tablet
-@@ -0,0 +1,14 @@
-+# Microsoft Surface Pro/Surface Book
-+
-+[Device]
-+Name=Microsoft Surface Pro/Book
-+DeviceMatch=mei:1b96:006a;mei:1b96:001F;mei:1b96:005e;mei:1b96:0020
-+Class=ISDV4
-+Width=10
-+Height=6
-+IntegratedIn=Display;System
-+
-+[Features]
-+Stylus=true
-+Touch=true
-+Buttons=0