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

[Jan de Groot]

    Date: Sunday, March 1, 2009 @ 16:05:51
  Author: jgc
Revision: 28679

upgpkg: xf86-input-tek4957 1.2.0-2

Added:
  xf86-input-tek4957/trunk/git-ea5d265d.patch
Modified:
  xf86-input-tek4957/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   15 +++++++-----
 git-ea5d265d.patch |   62 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-01 20:59:29 UTC (rev 28678)
+++ PKGBUILD	2009-03-01 21:05:51 UTC (rev 28679)
@@ -3,20 +3,23 @@
 
 pkgname=xf86-input-tek4957
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org tek4957 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=('8103db1ca5c55726e0b58148e4b1fc06')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	git-ea5d265d.patch)
+md5sums=('8103db1ca5c55726e0b58148e4b1fc06' '4686413ed3681ade00c0c2a8bc1b168a')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-ea5d265d.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-ea5d265d.patch
===================================================================
--- git-ea5d265d.patch	                        (rev 0)
+++ git-ea5d265d.patch	2009-03-01 21:05:51 UTC (rev 28679)
@@ -0,0 +1,62 @@
+diff -x .cvsignore -x .gitignore -ruN xf86-input-tek4957-4a39872189c42c4fe99aecce2e7b710ce18afb61/README xf86-input-tek4957-ea5d265dc0e73796ad600aa96c5e0ea970a57bb2/README
+--- xf86-input-tek4957-4a39872189c42c4fe99aecce2e7b710ce18afb61/README	1970-01-01 00:00:00.000000000 +0000
++++ xf86-input-tek4957-ea5d265dc0e73796ad600aa96c5e0ea970a57bb2/README	2009-01-31 04:29:42.000000000 +0000
+@@ -0,0 +1,20 @@
++xf86-input-tek4957 - Tektronix 4957 input 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-tek4957
++
++        http://cgit.freedesktop.org/xorg/driver/xf86-input-tek4957
++
++For more information on the git code manager, see:
++
++        http://wiki.x.org/wiki/GitPage
+diff -x .cvsignore -x .gitignore -ruN xf86-input-tek4957-4a39872189c42c4fe99aecce2e7b710ce18afb61/man/tek4957.man xf86-input-tek4957-ea5d265dc0e73796ad600aa96c5e0ea970a57bb2/man/tek4957.man
+--- xf86-input-tek4957-4a39872189c42c4fe99aecce2e7b710ce18afb61/man/tek4957.man	2008-03-20 20:48:45.000000000 +0000
++++ xf86-input-tek4957-ea5d265dc0e73796ad600aa96c5e0ea970a57bb2/man/tek4957.man	2009-01-31 04:29:42.000000000 +0000
+@@ -80,6 +80,6 @@
+ .SH "BUGS / LIMITATIONS"
+ Currently, only "Absolute" mode is supported ( Sorry )
+ .SH "SEE ALSO"
+-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
++__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
+ .SH AUTHORS
+ Olivier DANET <odanet at caramail.com>
+diff -x .cvsignore -x .gitignore -ruN xf86-input-tek4957-4a39872189c42c4fe99aecce2e7b710ce18afb61/src/xf86Tek4957.c xf86-input-tek4957-ea5d265dc0e73796ad600aa96c5e0ea970a57bb2/src/xf86Tek4957.c
+--- xf86-input-tek4957-4a39872189c42c4fe99aecce2e7b710ce18afb61/src/xf86Tek4957.c	2008-03-20 20:48:45.000000000 +0000
++++ xf86-input-tek4957-ea5d265dc0e73796ad600aa96c5e0ea970a57bb2/src/xf86Tek4957.c	2009-01-31 04:29:42.000000000 +0000
+@@ -152,7 +152,11 @@
+ 
+     /* Gets current screen size. It can change dynamically in the case of
+     a multi-head configuration with different screen sizes ... */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+     SP=miPointerCurrentScreen();
++#else
++    SP=miPointerGetScreen(local->dev);
++#endif
+     W=SP->width;
+     H=SP->height;
+ 
+@@ -446,7 +450,10 @@
+ 		return !Success;
+ 	    }
+ 
+-	    if (InitValuatorClassDeviceStruct(pDev,2,xf86GetMotionEvents,
++	    if (InitValuatorClassDeviceStruct(pDev,2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++			xf86GetMotionEvents,
++#endif
+ 		   local->history_size,Absolute)== FALSE) {
+ 		xf86Msg(X_ERROR,"Tek4957:Unable to allocate Valuator class device\n");
+ 		return !Success;