[oe-commits] Ulf Samuelsson : Add xserver-kdrive-1.6.1 (not fully tested)
git version control
git at git.openembedded.org
Wed Aug 19 10:21:13 UTC 2009
Module: openembedded.git
Branch: ulf/linux-2.6.30.2
Commit: 939cdd34fb27c839906565b6777d5710d98c5fb2
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=939cdd34fb27c839906565b6777d5710d98c5fb2
Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date: Wed Aug 19 07:59:56 2009 +0200
Add xserver-kdrive-1.6.1 (not fully tested)
---
.../xorg-xserver/xserver-kdrive-1.6.1/drmfix.patch | 15 +++
.../xorg-server-1.6.1-tslib.patch | 112 ++++++++++++++++++++
.../xorg-server-1.6.1-xcalibrate.patch | 112 ++++++++++++++++++++
recipes/xorg-xserver/xserver-kdrive_1.6.1.bb | 33 ++++++
4 files changed, 272 insertions(+), 0 deletions(-)
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.6.1/drmfix.patch b/recipes/xorg-xserver/xserver-kdrive-1.6.1/drmfix.patch
new file mode 100644
index 0000000..8ebda98
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.6.1/drmfix.patch
@@ -0,0 +1,15 @@
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
+
+Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000
+@@ -40,7 +40,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.6.1/xorg-server-1.6.1-tslib.patch b/recipes/xorg-xserver/xserver-kdrive-1.6.1/xorg-server-1.6.1-tslib.patch
new file mode 100644
index 0000000..03876cd
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.6.1/xorg-server-1.6.1-tslib.patch
@@ -0,0 +1,112 @@
+diff -urN xorg-server-1.6.1-0rig/configure.ac xorg-server-1.6.1/configure.ac
+--- xorg-server-1.6.1-0rig/configure.ac 2009-08-17 19:32:43.000000000 +0200
++++ xorg-server-1.6.1/configure.ac 2009-08-17 19:39:55.000000000 +0200
+@@ -959,7 +959,7 @@
+ AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])
+ fi
+
+-if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
++if test "x$XCALIBRATE" = xyes; then
+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
+ else
+diff -urN xorg-server-1.6.1-0rig/hw/kdrive/linux/tslib.c xorg-server-1.6.1/hw/kdrive/linux/tslib.c
+--- xorg-server-1.6.1-0rig/hw/kdrive/linux/tslib.c 2009-08-17 19:32:39.000000000 +0200
++++ xorg-server-1.6.1/hw/kdrive/linux/tslib.c 2009-08-17 22:36:01.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include <X11/X.h>
+ #include <X11/Xproto.h>
+ #include <X11/Xpoll.h>
++#include <stdio.h>
+ #include "inputstr.h"
+ #include "scrnintstr.h"
+ #include "kdrive.h"
+@@ -56,6 +57,25 @@
+ int phys_screen;
+ };
+
++static KdPointerInfo *tsPointer = NULL; /* Export pointer for XCALIBRATE */
++
++void
++tslib_set_raw_event_hook( void *hook, void *closure)
++{
++ struct TslibPrivate *private;
++ if(tsPointer == NULL) {
++ fprintf(stderr,"tslib_set_raw_event_hook: Invalid KdPointerInfo\n");
++ return;
++ }
++ private = tsPointer->driverPrivate;
++ if(private == NULL) {
++ fprintf(stderr,"tslib_set_raw_event_hook: Invalid driverPrivate\n");
++ return;
++ }
++ private->raw_event_hook = hook;
++ private->raw_event_closure = closure;
++}
++
+
+ static void
+ TsRead (int fd, void *closure)
+@@ -183,6 +203,7 @@
+ if (pi->driverPrivate) {
+ xfree(pi->driverPrivate);
+ pi->driverPrivate = NULL;
++ tsPointer = NULL;
+ }
+ }
+
+diff -urN xorg-server-1.6.1-0rig/Xext/xcalibrate.c xorg-server-1.6.1/Xext/xcalibrate.c
+--- xorg-server-1.6.1-0rig/Xext/xcalibrate.c 2009-08-17 19:32:53.000000000 +0200
++++ xorg-server-1.6.1/Xext/xcalibrate.c 2009-08-17 22:22:48.000000000 +0200
+@@ -34,12 +34,13 @@
+ #include "dixstruct.h"
+ #include "extnsionst.h"
+ #include "swaprep.h"
++#include "kdrive.h"
+
+ #include <X11/extensions/xcalibrateproto.h>
+ #include <X11/extensions/xcalibratewire.h>
+
+-extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
+-extern void *tslib_raw_event_closure;
++extern void
++tslib_set_raw_event_hook(void *hook, void *closure);
+
+ static CARD8 XCalibrateReqCode;
+ int XCalibrateEventBase;
+@@ -124,8 +125,7 @@
+ {
+ /* Start calibrating. */
+ xcalibrate_client = client;
+- tslib_raw_event_hook = xcalibrate_event_hook;
+- tslib_raw_event_closure = client;
++ tslib_set_raw_event_hook(xcalibrate_event_hook, client);
+ rep.status = GrabSuccess;
+ }
+ else
+@@ -139,8 +139,7 @@
+ {
+ /* Stop calibrating. */
+ xcalibrate_client = NULL;
+- tslib_raw_event_hook = NULL;
+- tslib_raw_event_closure = NULL;
++ tslib_set_raw_event_hook(NULL, NULL);
+ rep.status = GrabSuccess;
+
+ /* Cycle input off and on to reload configuration. */
+@@ -272,8 +271,7 @@
+ {
+ /* Stop calibrating. */
+ xcalibrate_client = NULL;
+- tslib_raw_event_hook = NULL;
+- tslib_raw_event_closure = NULL;
++ tslib_set_raw_event_hook(NULL, NULL);
+ }
+ }
+
+@@ -297,4 +295,5 @@
+ XCalibrateErrorBase = extEntry->errorBase;
+
+ xcalibrate_client = 0;
++
+ }
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.6.1/xorg-server-1.6.1-xcalibrate.patch b/recipes/xorg-xserver/xserver-kdrive-1.6.1/xorg-server-1.6.1-xcalibrate.patch
new file mode 100644
index 0000000..9205132
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.6.1/xorg-server-1.6.1-xcalibrate.patch
@@ -0,0 +1,112 @@
+diff -urN xorg-server-1.6.1-0rig/include/dix-config.h.in xorg-server-1.6.1/include/dix-config.h.in
+--- xorg-server-1.6.1-0rig/include/dix-config.h.in 2009-08-17 17:27:00.000000000 +0200
++++ xorg-server-1.6.1/include/dix-config.h.in 2009-08-17 17:55:21.000000000 +0200
+@@ -300,6 +300,9 @@
+ /* Support Xdmcp */
+ #undef XDMCP
+
++/* Support XCALIBRATE extension */
++#undef XCALIBRATE
++
+ /* Build XFree86 BigFont extension */
+ #undef XF86BIGFONT
+
+diff -urN xorg-server-1.6.1-0rig/include/xorg-server.h.in xorg-server-1.6.1/include/xorg-server.h.in
+--- xorg-server-1.6.1-0rig/include/xorg-server.h.in 2009-08-17 17:27:00.000000000 +0200
++++ xorg-server-1.6.1/include/xorg-server.h.in 2009-08-17 17:51:04.000000000 +0200
+@@ -85,6 +85,9 @@
+ /* Support Xdmcp */
+ #undef XDMCP
+
++/* Build XCALIBRATE Touch screen calibration extension */
++#undef XCALIBRATE
++
+ /* Build XFree86 BigFont extension */
+ #undef XF86BIGFONT
+
+diff -urN xorg-server-1.6.1-0rig/mi/miinitext.c xorg-server-1.6.1/mi/miinitext.c
+--- xorg-server-1.6.1-0rig/mi/miinitext.c 2009-08-17 17:27:00.000000000 +0200
++++ xorg-server-1.6.1/mi/miinitext.c 2009-08-17 17:46:28.000000000 +0200
+@@ -44,7 +44,7 @@
+ SOFTWARE.
+
+ ******************************************************************/
+-
++#include "X11/Xlib.h"
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
+@@ -119,6 +119,9 @@
+ #ifdef RES
+ extern Bool noResExtension;
+ #endif
++#ifdef XCALIBRATE
++extern Bool noXCalibrateExtension;
++#endif
+ #ifdef XF86BIGFONT
+ extern Bool noXFree86BigfontExtension;
+ #endif
+@@ -180,6 +183,9 @@
+ #ifdef PANORAMIX
+ #include <X11/extensions/panoramiXproto.h>
+ #endif
++#ifdef XCALIBRATE
++#include <X11/extensions/xcalibrate.h>
++#endif
+ #ifdef XF86BIGFONT
+ #include <X11/extensions/xf86bigfstr.h>
+ #endif
+@@ -229,6 +235,9 @@
+ #ifdef XSELINUX
+ extern void SELinuxExtensionInit(INITARGS);
+ #endif
++#ifdef XCALIBRATE
++extern void XCalibrateExtensionInit(INITARGS);
++#endif
+ #ifdef XF86BIGFONT
+ extern void XFree86BigfontExtensionInit(INITARGS);
+ #endif
+@@ -321,6 +330,9 @@
+ #ifdef RES
+ { "X-Resource", &noResExtension },
+ #endif
++#ifdef XCALIBRATE
++ { "XCALIBRATE", &noXCalibrateExtension },
++#endif
+ #ifdef XF86BIGFONT
+ { "XFree86-Bigfont", &noXFree86BigfontExtension },
+ #endif
+@@ -435,6 +447,9 @@
+ #if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
+ if (!noDPMSExtension) DPMSExtensionInit();
+ #endif
++#ifdef XCALIBRATE
++ if (!noXCalibrateExtension) XCalibrateExtensionInit();
++#endif
+ #ifdef XF86BIGFONT
+ if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
+ #endif
+@@ -507,6 +522,9 @@
+ /* must be before Render to layer DisplayCursor correctly */
+ { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL },
+ #endif
++#ifdef XCALIBRATE
++ { XCalibrateExtensionInit, "XCALIBRATE", &noXCalibrateExtension, NULL, NULL },
++#endif
+ #ifdef XF86BIGFONT
+ { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
+ #endif
+diff -urN xorg-server-1.6.1-0rig/os/utils.c xorg-server-1.6.1/os/utils.c
+--- xorg-server-1.6.1-0rig/os/utils.c 2009-08-17 17:27:00.000000000 +0200
++++ xorg-server-1.6.1/os/utils.c 2009-08-17 17:52:51.000000000 +0200
+@@ -160,6 +160,9 @@
+ #ifdef RES
+ _X_EXPORT Bool noResExtension = FALSE;
+ #endif
++#ifdef XCALIBRATE
++_X_EXPORT Bool noXCalibrateExtension = FALSE;
++#endif
+ #ifdef XF86BIGFONT
+ _X_EXPORT Bool noXFree86BigfontExtension = FALSE;
+ #endif
+
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.6.1.bb b/recipes/xorg-xserver/xserver-kdrive_1.6.1.bb
new file mode 100644
index 0000000..0f15d58
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive_1.6.1.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "the X.Org X-kdrive server"
+require xserver-kdrive-common.inc
+
+DEPENDS += "hal libxkbfile libxcalibrate pixman"
+RDEPENDS += "hal"
+
+DEFAULT_PREFERENCE = "-99"
+
+PE = "1"
+PR = "r1"
+
+
+
+SRC_URI += "file://sysroot_fix.patch;patch=1 \
+ file://dolt-fix.patch;patch=1 \
+ file://xorg-server-1.6.1-xcalibrate.patch;patch=1 \
+ file://xorg-server-1.6.1-tslib.patch;patch=1 \
+ file://xorg-avr32-support.diff;patch=1 \
+ "
+
+S = "${WORKDIR}/xorg-server-${PV}"
+
+MESA_VER = "7.2"
+
+export LDFLAGS += " -ldl "
+
+EXTRA_OECONF += "--enable-builtin-fonts \
+ "
+
+# --enable-tslib \
+# --enable-dri \
+# --enable-xorgcfg \
+
More information about the Openembedded-commits
mailing list