[arch-commits] Commit in xf86-input-vmmouse/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Mar 9 17:13:58 UTC 2012
Date: Friday, March 9, 2012 @ 12:13:57
Author: andyrtr
Revision: 152811
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xf86-input-vmmouse/repos/testing-i686/PKGBUILD
(from rev 152810, xf86-input-vmmouse/trunk/PKGBUILD)
xf86-input-vmmouse/repos/testing-x86_64/PKGBUILD
(from rev 152810, xf86-input-vmmouse/trunk/PKGBUILD)
Deleted:
xf86-input-vmmouse/repos/testing-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch
xf86-input-vmmouse/repos/testing-i686/PKGBUILD
xf86-input-vmmouse/repos/testing-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch
xf86-input-vmmouse/repos/testing-x86_64/PKGBUILD
------------------------------------------------------------------------+
testing-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch | 89 ----------
testing-i686/PKGBUILD | 67 +++----
testing-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch | 89 ----------
testing-x86_64/PKGBUILD | 67 +++----
4 files changed, 64 insertions(+), 248 deletions(-)
Deleted: testing-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch
===================================================================
--- testing-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch 2012-03-09 17:13:20 UTC (rev 152810)
+++ testing-i686/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch 2012-03-09 17:13:57 UTC (rev 152811)
@@ -1,89 +0,0 @@
-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
-
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2012-03-09 17:13:20 UTC (rev 152810)
+++ testing-i686/PKGBUILD 2012-03-09 17:13:57 UTC (rev 152811)
@@ -1,35 +0,0 @@
-# $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/testing-i686/PKGBUILD (from rev 152810, xf86-input-vmmouse/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-03-09 17:13:57 UTC (rev 152811)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-input-vmmouse
+pkgver=12.8.0
+pkgrel=1
+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)
+sha1sums=('ecca90d5e992f9358f7932e0c46e92ebe715f9de')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./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
+}
Deleted: testing-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch
===================================================================
--- testing-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch 2012-03-09 17:13:20 UTC (rev 152810)
+++ testing-x86_64/0001-Deal-with-opaque-InputOption-types-in-ABI-14.patch 2012-03-09 17:13:57 UTC (rev 152811)
@@ -1,89 +0,0 @@
-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
-
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2012-03-09 17:13:20 UTC (rev 152810)
+++ testing-x86_64/PKGBUILD 2012-03-09 17:13:57 UTC (rev 152811)
@@ -1,35 +0,0 @@
-# $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/testing-x86_64/PKGBUILD (from rev 152810, xf86-input-vmmouse/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-03-09 17:13:57 UTC (rev 152811)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-input-vmmouse
+pkgver=12.8.0
+pkgrel=1
+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)
+sha1sums=('ecca90d5e992f9358f7932e0c46e92ebe715f9de')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./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