diff options
| author | rnoland <rnoland@FreeBSD.org> | 2010-05-04 01:35:57 +0800 |
|---|---|---|
| committer | rnoland <rnoland@FreeBSD.org> | 2010-05-04 01:35:57 +0800 |
| commit | a990125a5e23b6e8360fffe718b289e230695bd5 (patch) | |
| tree | b2399b01d6d9d25485073a2d3c932259cd56c8b8 | |
| parent | fded794b0526edf371cdde7bb9c5ced602909083 (diff) | |
| download | freebsd-ports-gnome-a990125a5e23b6e8360fffe718b289e230695bd5.tar.gz freebsd-ports-gnome-a990125a5e23b6e8360fffe718b289e230695bd5.tar.zst freebsd-ports-gnome-a990125a5e23b6e8360fffe718b289e230695bd5.zip | |
Pull patch from git to allow building with newer Xorg.
Reported by: david@catwhisker.org
| -rw-r--r-- | x11-drivers/xf86-input-hyperpen/Makefile | 2 | ||||
| -rw-r--r-- | x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c | 75 |
2 files changed, 76 insertions, 1 deletions
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index c322e840ad3a..5c76af262b35 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -7,7 +7,7 @@ PORTNAME= xf86-input-hyperpen PORTVERSION= 1.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c b/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c new file mode 100644 index 000000000000..70713074b041 --- /dev/null +++ b/x11-drivers/xf86-input-hyperpen/files/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 |