xorg-xf86-input-elographics, ajout patchs

4 files changed, 228 insertions, 3 deletions

diff --git a/xorg/xorg-xf86-input-elographics/.md5sum b/xorg/xorg-xf86-input-elographics/.md5sum
index b4cead9e4..850b4b8a1 100644
--- a/xorg/xorg-xf86-input-elographics/.md5sum
+++ b/xorg/xorg-xf86-input-elographics/.md5sum
@@ -1 +1,3 @@
+ca8a9e00eb639214e21eec4db193d4cf  elographics-1.2.3-abi.patch
+6ee7c814f57fc898f52cb765c3e50c31  git-c97c9f47.patch
 cc2923460c8eff9652b01889a063058d  xf86-input-elographics-1.2.3.tar.bz2
diff --git a/xorg/xorg-xf86-input-elographics/Pkgfile b/xorg/xorg-xf86-input-elographics/Pkgfile
index 27001d34f..c52767e30 100644
--- a/xorg/xorg-xf86-input-elographics/Pkgfile
+++ b/xorg/xorg-xf86-input-elographics/Pkgfile
@@ -7,11 +7,12 @@
 name=xorg-xf86-input-elographics
 version=1.2.3
 release=2
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-$version.tar.bz2)
-
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-$version.tar.bz2\
+	git-c97c9f47.patch elographics-1.2.3-abi.patch)
 build() {
 	cd xf86-input-elographics-$version
-
+	patch -Np1 -i ../git-c97c9f47.patch
+	patch -Np1 -i ../elographics-1.2.3-abi.patch
 	./configure --prefix=/usr
 
 	make
diff --git a/xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch b/xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch
new file mode 100644
index 000000000..b90fe99d8
--- /dev/null
+++ b/xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch
@@ -0,0 +1,73 @@
+From a18af14b1df5271fbe3100df3fcb3a8811981ddf Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 17 Jul 2009 14:44:55 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/xf86Elo.c |   25 ++++++++++++++++++++++---
+ 1 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/src/xf86Elo.c b/src/xf86Elo.c
+index 4ca60f1..495a43c 100644
+--- a/src/xf86Elo.c
++++ b/src/xf86Elo.c
+@@ -780,6 +780,10 @@ xf86EloControl(DeviceIntPtr	dev,
+   unsigned char		map[] = { 0, 1 };
+   unsigned char		req[ELO_PACKET_SIZE];
+   unsigned char		reply[ELO_PACKET_SIZE];
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++  Atom btn_label;
++  Atom axis_labels[2] = { 0, 0 };
++#endif
+ 
+   switch(mode) {
+ 
+@@ -797,7 +801,11 @@ xf86EloControl(DeviceIntPtr	dev,
+       /*
+        * Device reports button press for up to 1 button.
+        */
+-      if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) {
++      if (InitButtonClassDeviceStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				      &btn_label,
++#endif
++				      map) == FALSE) {
+ 	ErrorF("Unable to allocate Elographics touchscreen ButtonClassDeviceStruct\n");
+ 	return !Success;
+       }
+@@ -818,6 +826,9 @@ xf86EloControl(DeviceIntPtr	dev,
+        * screen to fit one meter.
+        */
+       if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++					axis_labels,
++#endif
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+                   xf86GetMotionEvents,
+ #endif
+@@ -827,11 +838,19 @@ xf86EloControl(DeviceIntPtr	dev,
+       }
+       else {
+ 	/* I will map coordinates myself */
+-	InitValuatorAxisStruct(dev, 0, -1, -1,
++	InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++			       axis_labels[0],
++#endif
++			       -1, -1,
+ 			       9500,
+ 			       0     /* min_res */,
+ 			       9500  /* max_res */);
+-	InitValuatorAxisStruct(dev, 1, -1, -1,
++	InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++			       axis_labels[1],
++#endif
++			       -1, -1,
+ 			       10500,
+ 			       0     /* min_res */,
+ 			       10500 /* max_res */);
+-- 
+1.6.3.rc1.2.g0164.dirty
+
diff --git a/xorg/xorg-xf86-input-elographics/git-c97c9f47.patch b/xorg/xorg-xf86-input-elographics/git-c97c9f47.patch
new file mode 100644
index 000000000..f026e4d10
--- /dev/null
+++ b/xorg/xorg-xf86-input-elographics/git-c97c9f47.patch
@@ -0,0 +1,149 @@
+diff -ruN -x .gitignore -x .cvsignore xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/Makefile.am xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/Makefile.am
+--- xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/Makefile.am	2008-10-21 05:03:43.000000000 +0000
++++ xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/Makefile.am	2009-02-02 21:06:55.000000000 +0000
+@@ -28,8 +28,7 @@
+ .PHONY: ChangeLog
+ 
+ ChangeLog:
+-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+-	(touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
++	$(CHANGELOG_CMD)
+ 
+ dist-hook: ChangeLog
+ 
+diff -ruN -x .gitignore -x .cvsignore xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/README xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/README
+--- xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/README	1970-01-01 00:00:00.000000000 +0000
++++ xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/README	2009-02-02 21:06:55.000000000 +0000
+@@ -0,0 +1,20 @@
++xf86-input-elographics - Elographics input driver for the Xorg X server
++
++Please submit bugs & patches to the Xorg bugzilla:
++
++        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
++
++All questions regarding this software should be directed at the
++Xorg mailing list:
++
++        http://lists.freedesktop.org/mailman/listinfo/xorg
++
++The master development code repository can be found at:
++
++        git://anongit.freedesktop.org/git/xorg/driver/xf86-input-elographics
++
++        http://cgit.freedesktop.org/xorg/driver/xf86-input-elographics
++
++For more information on the git code manager, see:
++
++        http://wiki.x.org/wiki/GitPage
+diff -ruN -x .gitignore -x .cvsignore xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/configure.ac xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/configure.ac
+--- xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/configure.ac	2008-10-21 05:03:43.000000000 +0000
++++ xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/configure.ac	2009-02-02 21:06:55.000000000 +0000
+@@ -32,15 +32,16 @@
+ 
+ AM_MAINTAINER_MODE
+ 
+-DRIVER_NAME=elographics
+-AC_SUBST([DRIVER_NAME])
+-
++# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
++m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.2)
+ AM_CONFIG_HEADER([config.h])
+ 
+ # Checks for programs.
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
++XORG_CWARNFLAGS
+ 
+ AH_TOP([#include "xorg-server.h"])
+ 
+@@ -77,16 +78,18 @@
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+-
+-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+-AC_SUBST([CFLAGS])
++XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
+ 
+ # Checks for libraries.
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
++DRIVER_NAME=elographics
++AC_SUBST([DRIVER_NAME])
++
+ XORG_MANPAGE_SECTIONS
+ XORG_RELEASE_VERSION
++XORG_CHANGELOG
+ 
+ AC_OUTPUT([Makefile src/Makefile man/Makefile])
+diff -ruN -x .gitignore -x .cvsignore xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/man/elographics.man xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/man/elographics.man
+--- xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/man/elographics.man	2008-10-21 05:03:43.000000000 +0000
++++ xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/man/elographics.man	2009-02-02 21:06:55.000000000 +0000
+@@ -75,7 +75,7 @@
+ .BI "Option \*qModel\*q \*q" string \*q
+ The touchscreen model. Default: unset. Supported models: "Sunit dSeries".
+ .SH "SEE ALSO"
+-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
++__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
+ .SH AUTHORS
+ Authors include:
+  Patrick Lecoanet
+diff -ruN -x .gitignore -x .cvsignore xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/src/Makefile.am xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/src/Makefile.am
+--- xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/src/Makefile.am	2008-10-21 05:03:43.000000000 +0000
++++ xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/src/Makefile.am	2009-02-02 21:06:55.000000000 +0000
+@@ -24,6 +24,8 @@
+ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+ # _ladir passes a dummy rpath to libtool so the thing will actually link
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
++AM_CFLAGS = $(XORG_CFLAGS)
++
+ @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
+ @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+ @DRIVER_NAME@_drv_ladir = @inputdir@
+diff -ruN -x .gitignore -x .cvsignore xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/src/xf86Elo.c xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/src/xf86Elo.c
+--- xf86-input-elographics-37cd09e99c7f5fa4ce7511b8ed171a3ae130300f/src/xf86Elo.c	2008-10-21 05:03:43.000000000 +0000
++++ xf86-input-elographics-c97c9f470636e6caf4374a6930e5fe380f58b8bb/src/xf86Elo.c	2009-02-02 21:06:55.000000000 +0000
+@@ -970,7 +970,7 @@
+  ***************************************************************************
+  */
+ static LocalDevicePtr
+-xf86EloAllocate(InputDriverPtr	drv)
++xf86EloAllocate(InputDriverPtr	drv, IDevPtr dev)
+ {
+   LocalDevicePtr	local;
+   EloPrivatePtr		priv;
+@@ -1002,7 +1002,7 @@
+   priv->packet_buf_p = 0;
+   priv->swap_axes = 0;
+ 
+-  local->name = XI_TOUCHSCREEN;
++  local->name = xstrdup(dev->identifier);
+   local->flags = 0 /* XI86_NO_OPEN_ON_INIT */;
+   local->device_control = xf86EloControl;
+   local->read_input   = xf86EloReadInput;
+@@ -1029,12 +1029,8 @@
+ {
+   EloPrivatePtr		priv = (EloPrivatePtr) local->private;
+ 
+-  xf86EloControl(local->dev, DEVICE_OFF);
+-
+   xfree(priv->input_dev);
+   xfree(priv);
+-  xfree(local->name);
+-  xfree(local);
+ 
+   xf86DeleteInput(local, 0);
+ }
+@@ -1064,7 +1060,7 @@
+   Model*		model;
+ 
+ 
+-  local = xf86EloAllocate(drv);
++  local = xf86EloAllocate(drv, dev);
+   if (!local) {
+     return NULL;
+   }