From c7f9d5b41167ce66857c61aabea7bc7c84659e5a Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 21 Mar 2010 11:23:44 +0100 Subject: Ajout de xorg-xf86-input-hyperpen#1.3.0-2 --- xorg/xorg-xf86-input-hyperpen/.footprint | 10 +++ xorg/xorg-xf86-input-hyperpen/.md5sum | 2 + xorg/xorg-xf86-input-hyperpen/Pkgfile | 20 +++++ .../hyperpen-1.3.0-abi.patch | 89 ++++++++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 xorg/xorg-xf86-input-hyperpen/.footprint create mode 100644 xorg/xorg-xf86-input-hyperpen/.md5sum create mode 100644 xorg/xorg-xf86-input-hyperpen/Pkgfile create mode 100644 xorg/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch (limited to 'xorg/xorg-xf86-input-hyperpen') diff --git a/xorg/xorg-xf86-input-hyperpen/.footprint b/xorg/xorg-xf86-input-hyperpen/.footprint new file mode 100644 index 000000000..e07e7074c --- /dev/null +++ b/xorg/xorg-xf86-input-hyperpen/.footprint @@ -0,0 +1,10 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/xorg/ +drwxr-xr-x root/root usr/lib/xorg/modules/ +drwxr-xr-x root/root usr/lib/xorg/modules/input/ +-rwxr-xr-x root/root usr/lib/xorg/modules/input/hyperpen_drv.la +-rwxr-xr-x root/root usr/lib/xorg/modules/input/hyperpen_drv.so +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man4/ diff --git a/xorg/xorg-xf86-input-hyperpen/.md5sum b/xorg/xorg-xf86-input-hyperpen/.md5sum new file mode 100644 index 000000000..a0ee1c138 --- /dev/null +++ b/xorg/xorg-xf86-input-hyperpen/.md5sum @@ -0,0 +1,2 @@ +d04c41d6f00487f36b2ea14ae86df708 hyperpen-1.3.0-abi.patch +c50d0da3206d18d9d94f720e3688eca5 xf86-input-hyperpen-1.3.0.tar.bz2 diff --git a/xorg/xorg-xf86-input-hyperpen/Pkgfile b/xorg/xorg-xf86-input-hyperpen/Pkgfile new file mode 100644 index 000000000..8dd6cacdb --- /dev/null +++ b/xorg/xorg-xf86-input-hyperpen/Pkgfile @@ -0,0 +1,20 @@ +# Description: xorg driver xf86-input-hyperpen +# URL: http://xorg.freedesktop.org +# Maintainer: NuTyX core team +# Packager: lesibel at free dot fr +# Depends on: xorg-server + +name=xorg-xf86-input-hyperpen +version=1.3.0 +release=2 +source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-$version.tar.bz2 \ + hyperpen-1.3.0-abi.patch ) + +build() { + cd xf86-input-hyperpen-$version + patch -Np1 -i ../hyperpen-1.3.0-abi.patch + ./configure --prefix=/usr + + make + make DESTDIR=$PKG install +} diff --git a/xorg/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch b/xorg/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch new file mode 100644 index 000000000..efc5294bb --- /dev/null +++ b/xorg/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch @@ -0,0 +1,89 @@ +From 7f3815f74e77df6122320d845d6e7e9541a28b76 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 17 Jul 2009 14:28:42 +1000 +Subject: [PATCH] Cope with XINPUT ABI 7. + +--- + src/xf86HyperPen.c | 24 ++++++++++++++++++++++-- + 1 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c +index bd630a5..3920a04 100644 +--- a/src/xf86HyperPen.c ++++ b/src/xf86HyperPen.c +@@ -719,6 +719,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp) + { + LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate; + HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp); ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom axis_labels[3] = { 0 }; ++#endif + + if (xf86HypOpen(local) != Success) { + if (local->fd >= 0) { +@@ -730,6 +733,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp) + /* Set the real values */ + InitValuatorAxisStruct(pHyp, + 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[0], ++#endif + 0, /* min val */ + priv->hypXSize, /* max val */ + LPI2CPM(priv->hypRes), /* resolution */ +@@ -737,6 +743,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp) + LPI2CPM(priv->hypRes)); /* max_res */ + InitValuatorAxisStruct(pHyp, + 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[1], ++#endif + 0, /* min val */ + priv->hypYSize, /* max val */ + LPI2CPM(priv->hypRes), /* resolution */ +@@ -744,6 +753,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp) + LPI2CPM(priv->hypRes)); /* max_res */ + InitValuatorAxisStruct(pHyp, + 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[2], ++#endif + 0, /* min val */ + 511, /* max val */ + 512, /* resolution */ +@@ -765,8 +777,10 @@ xf86HypProc(DeviceIntPtr pHyp, int what) + int loop; + LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate; + HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp); +- +- ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom btn_labels[4] = { 0 }; ++ Atom axis_labels[3] = { 0 }; ++#endif + + switch (what) { + case DEVICE_INIT: +@@ -779,6 +793,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what) + + if (InitButtonClassDeviceStruct(pHyp, + nbbuttons, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ btn_labels, ++#endif + map) == FALSE) { + ErrorF("unable to allocate Button class device\n"); + return !Success; +@@ -802,6 +819,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what) + + if (InitValuatorClassDeviceStruct(pHyp, + nbaxes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels, ++#endif + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, + #endif +-- +1.6.3.rc1.2.g0164.dirty + -- cgit v1.2.3-70-g09d2