community/iio-sensor-proxy: remove patch that was applied upstream

2 files changed, 3 insertions, 96 deletions

diff --git a/community/iio-sensor-proxy/299.patch b/community/iio-sensor-proxy/299.patch
deleted file mode 100644
index 971418102e..0000000000
--- a/community/iio-sensor-proxy/299.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From e11bb33e7b179e2a8198653ee7bf4c044f3eff1e Mon Sep 17 00:00:00 2001
-From: Dmitry Osipenko <digetx@gmail.com>
-Date: Sat, 18 Jan 2020 19:29:08 +0300
-Subject: [PATCH 1/2] mount-matrix: Support IIO sysfs in_mount_matrix
-
-Linux kernel IIO drivers provide mount matrix via standardized sysfs
-interface. The IIO mount matrix could specified by "directory" and by
-"type", this patch adds support for the "directory" type which may be
-used by drivers that use the same shared matrix for all of the sensors
-or if driver provides only one accelerometer sensor at all.
----
- src/accel-mount-matrix.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/accel-mount-matrix.c b/src/accel-mount-matrix.c
-index c66b440..25a0ea5 100644
---- a/src/accel-mount-matrix.c
-+++ b/src/accel-mount-matrix.c
-@@ -50,6 +50,21 @@ setup_mount_matrix (GUdevDevice *device)
- 		g_clear_pointer (&ret, g_free);
- 	}
- 
-+	/* Linux kernel IIO accelerometer drivers provide mount matrix
-+	 * via standardized sysfs interface.
-+	 *
-+	 * See https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-bus-iio
-+	 * for more details. */
-+	mount_matrix = g_udev_device_get_sysfs_attr (device, "in_mount_matrix");
-+	if (mount_matrix) {
-+		if (parse_mount_matrix (mount_matrix, &ret))
-+			return ret;
-+
-+		g_warning ("Failed to parse in_mount_matrix ('%s') from sysfs",
-+			   mount_matrix);
-+		g_clear_pointer (&ret, g_free);
-+	}
-+
- 	g_debug ("Failed to auto-detect mount matrix, falling back to identity");
- 	parse_mount_matrix (NULL, &ret);
- 	return ret;
--- 
-2.24.1
-
-
-From 9fdbb3636370e3681f7700fd5c6c66c8003e3b13 Mon Sep 17 00:00:00 2001
-From: Dmitry Osipenko <digetx@gmail.com>
-Date: Mon, 20 Jan 2020 22:48:52 +0300
-Subject: [PATCH 2/2] mount-matrix: Support IIO sysfs in_accel_mount_matrix
-
-Linux kernel IIO drivers provide mount matrix via standardized sysfs
-interface. The IIO mount matrix could specified by "directory" and by
-"type", this patch adds support for the "by type" option which is used
-by drivers that use individual matrices for each of the sensors. Tested
-on Nexus 7 and Acer A500 tablet devices using MPU6050 and KXTF9 IIO drivers
-respectively, now monitor-sensor reports display's orientation correctly
-on these devices.
----
- src/accel-mount-matrix.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/accel-mount-matrix.c b/src/accel-mount-matrix.c
-index 25a0ea5..0ba0191 100644
---- a/src/accel-mount-matrix.c
-+++ b/src/accel-mount-matrix.c
-@@ -50,6 +50,23 @@ setup_mount_matrix (GUdevDevice *device)
- 		g_clear_pointer (&ret, g_free);
- 	}
- 
-+	/* Some IIO drivers provide multiple sensors via the same sysfs path
-+	 * and thus they may have different matrices like in a case of
-+	 * accelerometer and angular velocity for example. The accelerometer
-+	 * mount matrix is named as in_accel_mount_matrix in that case.
-+	 *
-+	 * See https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-bus-iio
-+	 * for more details. */
-+	mount_matrix = g_udev_device_get_sysfs_attr (device, "in_accel_mount_matrix");
-+	if (mount_matrix) {
-+		if (parse_mount_matrix (mount_matrix, &ret))
-+			return ret;
-+
-+		g_warning ("Failed to parse in_accel_mount_matrix ('%s') from sysfs",
-+			   mount_matrix);
-+		g_clear_pointer (&ret, g_free);
-+	}
-+
- 	/* Linux kernel IIO accelerometer drivers provide mount matrix
- 	 * via standardized sysfs interface.
- 	 *
--- 
-2.24.1
-
diff --git a/community/iio-sensor-proxy/APKBUILD b/community/iio-sensor-proxy/APKBUILD
index f29f0d7724..ecdd8990e7 100644
--- a/community/iio-sensor-proxy/APKBUILD
+++ b/community/iio-sensor-proxy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=iio-sensor-proxy
 pkgver=3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="IIO sensors to D-Bus proxy"
 url="https://developer.gnome.org/iio-sensor-proxy/1.0/"
 arch="all"
@@ -11,8 +11,7 @@ makedepends="eudev-dev libgudev-dev glib-dev autoconf automake libtool gtk+3.0-d
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/uploads/de965bcb444552d328255639b241ce73/iio-sensor-proxy-$pkgver.tar.xz
 	iio-sensor-proxy.initd
-	0001-Revert-build-Check-for-.pc-files-before-using-them.patch
-	299.patch"
+	0001-Revert-build-Check-for-.pc-files-before-using-them.patch"
 
 prepare() {
 	default_prepare
@@ -43,5 +42,4 @@ package() {
 
 sha512sums="50e84a5df006c34db07532bdb583142723ad610ade7dc495d0c1b076c7ef84564a60202a8be378173a429bd04dee10e8b33e5b7acc4b3dd810755cb831ebf2ea  iio-sensor-proxy-3.0.tar.xz
 b0f2875074ff1211faeca3e29b32f60c5604ca31b6dac3d4d99f057ed32e2453aefc4495c34cf3885badacc7168b6c032f3d084052db52977bbe8438e76eac5f  iio-sensor-proxy.initd
-5480763f85cb22fd7b1b791609baa3a4b251fc30a025b40aee2de584fa114686bf181a87a249ba4b0cb9080881ff55498baa7e496513bc39fa1af7c43253c465  0001-Revert-build-Check-for-.pc-files-before-using-them.patch
-b7aef50fb08e33ebca508da4c394dfa02135a9da2c2efac73f3d43b6bfe3e973484892c9f3ec76e9a762b32c0f647e42de6f0bad5ec4b520e14dfc6ae6839445  299.patch"
+5480763f85cb22fd7b1b791609baa3a4b251fc30a025b40aee2de584fa114686bf181a87a249ba4b0cb9080881ff55498baa7e496513bc39fa1af7c43253c465  0001-Revert-build-Check-for-.pc-files-before-using-them.patch"