[arch-commits] Commit in xf86-input-ur98/trunk (PKGBUILD git-4250b814.patch)

[Jan de Groot]

    Date: Sunday, March 1, 2009 @ 15:59:21
  Author: jgc
Revision: 28676

upgpkg: xf86-input-ur98 1.1.0-5

Added:
  xf86-input-ur98/trunk/git-4250b814.patch
Modified:
  xf86-input-ur98/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   13 ++++++----
 git-4250b814.patch |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-01 20:53:29 UTC (rev 28675)
+++ PKGBUILD	2009-03-01 20:59:21 UTC (rev 28676)
@@ -3,20 +3,23 @@
 
 pkgname=xf86-input-ur98
 pkgver=1.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org ur98 input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.1.1')
+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=('3cf8928411458baaa9e726e51772c550')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	git-4250b814.patch)
+md5sums=('3cf8928411458baaa9e726e51772c550' 'caae2004261002d868bf80900449356a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
+  patch -Np1 -i "${srcdir}/git-4250b814.patch" || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 }

Added: git-4250b814.patch
===================================================================
--- git-4250b814.patch	                        (rev 0)
+++ git-4250b814.patch	2009-03-01 20:59:21 UTC (rev 28676)
@@ -0,0 +1,61 @@
+diff -ruN -x .gitignore -x .cvsignore xf86-input-ur98-d7dc1bb24a90d7c8275ec51062b7f6f95b6a7760/README xf86-input-ur98-4250b8149d1d021d4e1315e879abfb0774981abc/README
+--- xf86-input-ur98-d7dc1bb24a90d7c8275ec51062b7f6f95b6a7760/README	1970-01-01 00:00:00.000000000 +0000
++++ xf86-input-ur98-4250b8149d1d021d4e1315e879abfb0774981abc/README	2009-01-31 04:30:00.000000000 +0000
+@@ -0,0 +1,20 @@
++UR-98 - UR98 (TR88L803) head tracker driver for the Xorg X server
++
++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-ur98
++
++        http://cgit.freedesktop.org/xorg/driver/xf86-input-ur98
++
++For more information on the git code manager, see:
++
++        http://wiki.x.org/wiki/GitPage
+diff -ruN -x .gitignore -x .cvsignore xf86-input-ur98-d7dc1bb24a90d7c8275ec51062b7f6f95b6a7760/man/ur98.man xf86-input-ur98-4250b8149d1d021d4e1315e879abfb0774981abc/man/ur98.man
+--- xf86-input-ur98-d7dc1bb24a90d7c8275ec51062b7f6f95b6a7760/man/ur98.man	2006-04-07 18:13:50.000000000 +0000
++++ xf86-input-ur98-4250b8149d1d021d4e1315e879abfb0774981abc/man/ur98.man	2009-01-31 04:30:00.000000000 +0000
+@@ -125,7 +125,7 @@
+ This driver is currently Linux specific.
+ .PP
+ .SH "SEE ALSO"
+-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
++__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include...
+  Alan Cox
+diff -ruN -x .gitignore -x .cvsignore xf86-input-ur98-d7dc1bb24a90d7c8275ec51062b7f6f95b6a7760/src/xf86Ur-98.c xf86-input-ur98-4250b8149d1d021d4e1315e879abfb0774981abc/src/xf86Ur-98.c
+--- xf86-input-ur98-d7dc1bb24a90d7c8275ec51062b7f6f95b6a7760/src/xf86Ur-98.c	2006-04-07 18:13:50.000000000 +0000
++++ xf86-input-ur98-4250b8149d1d021d4e1315e879abfb0774981abc/src/xf86Ur-98.c	2009-01-31 04:30:00.000000000 +0000
+@@ -49,7 +49,9 @@
+ 	"xf86CollectInputOptions",
+ 	"xf86ErrorFVerb",
+ 	"xf86FindOptionValue",
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ 	"xf86GetMotionEvents",
++#endif
+ 	"xf86GetVerbosity",
+ 	"xf86MotionHistoryAllocate",
+ 	"xf86NameCmp",
+@@ -316,7 +318,10 @@
+ 		 * screen to fit one meter.
+ 		 */
+ 	
+-		if (InitValuatorClassDeviceStruct(dev, priv->axes, xf86GetMotionEvents,
++		if (InitValuatorClassDeviceStruct(dev, priv->axes,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++				xf86GetMotionEvents,
++#endif
+ 				local->history_size, Absolute) == FALSE) {
+ 			ErrorF("Unable to allocate ValuatorClassDeviceStruct\n");
+ 			return !Success;