diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-05-14 18:14:37 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-05-14 18:14:37 +0800 |
| commit | 13f0c4b1a14dc9bb7c4f5bd2e6c13e8e6968af1b (patch) | |
| tree | aa330e56bad76aeebe944c473099d01fea4753e0 | |
| parent | a6bc303bccbbff4a01f4a007dd7e04a4bfd963f9 (diff) | |
| download | xorg-devel-ports-13f0c4b1a14dc9bb7c4f5bd2e6c13e8e6968af1b.tar.gz xorg-devel-ports-13f0c4b1a14dc9bb7c4f5bd2e6c13e8e6968af1b.tar.zst xorg-devel-ports-13f0c4b1a14dc9bb7c4f5bd2e6c13e8e6968af1b.zip | |
Merge r881:
Readd patch that has gone missing somewhere.
Bump PORTREVISION to sync with ports.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@882 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11-drivers/xf86-input-hyperpen/Makefile | 3 | ||||
| -rw-r--r-- | x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c | 75 |
2 files changed, 77 insertions, 1 deletions
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index 440a2ea..4c6ffaf 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -15,7 +15,8 @@ HYPERVER= 1.4.1 HYPERREVISION= 0 .else HYPERVER= 1.3.0 -HYPERREVISION= 5 +HYPERREVISION= 6 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c .endif .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c b/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c new file mode 100644 index 0000000..7071307 --- /dev/null +++ b/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c @@ -0,0 +1,75 @@ +--- src/xf86HyperPen.c.orig 2009-02-26 16:31:24.000000000 -0600 ++++ src/xf86HyperPen.c 2010-05-03 12:29:11.000000000 -0500 +@@ -719,6 +719,9 @@ + { + 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 @@ + /* 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 @@ + 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 @@ + 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 @@ + 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 @@ + + 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 @@ + + 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 |