[arch-commits] Commit in upower/trunk (2 files)
Jan de Groot
jgc at nymeria.archlinux.org
Mon Mar 18 19:28:40 UTC 2013
Date: Monday, March 18, 2013 @ 20:28:40
Author: jgc
Revision: 180238
Enable deprecated interfaces. KDE still needs this, so we keep this enabled for a while. Drop patch already included in the release
Note: pm-utils is still a dependency and will not go away when removing deprecated interfaces.
upgpkg: upower 0.9.20-1
Modified:
upower/trunk/PKGBUILD
Deleted:
upower/trunk/lg-unifying-fix-K750-features-name-use-1-second-interval.patch
----------------------------------------------------------------+
PKGBUILD | 13 -
lg-unifying-fix-K750-features-name-use-1-second-interval.patch | 98 ----------
2 files changed, 5 insertions(+), 106 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-18 18:26:40 UTC (rev 180237)
+++ PKGBUILD 2013-03-18 19:28:40 UTC (rev 180238)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=upower
-pkgver=0.9.19
+pkgver=0.9.20
pkgrel=1
pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
arch=('i686' 'x86_64')
@@ -11,10 +11,8 @@
depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz
- lg-unifying-fix-K750-features-name-use-1-second-interval.patch)
-md5sums=('f96955ff1a2e4f006937d6b5ea95afb8'
- '04b2a6141e80e422a9fe2820b5b3a613')
+source=($url/releases/$pkgname-$pkgver.tar.xz)
+md5sums=('f175984d142dc8d2353a7da609836b69')
build() {
cd "$pkgname-$pkgver"
@@ -22,12 +20,11 @@
# put udev files in /usr/lib
sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
- patch -Np1 -i ../lg-unifying-fix-K750-features-name-use-1-second-interval.patch
-
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/$pkgname \
- --disable-static
+ --disable-static \
+ --enable-deprecated
make
}
Deleted: lg-unifying-fix-K750-features-name-use-1-second-interval.patch
===================================================================
--- lg-unifying-fix-K750-features-name-use-1-second-interval.patch 2013-03-18 18:26:40 UTC (rev 180237)
+++ lg-unifying-fix-K750-features-name-use-1-second-interval.patch 2013-03-18 19:28:40 UTC (rev 180238)
@@ -1,98 +0,0 @@
-From 35b0d25b49d04cf7d33699c34f42a196c8e92a2e Mon Sep 17 00:00:00 2001
-From: Julien Danjou <julien at danjou.info>
-Date: Sat, 01 Dec 2012 12:30:03 +0000
-Subject: lg-unifying: fix K750 features name, use 1 second interval
-
-I've recently got access to some spec on this, so I'm now able to document
-his a bit better. Also, change the 0x78 value for the function sending
-BattLightMeasureBroadcastEvent to 0x1 since this is the number of event we
-want, and one is enough.
-
-Signed-off-by: Julien Danjou <julien at danjou.info>
-Signed-off-by: Richard Hughes <richard at hughsie.com>
----
-diff --git a/src/linux/up-device-lg-unifying.c b/src/linux/up-device-lg-unifying.c
-index e8997c0..eddd1ec 100644
---- a/src/linux/up-device-lg-unifying.c
-+++ b/src/linux/up-device-lg-unifying.c
-@@ -84,10 +84,9 @@
- #define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETCOUNT (0x00 << 4)
- #define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETDEVICENAME (0x01 << 4)
-
--/* I wish i has the spec for this, but I don't so I invented the name */
--#define HIDPP_FEATURE_K750_BATTERY 0x4301
--#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY (0x00 << 4)
--#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT (0x01 << 4)
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD 0x4301
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure (0x00 << 4)
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent (0x01 << 4)
-
- #define HIDPP_FEATURE_FUNCTION_AS_ARG(feature) \
- feature >> 8, feature, 0x00
-@@ -105,7 +104,7 @@ struct UpDeviceUnifyingPrivate
- int fd;
- /* Device index on the Unifying "bus" */
- gint device_index;
-- gint feature_k750_battery_index;
-+ gint feature_solar_dashboard_index;
- GIOChannel *channel;
- guint channel_source_id;
- };
-@@ -130,8 +129,8 @@ up_device_unifying_event_io (GIOChannel *channel, GIOCondition condition, gpoint
- while (read (unifying->priv->fd, buf, sizeof(buf)) > 0)
- if (buf[0] == HIDPP_HEADER_RESPONSE &&
- buf[1] == unifying->priv->device_index &&
-- buf[2] == unifying->priv->feature_k750_battery_index &&
-- buf[3] == HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT) {
-+ buf[2] == unifying->priv->feature_solar_dashboard_index &&
-+ buf[3] == HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent) {
- lux = (buf[5] << 8) | buf[6];
- if (lux > 200) {
- g_object_set (device,
-@@ -283,25 +282,24 @@ up_device_unifying_hidpp2_set_battery (UpDeviceUnifying *unifying)
- 0x00, 0x00, 0x00, 0x00, 0x00,
- };
-
-- if (unifying->priv->feature_k750_battery_index == -1)
-- unifying->priv->feature_k750_battery_index =
-- up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_K750_BATTERY);
-+ if (unifying->priv->feature_solar_dashboard_index == -1)
-+ unifying->priv->feature_solar_dashboard_index =
-+ up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_SOLAR_DASHBOARD);
-
-- if (unifying->priv->feature_k750_battery_index == 0) {
-- /* Probably not a K750 */
-+ if (unifying->priv->feature_solar_dashboard_index == 0) {
-+ /* Probably not a solar keyboard */
- /* TODO: add support for BatteryLevelStatus */
- } else {
- /* This request will make the keyboard send a bunch of packets
- * (events) with lux-meter and battery information */
-- request[2] = unifying->priv->feature_k750_battery_index;
-- request[3] = HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY;
-- /* Don't know what this means */
-- request[4] = 0x78;
-- request[5] = 0x01;
-+ request[2] = unifying->priv->feature_solar_dashboard_index;
-+ request[3] = HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure;
-+ request[4] = 0x01; /* Max number of reports: number of report sent after function call */
-+ request[5] = 0x01; /* Report period: time between reports, in seconds */
-
-
- if (write (unifying->priv->fd, request, sizeof(request)) != sizeof(request)) {
-- g_debug ("Unable to send K750 battery/lux events start request to device");
-+ g_debug ("Unable to send solar battery/lux events start request to device");
- return FALSE;
- }
-
-@@ -719,7 +717,7 @@ up_device_unifying_init (UpDeviceUnifying *unifying)
- unifying->priv = UP_DEVICE_UNIFYING_GET_PRIVATE (unifying);
- unifying->priv->poll_timer_id = 0;
- unifying->priv->fd = -1;
-- unifying->priv->feature_k750_battery_index = -1;
-+ unifying->priv->feature_solar_dashboard_index = -1;
- }
-
- /**
---
-cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list