[arch-commits] Commit in xf86-input-vmmouse/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Tue Feb 7 18:30:28 UTC 2012
Date: Tuesday, February 7, 2012 @ 13:30:28
Author: andyrtr
Revision: 149445
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-input-vmmouse/repos/staging-i686/
xf86-input-vmmouse/repos/staging-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch
(from rev 149444, xf86-input-vmmouse/trunk/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch)
xf86-input-vmmouse/repos/staging-i686/PKGBUILD
(from rev 149444, xf86-input-vmmouse/trunk/PKGBUILD)
xf86-input-vmmouse/repos/staging-x86_64/
xf86-input-vmmouse/repos/staging-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch
(from rev 149444, xf86-input-vmmouse/trunk/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch)
xf86-input-vmmouse/repos/staging-x86_64/PKGBUILD
(from rev 149444, xf86-input-vmmouse/trunk/PKGBUILD)
------------------------------------------------------------------------+
staging-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch | 89 ++++++++++
staging-i686/PKGBUILD | 35 +++
staging-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch | 89 ++++++++++
staging-x86_64/PKGBUILD | 35 +++
4 files changed, 248 insertions(+)
Copied: xf86-input-vmmouse/repos/staging-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch (from rev 149444, xf86-input-vmmouse/trunk/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch)
===================================================================
--- staging-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch (rev 0)
+++ staging-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch 2012-02-07 18:30:28 UTC (rev 149445)
@@ -0,0 +1,89 @@
+From 7aaf9f7c7aafda7561f6104fd9c1ff772ba61c6f Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 10 Nov 2011 08:07:08 +1000
+Subject: [PATCH] Deal with opaque InputOption types in ABI 14
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/vmmouse.c | 49 ++++++++++++++++++++++++++++++++++---------------
+ 1 files changed, 34 insertions(+), 15 deletions(-)
+
+diff --git a/src/vmmouse.c b/src/vmmouse.c
+index ad014ec..285ba26 100644
+--- a/src/vmmouse.c
++++ b/src/vmmouse.c
+@@ -228,11 +228,40 @@ static char reverseMap[32] = { 0, 4, 2, 6, 1, 5, 3, 7,
+ #define reverseBits(map, b) (((b) & ~0x0f) | map[(b) & 0x0f])
+
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
++
++static InputOption*
++input_option_new(InputOption *list, char *key, char *value)
++{
++ InputOption *new;
++
++ new = calloc(1, sizeof(InputOption));
++ new->key = key;
++ new->value = value;
++ new->next = list;
++ return new;
++}
++
++static void
++input_option_free_list(InputOption **opts)
++{
++ InputOption *tmp = *opts;
++ while(*opts)
++ {
++ tmp = (*opts)->next;
++ free((*opts)->key);
++ free((*opts)->value);
++ free((*opts));
++ *opts = tmp;
++ }
++}
++#endif
++
+ static int
+ VMMouseInitPassthru(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+ {
+ InputAttributes *attrs = NULL;
+- InputOption *input_options = NULL, *tmp, *opts;
++ InputOption *input_options = NULL;
+ pointer options;
+ DeviceIntPtr dev;
+ int rc;
+@@ -241,25 +270,15 @@ VMMouseInitPassthru(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+ options = xf86ReplaceStrOption(options, "Driver", "mouse");
+
+ while(options) {
+- tmp = calloc(1, sizeof(InputOption));
+- tmp->key = xf86OptionName(options);
+- tmp->value = xf86OptionValue(options);
+- tmp->next = input_options;
+- input_options = tmp;
++ input_options = input_option_new(input_options,
++ xf86OptionName(options),
++ xf86OptionValue(options));
+ options = xf86NextOption(options);
+ }
+
+ rc = NewInputDeviceRequest(input_options, attrs, &dev);
+
+- opts = input_options;
+- tmp = opts;
+- while(opts) {
+- tmp = opts->next;
+- free(opts->key);
+- free(opts->value);
+- free(opts);
+- opts = tmp;
+- }
++ input_option_free_list(&input_options);
+
+ return rc;
+ }
+--
+1.7.7
+
Copied: xf86-input-vmmouse/repos/staging-i686/PKGBUILD (from rev 149444, xf86-input-vmmouse/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-02-07 18:30:28 UTC (rev 149445)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-input-vmmouse
+pkgver=12.7.0
+pkgrel=4
+pkgdesc="X.org VMWare Mouse input driver"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('glibc' 'sh')
+makedepends=('xorg-server-devel>=1.11.99.902')
+conflicts=('xorg-server<1.11.99.902')
+groups=('xorg-drivers' 'xorg')
+backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ 0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch)
+sha1sums=('6618f84a037c8f4817e1a2822d6a5a795814e544'
+ '71283328a23e4b33e73164b40252fcd593b54e07')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch
+ ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+ rm -rf ${pkgdir}/usr/{lib,share}/hal
+}
Copied: xf86-input-vmmouse/repos/staging-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch (from rev 149444, xf86-input-vmmouse/trunk/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch)
===================================================================
--- staging-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch (rev 0)
+++ staging-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch 2012-02-07 18:30:28 UTC (rev 149445)
@@ -0,0 +1,89 @@
+From 7aaf9f7c7aafda7561f6104fd9c1ff772ba61c6f Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 10 Nov 2011 08:07:08 +1000
+Subject: [PATCH] Deal with opaque InputOption types in ABI 14
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/vmmouse.c | 49 ++++++++++++++++++++++++++++++++++---------------
+ 1 files changed, 34 insertions(+), 15 deletions(-)
+
+diff --git a/src/vmmouse.c b/src/vmmouse.c
+index ad014ec..285ba26 100644
+--- a/src/vmmouse.c
++++ b/src/vmmouse.c
+@@ -228,11 +228,40 @@ static char reverseMap[32] = { 0, 4, 2, 6, 1, 5, 3, 7,
+ #define reverseBits(map, b) (((b) & ~0x0f) | map[(b) & 0x0f])
+
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
++
++static InputOption*
++input_option_new(InputOption *list, char *key, char *value)
++{
++ InputOption *new;
++
++ new = calloc(1, sizeof(InputOption));
++ new->key = key;
++ new->value = value;
++ new->next = list;
++ return new;
++}
++
++static void
++input_option_free_list(InputOption **opts)
++{
++ InputOption *tmp = *opts;
++ while(*opts)
++ {
++ tmp = (*opts)->next;
++ free((*opts)->key);
++ free((*opts)->value);
++ free((*opts));
++ *opts = tmp;
++ }
++}
++#endif
++
+ static int
+ VMMouseInitPassthru(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+ {
+ InputAttributes *attrs = NULL;
+- InputOption *input_options = NULL, *tmp, *opts;
++ InputOption *input_options = NULL;
+ pointer options;
+ DeviceIntPtr dev;
+ int rc;
+@@ -241,25 +270,15 @@ VMMouseInitPassthru(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+ options = xf86ReplaceStrOption(options, "Driver", "mouse");
+
+ while(options) {
+- tmp = calloc(1, sizeof(InputOption));
+- tmp->key = xf86OptionName(options);
+- tmp->value = xf86OptionValue(options);
+- tmp->next = input_options;
+- input_options = tmp;
++ input_options = input_option_new(input_options,
++ xf86OptionName(options),
++ xf86OptionValue(options));
+ options = xf86NextOption(options);
+ }
+
+ rc = NewInputDeviceRequest(input_options, attrs, &dev);
+
+- opts = input_options;
+- tmp = opts;
+- while(opts) {
+- tmp = opts->next;
+- free(opts->key);
+- free(opts->value);
+- free(opts);
+- opts = tmp;
+- }
++ input_option_free_list(&input_options);
+
+ return rc;
+ }
+--
+1.7.7
+
Copied: xf86-input-vmmouse/repos/staging-x86_64/PKGBUILD (from rev 149444, xf86-input-vmmouse/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-02-07 18:30:28 UTC (rev 149445)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-input-vmmouse
+pkgver=12.7.0
+pkgrel=4
+pkgdesc="X.org VMWare Mouse input driver"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('glibc' 'sh')
+makedepends=('xorg-server-devel>=1.11.99.902')
+conflicts=('xorg-server<1.11.99.902')
+groups=('xorg-drivers' 'xorg')
+backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ 0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch)
+sha1sums=('6618f84a037c8f4817e1a2822d6a5a795814e544'
+ '71283328a23e4b33e73164b40252fcd593b54e07')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch
+ ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+ rm -rf ${pkgdir}/usr/{lib,share}/hal
+}
More information about the arch-commits
mailing list