community/iio-sensor-proxy: upgrade to 3.0

2 files changed, 4 insertions, 74 deletions

diff --git a/community/iio-sensor-proxy/292.patch b/community/iio-sensor-proxy/292.patch
deleted file mode 100644
index d5c7b0d487..0000000000
--- a/community/iio-sensor-proxy/292.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From eba0aca224c18624b7e398171fb8688728baf398 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Sat, 21 Dec 2019 14:31:51 +0100
-Subject: [PATCH] light: Support sensors using raw values as well
-
-E.g. the vcnl4000 class devices reports a raw value and a scale
-to calculate lux.
----
- data/80-iio-sensor-proxy.rules |  1 +
- src/drv-iio-poll-light.c       | 16 ++++++++++++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/data/80-iio-sensor-proxy.rules b/data/80-iio-sensor-proxy.rules
-index 06040dc..5bcb207 100644
---- a/data/80-iio-sensor-proxy.rules
-+++ b/data/80-iio-sensor-proxy.rules
-@@ -9,6 +9,7 @@ SUBSYSTEM=="iio", TEST=="in_accel_x_raw", TEST=="in_accel_y_raw", TEST=="in_acce
- SUBSYSTEM=="iio", TEST=="scan_elements/in_accel_x_en", TEST=="scan_elements/in_accel_y_en", TEST=="scan_elements/in_accel_z_en", ENV{IIO_SENSOR_PROXY_TYPE}="iio-buffer-accel"
- SUBSYSTEM=="iio", TEST=="scan_elements/in_rot_from_north_magnetic_tilt_comp_en", ENV{IIO_SENSOR_PROXY_TYPE}="iio-buffer-compass"
- SUBSYSTEM=="iio", TEST=="in_illuminance_input", ENV{IIO_SENSOR_PROXY_TYPE}="iio-poll-als"
-+SUBSYSTEM=="iio", TEST=="in_illuminance_raw", ENV{IIO_SENSOR_PROXY_TYPE}="iio-poll-als"
- SUBSYSTEM=="iio", TEST=="scan_elements/in_intensity_both_en", ENV{IIO_SENSOR_PROXY_TYPE}="iio-buffer-als"
- SUBSYSTEM=="input", ENV{ID_INPUT_ACCELEROMETER}=="1", ENV{IIO_SENSOR_PROXY_TYPE}="input-accel"
- 
-diff --git a/src/drv-iio-poll-light.c b/src/drv-iio-poll-light.c
-index d0da7df..a7423c6 100644
---- a/src/drv-iio-poll-light.c
-+++ b/src/drv-iio-poll-light.c
-@@ -24,6 +24,8 @@ typedef struct DrvData {
- 	char               *input_path;
- 	guint               interval;
- 	guint               timeout_id;
-+
-+	double              scale;
- } DrvData;
- 
- static DrvData *drv_data = NULL;
-@@ -55,8 +57,8 @@ light_changed (gpointer user_data)
- 		g_error_free (error);
- 		return G_SOURCE_CONTINUE;
- 	}
--
--	readings.level = level;
-+	readings.level = level * drv_data->scale;
-+	g_debug ("Light read from IIO: %lf, (scale %lf)", level, drv_data->scale);
- 
- 	/* Even though the IIO kernel API declares in_intensity* values as unitless,
- 	 * we use Microsoft's hid-sensors-usages.docx which mentions that Windows 8
-@@ -125,6 +127,16 @@ iio_poll_light_open (GUdevDevice        *device,
- 	drv_data->input_path = g_build_filename (g_udev_device_get_sysfs_path (device),
- 						 "in_illuminance_input",
- 						 NULL);
-+	if (!g_file_test (drv_data->input_path, G_FILE_TEST_EXISTS)) {
-+		g_free (drv_data->input_path);
-+		drv_data->input_path = g_build_filename (g_udev_device_get_sysfs_path (device),
-+							 "in_illuminance_raw",
-+							 NULL);
-+	}
-+
-+	drv_data->scale = g_udev_device_get_sysfs_attr_as_double (device, "in_illuminance_scale");
-+	if (drv_data->scale == 0.0)
-+		drv_data->scale = 1.0;
- 
- 	return TRUE;
- }
--- 
-2.24.1
-
diff --git a/community/iio-sensor-proxy/APKBUILD b/community/iio-sensor-proxy/APKBUILD
index 8fff4499ce..f29f0d7724 100644
--- a/community/iio-sensor-proxy/APKBUILD
+++ b/community/iio-sensor-proxy/APKBUILD
@@ -1,18 +1,17 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=iio-sensor-proxy
-pkgver=2.8
-pkgrel=2
+pkgver=3.0
+pkgrel=0
 pkgdesc="IIO sensors to D-Bus proxy"
 url="https://developer.gnome.org/iio-sensor-proxy/1.0/"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="eudev-dev libgudev-dev glib-dev autoconf automake libtool gtk+3.0-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="https://github.com/hadess/iio-sensor-proxy/releases/download/$pkgver/iio-sensor-proxy-$pkgver.tar.xz
+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
-	292.patch
 	299.patch"
 
 prepare() {
@@ -42,8 +41,7 @@ package() {
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-sha512sums="2631ca1bc3fc115d392772010c0e879750cdb1f8d3bb247483527481232c9107212d2c8cbf3bdc30942ef3bd34f4e5c56f168367cafcb8d6381b47ff908014c8  iio-sensor-proxy-2.8.tar.xz
+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
-68a2815f4bd54c05af286a096ca8b7cac11e159cb47b012187b277ff03a9a73f0e0c26e5e67b1855e6d67714f9be8cf94a6292d5e3d85d23ced00f43ae75f433  292.patch
 b7aef50fb08e33ebca508da4c394dfa02135a9da2c2efac73f3d43b6bfe3e973484892c9f3ec76e9a762b32c0f647e42de6f0bad5ec4b520e14dfc6ae6839445  299.patch"