[arch-commits] Commit in xf86-input-penmount/trunk (3 files)

Jan de Groot jgc at archlinux.org
Sat Mar 13 15:07:12 EST 2010


    Date: Saturday, March 13, 2010 @ 15:07:12
  Author: jgc
Revision: 72215

upgpkg: xf86-input-penmount 1.4.1-1
Update to 1.4.1, remove upstream-applied patch and license

Modified:
  xf86-input-penmount/trunk/PKGBUILD
Deleted:
  xf86-input-penmount/trunk/LICENSE
  xf86-input-penmount/trunk/penmount-1.4.0-abi.patch

--------------------------+
 LICENSE                  |   30 ------------------
 PKGBUILD                 |   15 +++------
 penmount-1.4.0-abi.patch |   72 ---------------------------------------------
 3 files changed, 6 insertions(+), 111 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2010-03-13 20:06:09 UTC (rev 72214)
+++ LICENSE	2010-03-13 20:07:12 UTC (rev 72215)
@@ -1,30 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright (c) 1999  Machine Vision Holdings Incorporated
-Author: David Woodhouse <David.Woodhouse at mvhi.com>
-CoAuthor: Mayk Langer <langer at vsys.de>
-
-Template driver used: Copyright (c) 1998  Metro Link Incorporated
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, cpy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the Metro Link shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from Metro Link.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-13 20:06:09 UTC (rev 72214)
+++ PKGBUILD	2010-03-13 20:07:12 UTC (rev 72215)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-input-penmount
-pkgver=1.4.0
-pkgrel=3
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="X.org penmount input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,17 +13,14 @@
 conflicts=('xorg-server<1.7.0')
 groups=('xorg-input-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE
-	penmount-1.4.0-abi.patch)
-md5sums=('d5f1395b2dcefc7533ff5580e63f2066'
-         '78b0876e65de6efe447233b24aa6bfcd'
-         'fff56e809e2762fcbbdef6c73b893f23')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('a6923fe92ffbc698813063a5426b4ba2edfe465f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/penmount-1.4.0-abi.patch || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }

Deleted: penmount-1.4.0-abi.patch
===================================================================
--- penmount-1.4.0-abi.patch	2010-03-13 20:06:09 UTC (rev 72214)
+++ penmount-1.4.0-abi.patch	2010-03-13 20:07:12 UTC (rev 72215)
@@ -1,72 +0,0 @@
-From dab0c2742c034750e3e9673167eb20812b679818 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Fri, 17 Jul 2009 13:59:43 +1000
-Subject: [PATCH] Cope with XINPUT ABI 7.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- src/xf86PM.c |   24 +++++++++++++++++++++---
- 1 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/src/xf86PM.c b/src/xf86PM.c
-index 0c01760..1e38124 100644
---- a/src/xf86PM.c
-+++ b/src/xf86PM.c
-@@ -181,6 +181,9 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
- 	unsigned char map[] =
- 	{0, 1};
- 	int min_x, min_y, max_x, max_y;
-+	Atom axis_labels[2] = { 0, 0 };
-+	Atom btn_label = 0;
-+
- 	/*
- 	 * these have to be here instead of in the SetupProc, because when the
- 	 * SetupProc is run at server startup, screenInfo is not setup yet
-@@ -191,7 +194,11 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
- 	/*
- 	 * Device reports button press for 1 button.
- 	 */
--	if (InitButtonClassDeviceStruct (dev, 1, map) == FALSE)
-+	if (InitButtonClassDeviceStruct (dev, 1,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+                    &btn_label,
-+#endif
-+                    map) == FALSE)
- 		{
- 			ErrorF ("Unable to allocate PenMount ButtonClassDeviceStruct\n");
- 			return !Success;
-@@ -202,6 +209,9 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
- 	 * Axes min and max values are reported in raw coordinates.
- 	 */
- 	if (InitValuatorClassDeviceStruct (dev, 2,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+					   axis_labels,
-+#endif
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- 					   xf86GetMotionEvents,
- #endif
-@@ -234,11 +244,19 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
- 					min_y = 0;
- 				}
- 
--			InitValuatorAxisStruct (dev, 0, min_x, max_x,
-+			InitValuatorAxisStruct (dev, 0,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+						axis_labels[0],
-+#endif
-+						min_x, max_x,
- 						9500,
- 						0 /* min_res */ ,
- 						9500 /* max_res */ );
--			InitValuatorAxisStruct (dev, 1, min_y, max_y,
-+			InitValuatorAxisStruct (dev, 1,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+						axis_labels[1],
-+#endif
-+						min_y, max_y,
- 						10500,
- 						0 /* min_res */ ,
- 						10500 /* max_res */ );
--- 
-1.6.3.rc1.2.g0164.dirty
-



More information about the arch-commits mailing list