[arch-commits] Commit in xf86-input-magellan/trunk (PKGBUILD git-fb553dd3.patch)

[Jan de Groot]

    Date: Sunday, March 1, 2009 @ 16:19:36
  Author: jgc
Revision: 28695

upgpkg: xf86-input-magellan 1.2.0-2

Added:
  xf86-input-magellan/trunk/git-fb553dd3.patch
Modified:
  xf86-input-magellan/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   15 +++++++-----
 git-fb553dd3.patch |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-01 21:16:16 UTC (rev 28694)
+++ PKGBUILD	2009-03-01 21:19:36 UTC (rev 28695)
@@ -3,20 +3,23 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-input-magellan
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Magellan Space mouse input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.4.99.906')
+makedepends=('pkgconfig' 'xorg-server>=1.6.0')
+conflicts=('xorg-server<1.6.0')
 groups=('xorg-input-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9801ba10f15f8be2420dfb3f3b5d5d27')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	git-fb553dd3.patch)
+md5sums=('9801ba10f15f8be2420dfb3f3b5d5d27' 'ef5f82e2b22375ba5b73396cb9ea6684')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fb553dd3.patch" || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }

Added: git-fb553dd3.patch
===================================================================
--- git-fb553dd3.patch	                        (rev 0)
+++ git-fb553dd3.patch	2009-03-01 21:19:36 UTC (rev 28695)
@@ -0,0 +1,59 @@
+diff -ruN -x .gitignore -x .cvsignore xf86-input-magellan-90955ce39a01d9dd649b62952ed3fa2f1e63af66/README xf86-input-magellan-fb553dd39e4066198ef93c9227edf496d874f2c6/README
+--- xf86-input-magellan-90955ce39a01d9dd649b62952ed3fa2f1e63af66/README	1970-01-01 00:00:00.000000000 +0000
++++ xf86-input-magellan-fb553dd39e4066198ef93c9227edf496d874f2c6/README	2009-01-31 04:24:21.000000000 +0000
+@@ -0,0 +1,19 @@
++
++Please submit bugs & patches to the Xorg bugzilla:
++
++        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
++
++All questions regarding this software should be directed at the
++Xorg mailing list:
++
++        http://lists.freedesktop.org/mailman/listinfo/xorg
++
++The master development code repository can be found at:
++
++        git://anongit.freedesktop.org/git/xorg/driver/xf86-input-magellan
++
++        http://cgit.freedesktop.org/xorg/driver/xf86-input-magellan
++
++For more information on the git code manager, see:
++
++        http://wiki.x.org/wiki/GitPage
+diff -ruN -x .gitignore -x .cvsignore xf86-input-magellan-90955ce39a01d9dd649b62952ed3fa2f1e63af66/src/magellan.c xf86-input-magellan-fb553dd39e4066198ef93c9227edf496d874f2c6/src/magellan.c
+--- xf86-input-magellan-90955ce39a01d9dd649b62952ed3fa2f1e63af66/src/magellan.c	2008-03-20 20:11:43.000000000 +0000
++++ xf86-input-magellan-fb553dd39e4066198ef93c9227edf496d874f2c6/src/magellan.c	2009-01-31 04:24:21.000000000 +0000
+@@ -45,7 +45,9 @@
+ 
+ #include <misc.h>
+ #include <xf86.h>
+-#define NEED_XF86_TYPES
++#ifndef NEED_XF86_TYPES
++#define NEED_XF86_TYPES 1
++#endif
+ #include <xf86_OSproc.h>
+ #include <xf86Xinput.h>
+ #include <xisb.h>
+@@ -120,7 +122,9 @@
+         "xf86CollectInputOptions",
+         "xf86ErrorFVerb",
+         "xf86FindOptionValue",
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+         "xf86GetMotionEvents",
++#endif
+         "xf86GetVerbosity",
+         "xf86MotionHistoryAllocate",
+         "xf86NameCmp",
+@@ -364,7 +368,10 @@
+       return !Success;
+     }
+ 
+-  if (InitValuatorClassDeviceStruct (dev, 6, xf86GetMotionEvents,
++  if (InitValuatorClassDeviceStruct (dev, 6,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++				     xf86GetMotionEvents,
++#endif
+ 				     pInfo->history_size, Absolute) == FALSE)
+     {
+       ErrorF ("Unable to allocate MAGELLAN ValuatorClassDeviceStruct\n");