Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=7c409f311f07b0fcc936bf23db989f66603ca9b4
commit 7c409f311f07b0fcc936bf23db989f66603ca9b4 Author: Krisztian VASAS <[email protected]> Date: Thu Jan 1 18:39:17 2009 +0100 xf86-input-fpit-1.2.0-1-i686 - version bump - added 2 compile fixes diff --git a/source/x11/xf86-input-fpit/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-fpit/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..a5bf088 --- /dev/null +++ b/source/x11/xf86-input-fpit/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,17 @@ +diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c +index 5b1d060..20be86a 100644 +--- a/src/xf86Fpit.c ++++ b/src/xf86Fpit.c +@@ -434,7 +434,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) + ErrorF("Unable to allocate PtrFeedBackClassDeviceStruct\n"); + } + +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, local->history_size, Absolute) == FALSE) { ++ if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif ++ local->history_size, Absolute) == FALSE) { + ErrorF("Unable to allocate Fpit touchscreen ValuatorClassDeviceStruct\n"); + return !Success; + } diff --git a/source/x11/xf86-input-fpit/02-fix_xf86version_to_xorgversion.patch1 b/source/x11/xf86-input-fpit/02-fix_xf86version_to_xorgversion.patch1 new file mode 100644 index 0000000..83caf09 --- /dev/null +++ b/source/x11/xf86-input-fpit/02-fix_xf86version_to_xorgversion.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c +index 20be86a..528ebb9 100644 +--- a/src/xf86Fpit.c ++++ b/src/xf86Fpit.c +@@ -55,7 +55,7 @@ + #include "config.h" + #endif + +-#include <xf86Version.h> ++#include <xorgVersion.h> + + #include <unistd.h> + #include <errno.h> diff --git a/source/x11/xf86-input-fpit/FrugalBuild b/source/x11/xf86-input-fpit/FrugalBuild index 3ebe97c..49035a4 100644 --- a/source/x11/xf86-input-fpit/FrugalBuild +++ b/source/x11/xf86-input-fpit/FrugalBuild @@ -2,8 +2,13 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=xf86-input-fpit -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 Finclude xorg -sha1sums=('988f689f64dcbf721154267c8f4844d8f3dae6ce') +source=(${sour...@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-fix_xf86version_to_xorgversion.patch1') +sha1sums=('9b52aa91d97dd4d64e494090bee5c29cd57048d5' \ + '8747b6e6156b756be43b3a685754cfcc0987faf5' \ + 'e77f1fac970ccc67a089aa0d8edbe37f2edd0bc1') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
