rpms/xorg-x11-drv-fpit/devel 10-fpit.fdi, NONE, 1.1 xf86-input-fpit-1.2.0-fix_build.patch, NONE, 1.1 xorg-x11-drv-fpit.spec, 1.16, 1.17

[Matthew Garrett]

Author: mjg59

Update of /cvs/pkgs/rpms/xorg-x11-drv-fpit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3580

Modified Files:
	xorg-x11-drv-fpit.spec 
Added Files:
	10-fpit.fdi xf86-input-fpit-1.2.0-fix_build.patch 
Log Message:
* Mon Feb 16 2009 Matthew Garrett <mjg at redhat.com> 1.2.0-2
- Add an fdi file for autoconfig
- Fix build on newer XInput



--- NEW FILE 10-fpit.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<deviceinfo version="0.2">
  <device>
    <match key="info.capabilities" contains="serial">
      <!-- The fpit driver can support a range of hardware, but there are
	   several different protocols. We key off the wide range to do basic
	   driver setup and then more specifically for device-specific
	   setup -->
      <match key="@info.parent:pnp.id" contains_outof="FUJ02B2;FUJ02B3;FUJ02B4;FUJ02B6;FUJ02B7;FUJ02B8;FUJ02B9;FUJ02BC">
	<append key="info.capabilities" type="strlist">input</append>
	<merge key="input.device" type="copy_property">serial.device</merge>
	<merge key="input.x11_driver" type="string">fpit</merge>
	<merge key="input.x11_options.TrackRandR" type="string">True</merge>
        <match key="@info.parent:pnp.id" contains_outof="FUJ02B2;FUJ02B3">
	  <!-- Active pen devices -->
	  <merge key="input.x11_options.BaudRate" type="string">19200</merge>
	  <merge key="input.x11_options.MaximumXPosition" type="string">6250</merge>
	  <merge key="input.x11_options.MaximumYPosition" type="string">4950</merge>
	  <merge key="input.x11_options.MinimumXPosition" type="string">130</merge>
	  <merge key="input.x11_options.MinimumYPosition" type="string">0</merge>
	  <merge key="input.x11_options.InvertY" type="string">True</merge>
	</match>
      <match key="@info.parent:pnp.id" contains_outof="FUJ02B6;FUJ02B7;FUJ02B8;FUJ02B9;FUJ02BC">
	  <!-- Passive pen devices -->
	  <merge key="input.x11_options.BaudRate" type="string">9600</merge>
	  <merge key="input.x11_options.MaximumXPosition" type="string">4070</merge>
	  <merge key="input.x11_options.MaximumYPosition" type="string">4020</merge>
	  <merge key="input.x11_options.MinimumXPosition" type="string">0</merge>
	  <merge key="input.x11_options.MinimumYPosition" type="string">0</merge>
	  <merge key="input.x11_options.Passive" type="string">True</merge>
	</match>
      </match>
    </match>
  </device>
</deviceinfo>

xf86-input-fpit-1.2.0-fix_build.patch:

--- NEW FILE xf86-input-fpit-1.2.0-fix_build.patch ---
diff -ur xf86-input-fpit-1.2.0/src/xf86Fpit.c /tmp/xf86-input-fpit/src/xf86Fpit.c
--- xf86-input-fpit-1.2.0/src/xf86Fpit.c	2008-03-20 18:55:01.000000000 +0000
+++ /tmp/xf86-input-fpit/src/xf86Fpit.c	2009-02-16 17:30:16.000000000 +0000
@@ -55,7 +55,7 @@
 #include "config.h"
 #endif
 
-#include <xf86Version.h>
+#include <xorgVersion.h>
 
 #include <unistd.h>
 #include <errno.h>
@@ -231,6 +231,7 @@
 {
 	FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
 	int len, loop;
+	int is_core_pointer = 0;
 	int x, y, buttons, prox;
 	DeviceIntPtr device;
 	int conv_x, conv_y;
@@ -318,18 +319,17 @@
 		prox = (priv->fpitData[loop] & PROXIMITY_BIT) ? 0 : 1;
 		buttons = (priv->fpitData[loop] & BUTTON_BITS);
 		device = local->dev;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+		is_core_pointer = xf86IsCorePointer(device);
+#endif
 
 		xf86FpitConvert(local, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y);
 		xf86XInputSetScreen(local, priv->screen_no, conv_x, conv_y);
 
 		/* coordinates are ready we can send events */
 
-		if (prox!=priv->fpitOldProximity) { /* proximity changed */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-			if (xf86IsCorePointer(device) == 0)
-#endif
-			xf86PostProximityEvent(device, prox, 0, 2, x, y);
-		}
+		if (prox!=priv->fpitOldProximity) /* proximity changed */
+			if (!is_core_pointer) xf86PostProximityEvent(device, prox, 0, 2, x, y);
 
 		if (priv->fpitOldX != x || priv->fpitOldY != y) /* position changed */
 			xf86PostMotionEvent(device, 1, 0, 2, x, y);
@@ -434,7 +434,11 @@
 				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;
 			}


Index: xorg-x11-drv-fpit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-fpit/devel/xorg-x11-drv-fpit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-fpit.spec	20 Mar 2008 19:45:16 -0000	1.16
+++ xorg-x11-drv-fpit.spec	16 Feb 2009 17:35:15 -0000	1.17
@@ -5,13 +5,15 @@
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   10-fpit.fdi
+Patch1:	   xf86-input-fpit-1.2.0-fix_build.patch
 
 ExcludeArch: s390 s390x
 
@@ -24,6 +26,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1 -b .build
 
 %build
 %configure --disable-static
@@ -38,6 +41,9 @@
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -45,8 +51,13 @@
 %defattr(-,root,root,-)
 %{driverdir}/fpit_drv.so
 %{_mandir}/man4/fpit.4*
+%{_datadir}/hal/fdi/policy/20thirdparty/10-fpit.fdi
 
 %changelog
+* Mon Feb 16 2009 Matthew Garrett <mjg at redhat.com> 1.2.0-2
+- Add an fdi file for autoconfig
+- Fix build on newer XInput
+
 * Thu Mar 20 2008 Adam Jackson <ajax at redhat.com> 1.2.0-1
 - fpit 1.2.0