xorg-input-* is fixed deps.

This commit is contained in:
Ertuğrul Erata
2015-07-16 01:58:07 +03:00
parent cbf6a0eb6c
commit e765df959f
16 changed files with 317 additions and 20 deletions
-2
View File
@@ -27,8 +27,6 @@
<Package>
<Name>xorg-input-acecad</Name>
<RuntimeDependencies>
<Dependency>xorg-server</Dependency>
<Dependency>libmtdev</Dependency>
<Dependency>sysfsutils</Dependency>
</RuntimeDependencies>
<Files>
+2 -2
View File
@@ -22,10 +22,10 @@
<Package>
<Name>xorg-input-aiptek</Name>
<RuntimeDependencies>
<!--RuntimeDependencies>
<Dependency>xorg-server</Dependency>
<Dependency>libmtdev</Dependency>
</RuntimeDependencies>
</RuntimeDependencies-->
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="doc">/usr/share/doc</Path>
+2 -2
View File
@@ -22,10 +22,10 @@
<Package>
<Name>xorg-input-elographics</Name>
<RuntimeDependencies>
<!--RuntimeDependencies>
<Dependency>xorg-server</Dependency>
<Dependency>libmtdev</Dependency>
</RuntimeDependencies>
</RuntimeDependencies-->
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="doc">/usr/share/doc</Path>
+3 -1
View File
@@ -17,15 +17,17 @@
<Dependency>xorg-server-devel</Dependency>
<Dependency>libmtdev-devel</Dependency>
<Dependency>libevdev</Dependency>
<Dependency>util-macros</Dependency>
<Dependency>eudev-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>xorg-input-evdev</Name>
<RuntimeDependencies>
<Dependency>xorg-server</Dependency>
<Dependency>libmtdev</Dependency>
<Dependency>libevdev</Dependency>
<Dependency>eudev</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
+3 -2
View File
@@ -16,14 +16,15 @@
<Archive sha1sum="61658b8d829fdaed6064c7c26232c3884d359187" type="tarbz2">mirrors://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency>xorg-server-devel</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>xorg-input-joystick</Name>
<RuntimeDependencies>
<!--RuntimeDependencies>
<Dependency>xorg-server</Dependency>
</RuntimeDependencies>
</RuntimeDependencies-->
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="man">/usr/share/man</Path>
+3 -2
View File
@@ -15,14 +15,15 @@
<Archive sha1sum="7728d733ef16d664a201868ecae5db3705cf8ef1" type="tarbz2">mirrors://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>xorg-server-devel</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>xorg-input-kbd</Name>
<RuntimeDependencies>
<!--RuntimeDependencies>
<Dependency>xorg-server</Dependency>
</RuntimeDependencies>
</RuntimeDependencies-->
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="doc">/usr/share/doc</Path>
+3 -2
View File
@@ -15,6 +15,7 @@
<Archive sha1sum="edde3e0201ec18fbbbcf3c157f912dbae3b5a3cd" type="tarbz2">mirrors://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2</Archive>
<BuildDependencies>
<Dependency>xorg-server-devel</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">0001-Don-t-disable-3-button-emulation-if-third-mouse-butt.patch</Patch>
@@ -23,9 +24,9 @@
<Package>
<Name>xorg-input-mouse</Name>
<RuntimeDependencies>
<!--RuntimeDependencies>
<Dependency>xorg-server</Dependency>
</RuntimeDependencies>
</RuntimeDependencies-->
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="doc">/usr/share/doc</Path>
+4 -3
View File
@@ -18,6 +18,8 @@
<Dependency>libXtst-devel</Dependency>
<Dependency>libmtdev-devel</Dependency>
<Dependency>xorg-server-devel</Dependency>
<Dependency>libevdev</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">add_tapbuttons.diff</Patch>
@@ -29,9 +31,8 @@
<RuntimeDependencies>
<Dependency>libXi</Dependency>
<Dependency>libXtst</Dependency>
<Dependency>libmtdev</Dependency>
<Dependency>xorg-server</Dependency>
<Dependency>libevdev</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libevdev</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/udev</Path>
+2 -2
View File
@@ -23,9 +23,9 @@
<Package>
<Name>xorg-input-vmmouse</Name>
<RuntimeDependencies>
<!--RuntimeDependencies>
<Dependency>xorg-server</Dependency>
</RuntimeDependencies>
</RuntimeDependencies-->
<Files>
<Path fileType="data">/lib/udev</Path>
<Path fileType="executable">/usr/bin</Path>
+2 -2
View File
@@ -21,9 +21,9 @@
<Package>
<Name>xorg-input-void</Name>
<RuntimeDependencies>
<!--RuntimeDependencies>
<Dependency>xorg-server</Dependency>
</RuntimeDependencies>
</RuntimeDependencies-->
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="man">/usr/share/man</Path>
+3
View File
@@ -18,16 +18,19 @@
<Dependency>libXrandr-devel</Dependency>
<Dependency>xorg-server-devel</Dependency>
<Dependency>libXinerama-devel</Dependency>
<Dependency>eudev-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>xorg-input-wacom</Name>
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>libXi</Dependency>
<Dependency>libXrandr</Dependency>
<Dependency>libXinerama</Dependency>
<Dependency>xorg-server</Dependency>
<Dependency>eudev</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/udev</Path>
+21
View File
@@ -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")
@@ -0,0 +1,162 @@
From 51bf0ead89df5c1ddaa22d2f7fc0e04cedbdc590 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@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
@@ -0,0 +1,29 @@
From 9ee61912a356bb8c1995cf262428196e5e4f179d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@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
+70
View File
@@ -0,0 +1,70 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libevdev</Name>
<Homepage>http://www.freedesktop.org/wiki/Software/libevdev/</Homepage>
<Packager>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Packager>
<License>GPLv1</License>
<IsA>library</IsA>
<Summary>Wrapper library for evdev devices</Summary>
<Description>Wrapper library for evdev devices</Description>
<Archive sha1sum="00116f342ee00a4e259cec920860a9202deadcfa" type="tarxz">http://www.freedesktop.org/software/libevdev/libevdev-1.3.2.tar.xz</Archive>
<Patches>
<Patch level="1">0001-Revert-Drop-deprecated-functions.patch</Patch>
<Patch level="1">0001-Revert-Drop-some-leftover-deprecated-constants.patch</Patch>
</Patches>
</Source>
<Package>
<Name>libevdev</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2015-01-25</Date>
<Version>1.3.2</Version>
<Comment>Version bump.</Comment>
<Name>Hakan Yıldız</Name>
<Email>hknyldz93@gmail.com</Email>
</Update>
<Update release="4">
<Date>2014-05-16</Date>
<Version>1.2</Version>
<Comment>version bump.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Update>
<Update release="3">
<Date>2014-01-30</Date>
<Version>0.6</Version>
<Comment>Revert back to 0.6 version.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-01-30</Date>
<Version>0.9.1</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2013-10-11</Date>
<Version>0.4</Version>
<Comment>First release</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
</History>
</PISI>
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libevdev</Name>
<Summary xml:lang="tr">Wrapper library for evdev devices</Summary>
<Description xml:lang="tr">Wrapper library for evdev devices</Description>
</Source>
</PISI>