From e765df959f50de1accea499149089a767abac68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Thu, 16 Jul 2015 01:58:07 +0300 Subject: [PATCH] xorg-input-* is fixed deps. --- x11/driver/xorg-input-acecad/pspec.xml | 2 - x11/driver/xorg-input-aiptek/pspec.xml | 4 +- x11/driver/xorg-input-elographics/pspec.xml | 4 +- x11/driver/xorg-input-evdev/pspec.xml | 4 +- x11/driver/xorg-input-joystick/pspec.xml | 5 +- x11/driver/xorg-input-kbd/pspec.xml | 5 +- x11/driver/xorg-input-mouse/pspec.xml | 5 +- x11/driver/xorg-input-synaptics/pspec.xml | 7 +- x11/driver/xorg-input-vmmouse/pspec.xml | 4 +- x11/driver/xorg-input-void/pspec.xml | 4 +- x11/driver/xorg-input-wacom/pspec.xml | 3 + x11/library/libevdev/actions.py | 21 +++ ...001-Revert-Drop-deprecated-functions.patch | 162 ++++++++++++++++++ ...p-some-leftover-deprecated-constants.patch | 29 ++++ x11/library/libevdev/pspec.xml | 70 ++++++++ x11/library/libevdev/translations.xml | 8 + 16 files changed, 317 insertions(+), 20 deletions(-) create mode 100644 x11/library/libevdev/actions.py create mode 100644 x11/library/libevdev/files/0001-Revert-Drop-deprecated-functions.patch create mode 100644 x11/library/libevdev/files/0001-Revert-Drop-some-leftover-deprecated-constants.patch create mode 100644 x11/library/libevdev/pspec.xml create mode 100644 x11/library/libevdev/translations.xml diff --git a/x11/driver/xorg-input-acecad/pspec.xml b/x11/driver/xorg-input-acecad/pspec.xml index 32c722d242..4451e73ee6 100644 --- a/x11/driver/xorg-input-acecad/pspec.xml +++ b/x11/driver/xorg-input-acecad/pspec.xml @@ -27,8 +27,6 @@ xorg-input-acecad - xorg-server - libmtdev sysfsutils diff --git a/x11/driver/xorg-input-aiptek/pspec.xml b/x11/driver/xorg-input-aiptek/pspec.xml index 52c21a490a..c2d4fcd93f 100644 --- a/x11/driver/xorg-input-aiptek/pspec.xml +++ b/x11/driver/xorg-input-aiptek/pspec.xml @@ -22,10 +22,10 @@ xorg-input-aiptek - + /usr/lib/xorg /usr/share/doc diff --git a/x11/driver/xorg-input-elographics/pspec.xml b/x11/driver/xorg-input-elographics/pspec.xml index 96e4ca24f1..dc064b9448 100644 --- a/x11/driver/xorg-input-elographics/pspec.xml +++ b/x11/driver/xorg-input-elographics/pspec.xml @@ -22,10 +22,10 @@ xorg-input-elographics - + /usr/lib/xorg /usr/share/doc diff --git a/x11/driver/xorg-input-evdev/pspec.xml b/x11/driver/xorg-input-evdev/pspec.xml index 49936418d7..0f77ac2025 100644 --- a/x11/driver/xorg-input-evdev/pspec.xml +++ b/x11/driver/xorg-input-evdev/pspec.xml @@ -17,15 +17,17 @@ xorg-server-devel libmtdev-devel libevdev + util-macros + eudev-devel xorg-input-evdev - xorg-server libmtdev libevdev + eudev /usr/lib/xorg diff --git a/x11/driver/xorg-input-joystick/pspec.xml b/x11/driver/xorg-input-joystick/pspec.xml index 5fcc2fb4d3..eadd0587ba 100644 --- a/x11/driver/xorg-input-joystick/pspec.xml +++ b/x11/driver/xorg-input-joystick/pspec.xml @@ -16,14 +16,15 @@ mirrors://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 xorg-server-devel + util-macros xorg-input-joystick - + /usr/lib/xorg /usr/share/man diff --git a/x11/driver/xorg-input-kbd/pspec.xml b/x11/driver/xorg-input-kbd/pspec.xml index a4a7716c4c..a768438574 100644 --- a/x11/driver/xorg-input-kbd/pspec.xml +++ b/x11/driver/xorg-input-kbd/pspec.xml @@ -15,14 +15,15 @@ mirrors://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 xorg-server-devel + util-macros xorg-input-kbd - + /usr/lib/xorg /usr/share/doc diff --git a/x11/driver/xorg-input-mouse/pspec.xml b/x11/driver/xorg-input-mouse/pspec.xml index 83c805976c..b19a12790a 100644 --- a/x11/driver/xorg-input-mouse/pspec.xml +++ b/x11/driver/xorg-input-mouse/pspec.xml @@ -15,6 +15,7 @@ mirrors://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 xorg-server-devel + util-macros 0001-Don-t-disable-3-button-emulation-if-third-mouse-butt.patch @@ -23,9 +24,9 @@ xorg-input-mouse - + /usr/lib/xorg /usr/share/doc diff --git a/x11/driver/xorg-input-synaptics/pspec.xml b/x11/driver/xorg-input-synaptics/pspec.xml index 4f3790de17..ca33fbe730 100644 --- a/x11/driver/xorg-input-synaptics/pspec.xml +++ b/x11/driver/xorg-input-synaptics/pspec.xml @@ -18,6 +18,8 @@ libXtst-devel libmtdev-devel xorg-server-devel + libevdev + util-macros add_tapbuttons.diff @@ -29,9 +31,8 @@ libXi libXtst - libmtdev - xorg-server - libevdev + libX11 + libevdev /lib/udev diff --git a/x11/driver/xorg-input-vmmouse/pspec.xml b/x11/driver/xorg-input-vmmouse/pspec.xml index 5818027dc9..049a23e3a7 100644 --- a/x11/driver/xorg-input-vmmouse/pspec.xml +++ b/x11/driver/xorg-input-vmmouse/pspec.xml @@ -23,9 +23,9 @@ xorg-input-vmmouse - + /lib/udev /usr/bin diff --git a/x11/driver/xorg-input-void/pspec.xml b/x11/driver/xorg-input-void/pspec.xml index dfc6ab218e..d7c5ad3020 100644 --- a/x11/driver/xorg-input-void/pspec.xml +++ b/x11/driver/xorg-input-void/pspec.xml @@ -21,9 +21,9 @@ xorg-input-void - + /usr/lib/xorg /usr/share/man diff --git a/x11/driver/xorg-input-wacom/pspec.xml b/x11/driver/xorg-input-wacom/pspec.xml index 57e472fc2d..c237de5d12 100644 --- a/x11/driver/xorg-input-wacom/pspec.xml +++ b/x11/driver/xorg-input-wacom/pspec.xml @@ -18,16 +18,19 @@ libXrandr-devel xorg-server-devel libXinerama-devel + eudev-devel xorg-input-wacom + libX11 libXi libXrandr libXinerama xorg-server + eudev /lib/udev diff --git a/x11/library/libevdev/actions.py b/x11/library/libevdev/actions.py new file mode 100644 index 0000000000..9c216bf27c --- /dev/null +++ b/x11/library/libevdev/actions.py @@ -0,0 +1,21 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + autotools.configure("--disable-static \ + --disable-gcov") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("COPYING") diff --git a/x11/library/libevdev/files/0001-Revert-Drop-deprecated-functions.patch b/x11/library/libevdev/files/0001-Revert-Drop-deprecated-functions.patch new file mode 100644 index 0000000000..eb24381b7c --- /dev/null +++ b/x11/library/libevdev/files/0001-Revert-Drop-deprecated-functions.patch @@ -0,0 +1,162 @@ +From 51bf0ead89df5c1ddaa22d2f7fc0e04cedbdc590 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +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 diff --git a/x11/library/libevdev/files/0001-Revert-Drop-some-leftover-deprecated-constants.patch b/x11/library/libevdev/files/0001-Revert-Drop-some-leftover-deprecated-constants.patch new file mode 100644 index 0000000000..5a5f15371f --- /dev/null +++ b/x11/library/libevdev/files/0001-Revert-Drop-some-leftover-deprecated-constants.patch @@ -0,0 +1,29 @@ +From 9ee61912a356bb8c1995cf262428196e5e4f179d Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +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 diff --git a/x11/library/libevdev/pspec.xml b/x11/library/libevdev/pspec.xml new file mode 100644 index 0000000000..740090b0c2 --- /dev/null +++ b/x11/library/libevdev/pspec.xml @@ -0,0 +1,70 @@ + + + + + libevdev + http://www.freedesktop.org/wiki/Software/libevdev/ + + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + GPLv1 + library + Wrapper library for evdev devices + Wrapper library for evdev devices + http://www.freedesktop.org/software/libevdev/libevdev-1.3.2.tar.xz + + 0001-Revert-Drop-deprecated-functions.patch + 0001-Revert-Drop-some-leftover-deprecated-constants.patch + + + + + libevdev + + /usr/bin + /usr/lib + /usr/include + /usr/share + /usr/share/doc + + + + + + 2015-01-25 + 1.3.2 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-05-16 + 1.2 + version bump. + Kamil Atlı + suvarice@gmail.com + + + 2014-01-30 + 0.6 + Revert back to 0.6 version. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-01-30 + 0.9.1 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2013-10-11 + 0.4 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/x11/library/libevdev/translations.xml b/x11/library/libevdev/translations.xml new file mode 100644 index 0000000000..19e8c7426e --- /dev/null +++ b/x11/library/libevdev/translations.xml @@ -0,0 +1,8 @@ + + + + libevdev + Wrapper library for evdev devices + Wrapper library for evdev devices + +