[arch-commits] Commit in libevdev/trunk (3 files)
Felix Yan
fyan at nymeria.archlinux.org
Tue Jan 7 04:39:08 UTC 2014
Date: Tuesday, January 7, 2014 @ 05:39:08
Author: fyan
Revision: 203267
upgpkg: libevdev 0.6-1
- upstream new release
- applied patches from Fedora to prevent crash on clutter
Added:
libevdev/trunk/0001-Revert-Drop-deprecated-functions.patch
libevdev/trunk/0001-Revert-Drop-some-leftover-deprecated-constants.patch
Modified:
libevdev/trunk/PKGBUILD
-----------------------------------------------------------+
0001-Revert-Drop-deprecated-functions.patch | 163 ++++++++++++
0001-Revert-Drop-some-leftover-deprecated-constants.patch | 30 ++
PKGBUILD | 18 +
3 files changed, 207 insertions(+), 4 deletions(-)
Added: 0001-Revert-Drop-deprecated-functions.patch
===================================================================
--- 0001-Revert-Drop-deprecated-functions.patch (rev 0)
+++ 0001-Revert-Drop-deprecated-functions.patch 2014-01-07 04:39:08 UTC (rev 203267)
@@ -0,0 +1,163 @@
+From 51bf0ead89df5c1ddaa22d2f7fc0e04cedbdc590 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Thu, 26 Dec 2013 18:58:23 -0800
+Subject: [PATCH] Revert "Drop deprecated functions"
+
+This reverts commit 7a38f4abc3ed1df368d5bad32a1d72559acdc234. It is incorrect and dangerous to drop functions without an soname bump. This broke GNOME.
+---
+ libevdev/libevdev.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libevdev/libevdev.h | 30 ++++++++++++++++++++++++++++++
+ 2 files changed, 79 insertions(+)
+
+diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
+index 8a37204..02e4f78 100644
+--- a/libevdev/libevdev.c
++++ b/libevdev/libevdev.c
+@@ -162,6 +162,14 @@ libevdev_free(struct libevdev *dev)
+ free(dev);
+ }
+
++/* DEPRECATED */
++LIBEVDEV_EXPORT void
++libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc)
++{
++ /* Can't be backwards compatible to this yet, so don't even try */
++ fprintf(stderr, "libevdev: ABI change. Log function will not be honored.\n");
++}
++
+ LIBEVDEV_EXPORT void
+ libevdev_set_log_function(libevdev_log_func_t logfunc, void *data)
+ {
+@@ -1244,6 +1252,12 @@ libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigned in
+ }
+
+ LIBEVDEV_EXPORT int
++libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs)
++{
++ return libevdev_kernel_set_abs_info(dev, code, abs);
++}
++
++LIBEVDEV_EXPORT int
+ libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs)
+ {
+ int rc;
+@@ -1296,12 +1310,22 @@ libevdev_grab(struct libevdev *dev, enum libevdev_grab_mode grab)
+ return rc < 0 ? -errno : 0;
+ }
+
++/* DEPRECATED */
++LIBEVDEV_EXPORT int
++libevdev_is_event_type(const struct input_event *ev, unsigned int type)
++ALIAS(libevdev_event_is_type);
++
+ LIBEVDEV_EXPORT int
+ libevdev_event_is_type(const struct input_event *ev, unsigned int type)
+ {
+ return type < EV_CNT && ev->type == type;
+ }
+
++/* DEPRECATED */
++LIBEVDEV_EXPORT int
++libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code)
++ALIAS(libevdev_event_is_code);
++
+ LIBEVDEV_EXPORT int
+ libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned int code)
+ {
+@@ -1314,6 +1338,11 @@ libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned
+ return (max > -1 && code <= (unsigned int)max && ev->code == code);
+ }
+
++/* DEPRECATED */
++LIBEVDEV_EXPORT const char*
++libevdev_get_event_type_name(unsigned int type)
++ALIAS(libevdev_event_type_get_name);
++
+ LIBEVDEV_EXPORT const char*
+ libevdev_event_type_get_name(unsigned int type)
+ {
+@@ -1323,6 +1352,11 @@ libevdev_event_type_get_name(unsigned int type)
+ return ev_map[type];
+ }
+
++/* DEPRECATED */
++LIBEVDEV_EXPORT const char*
++libevdev_get_event_code_name(unsigned int type, unsigned int code)
++ALIAS(libevdev_event_code_get_name);
++
+ LIBEVDEV_EXPORT const char*
+ libevdev_event_code_get_name(unsigned int type, unsigned int code)
+ {
+@@ -1334,6 +1368,16 @@ libevdev_event_code_get_name(unsigned int type, unsigned int code)
+ return event_type_map[type][code];
+ }
+
++/* DEPRECATED */
++LIBEVDEV_EXPORT const char*
++libevdev_get_input_prop_name(unsigned int prop)
++ALIAS(libevdev_property_get_name);
++
++/* DEPRECATED */
++LIBEVDEV_EXPORT const char*
++libevdev_get_property_name(unsigned int prop)
++ALIAS(libevdev_property_get_name);
++
+ LIBEVDEV_EXPORT const char*
+ libevdev_property_get_name(unsigned int prop)
+ {
+@@ -1343,6 +1387,11 @@ libevdev_property_get_name(unsigned int prop)
+ return input_prop_map[prop];
+ }
+
++/* DEPRECATED */
++LIBEVDEV_EXPORT int
++libevdev_get_event_type_max(unsigned int type)
++ALIAS(libevdev_event_type_get_max);
++
+ LIBEVDEV_EXPORT int
+ libevdev_event_type_get_max(unsigned int type)
+ {
+diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h
+index 37ca2f4..c89f4ad 100644
+--- a/libevdev/libevdev.h
++++ b/libevdev/libevdev.h
+@@ -1642,6 +1642,36 @@ int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period);
+ #define LIBEVDEV_DEPRECATED
+ #endif
+
++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_SYNC;
++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_NORMAL;
++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC;
++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING;
++
++/* replacement: libevdev_kernel_set_abs_info */
++int libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) LIBEVDEV_DEPRECATED;
++
++
++/* replacement: libevdev_set_log_function */
++void libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_event_type_get_max */
++int libevdev_get_event_type_max(unsigned int type) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_property_get_name */
++const char* libevdev_get_property_name(unsigned int prop) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_event_type_get_name */
++const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED;
++/** replacement: libevdev_event_code_get_name */
++const char * libevdev_get_event_code_name(unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_event_is_type */
++int libevdev_is_event_type(const struct input_event *ev, unsigned int type) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_event_is_code */
++int libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED;
++/**************************************/
++
+ #ifdef __cplusplus
+ }
+ #endif
+--
+1.8.5.2
+
Added: 0001-Revert-Drop-some-leftover-deprecated-constants.patch
===================================================================
--- 0001-Revert-Drop-some-leftover-deprecated-constants.patch (rev 0)
+++ 0001-Revert-Drop-some-leftover-deprecated-constants.patch 2014-01-07 04:39:08 UTC (rev 203267)
@@ -0,0 +1,30 @@
+From 9ee61912a356bb8c1995cf262428196e5e4f179d Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 3 Jan 2014 08:30:04 +1000
+Subject: [PATCH libevdev] Revert "Drop some leftover deprecated constants."
+
+This reverts commit a612ee753e8c40d2d1fff6da516d278064e27d86.
+---
+ libevdev/libevdev.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
+index 8a37204..432aeff 100644
+--- a/libevdev/libevdev.c
++++ b/libevdev/libevdev.c
+@@ -36,6 +36,12 @@
+
+ #define MAXEVENTS 64
+
++/* DEPRECATED */
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_SYNC = LIBEVDEV_READ_FLAG_SYNC;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_NORMAL = LIBEVDEV_READ_FLAG_NORMAL;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC = LIBEVDEV_READ_FLAG_FORCE_SYNC;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING = LIBEVDEV_READ_FLAG_BLOCKING;
++
+ static int sync_mt_state(struct libevdev *dev, int create_events);
+
+ static int
+--
+1.8.4.2
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-01-07 04:06:14 UTC (rev 203266)
+++ PKGBUILD 2014-01-07 04:39:08 UTC (rev 203267)
@@ -2,8 +2,8 @@
# Maintainer: Jan de Groot
pkgname=libevdev
-pkgver=0.4
-pkgrel=2
+pkgver=0.6
+pkgrel=1
pkgdesc="Wrapper library for evdev devices"
arch=(i686 x86_64)
url="http://www.freedesktop.org/wiki/Software/libevdev/"
@@ -10,11 +10,21 @@
license=(custom:X11)
depends=('glibc')
makedepends=('python')
-source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42')
+source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz
+ 0001-Revert-Drop-deprecated-functions.patch
+ 0001-Revert-Drop-some-leftover-deprecated-constants.patch)
+sha256sums=('1c562ed32252ef9c14aa61e03b38acb886cb3edbbdafbb5181762ff16e010d93'
+ '783ba5edf7c9525e8cac46c8c4c981c98395ff3c68ed7a162190ef9e8f13b149'
+ '24d52811732b3335eb363416e4862c6152bfe6ebc8c372a298126221f754f041')
build() {
cd $pkgname-$pkgver
+
+ # Fix libevdev 0.6 missing symbol that breaks clutter, patches from Fedora
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1046426
+ patch -Np1 -i ../0001-Revert-Drop-deprecated-functions.patch
+ patch -Np1 -i ../0001-Revert-Drop-some-leftover-deprecated-constants.patch
+
./configure --prefix=/usr --disable-static --disable-gcov
make
}
More information about the arch-commits
mailing list