summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver/xserver-kdrive-1.4.0.90
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/xorg-xserver/xserver-kdrive-1.4.0.90
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive-1.4.0.90')
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch39
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch24
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch77
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch16
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch44
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch12
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch54
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4.0.90/xorg-1.4-kdrive-rotation.patch31
8 files changed, 0 insertions, 297 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch
deleted file mode 100644
index ccc19139c8..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: xorg-server-1.3.0.0/configure.ac
-===================================================================
---- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200
-+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200
-@@ -520,7 +520,11 @@
- XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
-
- dnl Core modules for most extensions, et al.
-+if test "$KDRIVE" = yes; then
-+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
-+else
- REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
-+fi
- REQUIRED_LIBS="xfont xau fontenc"
-
- AM_CONDITIONAL(XV, [test "x$XV" = xyes])
-@@ -1603,7 +1607,9 @@
- AC_SUBST(XKB_COMPILED_DIR)
-
- dnl and the rest of these are generic, so they're in config.h
-+if test ! x"$KDRIVE" = xyes; then
- AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
-+fi
- AC_DEFINE(XResExtension, 1, [Build XRes extension])
-
- AC_TRY_COMPILE([
-@@ -1616,10 +1622,12 @@
-
- AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
-
-+if test ! "x$KDRIVE" = xyes ; then
- dnl xorgconfig CLI configuration utility
- PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
- AC_SUBST(XORGCONFIG_DEP_CFLAGS)
- AC_SUBST(XORGCONFIG_DEP_LIBS)
-+fi
-
- dnl xorgcfg GUI configuration utility
- AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch
deleted file mode 100644
index 3746be5f53..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: xorg-server-1.4/configure.ac
-===================================================================
---- xorg-server-1.4.orig/configure.ac 2007-09-08 16:36:37.000000000 +0200
-+++ xorg-server-1.4/configure.ac 2007-09-08 16:38:10.000000000 +0200
-@@ -1816,7 +1816,7 @@
- AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))
-
- if test "x$TSLIB" = xyes; then
-- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
-+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
- if test "x$HAVE_TSLIB" = xno; then
- AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
- fi
-@@ -1840,8 +1840,8 @@
- ;;
- esac
- KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
-- KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
-- KDRIVE_LIBS="$XSERVERLIBS_LIBS $KDRIVE_LOCAL_LIBS"
-+ KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
-+ KDRIVE_LIBS="$XSERVERLIBS_LIBS $TSLIB_LIBS $KDRIVE_LOCAL_LIBS"
-
- # check if we can build Xephyr
- PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch
deleted file mode 100644
index 113f1cc584..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch
+++ /dev/null
@@ -1,77 +0,0 @@
----
- Xext/Makefile.am | 6 ++++++
- configure.ac | 9 ++++++++-
- include/kdrive-config.h.in | 3 +++
- mi/miinitext.c | 6 ++++++
- 4 files changed, 23 insertions(+), 1 deletion(-)
-
-Index: xorg-server-1.4/mi/miinitext.c
-===================================================================
---- xorg-server-1.4.orig/mi/miinitext.c 2007-08-23 21:04:54.000000000 +0200
-+++ xorg-server-1.4/mi/miinitext.c 2007-09-06 23:25:35.000000000 +0200
-@@ -374,6 +374,9 @@
- #ifdef DMXEXT
- extern void DMXExtensionInit(INITARGS);
- #endif
-+#ifdef XCALIBRATE
-+extern void XCalibrateExtensionInit(INITARGS);
-+#endif
- #ifdef XEVIE
- extern void XevieExtensionInit(INITARGS);
- #endif
-@@ -666,6 +669,9 @@
- #ifdef DAMAGE
- if (!noDamageExtension) DamageExtensionInit();
- #endif
-+#ifdef XCALIBRATE
-+ XCalibrateExtensionInit ();
-+#endif
- }
-
- void
-Index: xorg-server-1.4/configure.ac
-===================================================================
---- xorg-server-1.4.orig/configure.ac 2007-09-06 23:25:15.000000000 +0200
-+++ xorg-server-1.4/configure.ac 2007-09-06 23:26:40.000000000 +0200
-@@ -500,6 +500,7 @@
- AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto])
- AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
- AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=$XACE])
-+AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
- AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
- AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
- AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
-@@ -787,6 +788,12 @@
- AC_DEFINE(XCSECURITY, 1, [Build Security extension])
- fi
-
-+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
-+if test "x$XCALIBRATE" = xyes; then
-+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
-+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
-+fi
-+
- AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
- if test "x$XEVIE" = xyes; then
- AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
-@@ -1841,7 +1848,7 @@
- ;;
- esac
- KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
-- KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
-+ KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB"
- KDRIVE_LIBS="$XSERVERLIBS_LIBS $TSLIB_LIBS $KDRIVE_LOCAL_LIBS"
-
- # check if we can build Xephyr
-Index: xorg-server-1.4/include/kdrive-config.h.in
-===================================================================
---- xorg-server-1.4.orig/include/kdrive-config.h.in 2007-08-23 21:04:54.000000000 +0200
-+++ xorg-server-1.4/include/kdrive-config.h.in 2007-09-06 23:25:35.000000000 +0200
-@@ -31,4 +31,7 @@
- /* Have execinfo.h for backtrace(). */
- #undef HAVE_EXECINFO_H
-
-+/* Enable XCalibrate extension */
-+#undef XCALIBRATE
-+
- #endif /* _KDRIVE_CONFIG_H_ */
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch
deleted file mode 100644
index 4964ff5479..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/linux/keyboard.c 2007-09-29 18:33:02.000000000 +0200
-@@ -743,11 +743,6 @@
- cfsetispeed(&nTty, 9600);
- cfsetospeed(&nTty, 9600);
- tcsetattr(fd, TCSANOW, &nTty);
-- /*
-- * Flush any pending keystrokes
-- */
-- while ((n = read (fd, buf, sizeof (buf))) > 0)
-- ;
- KdRegisterFd (fd, LinuxKeyboardRead, ki);
- return Success;
- }
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch
deleted file mode 100644
index 36d2f8eae8..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: git/hw/kdrive/linux/keyboard.c
-===================================================================
---- git.orig/hw/kdrive/linux/keyboard.c 2007-11-14 21:30:45.000000000 +0000
-+++ git/hw/kdrive/linux/keyboard.c 2007-11-15 12:00:11.000000000 +0000
-@@ -42,6 +42,8 @@
- #include <sys/ioctl.h>
-
- extern int LinuxConsoleFd;
-+static unsigned char mediumraw_data, mediumraw_up;
-+static enum { DEFAULT, EXTBYTE1, EXTBYTE2 } mediumraw_state = DEFAULT;
-
- static const KeySym linux_to_x[256] = {
- NoSymbol, NoSymbol, NoSymbol, NoSymbol,
-@@ -701,7 +703,29 @@
- else
- #endif
- scancode = b[0] & 0x7f;
-- KdEnqueueKeyboardEvent (closure, scancode, b[0] & 0x80);
-+ /* This is extended medium raw mode interpreter
-+ see linux/drivers/keyboard.c (kbd->kbdmode == VC_MEDIUMRAW) */
-+ switch (mediumraw_state)
-+ {
-+ case DEFAULT:
-+ if (scancode == 0)
-+ {
-+ mediumraw_state = EXTBYTE1;
-+ mediumraw_up = b[0] & 0x80;
-+ }
-+ else
-+ KdEnqueueKeyboardEvent (closure, scancode, b[0] & 0x80);
-+ break;
-+ case EXTBYTE1:
-+ mediumraw_data = scancode;
-+ mediumraw_state = EXTBYTE2;
-+ break;
-+ case EXTBYTE2:
-+ /* Note: Only codes < 256 will pass correctly through KdEnqueueKeyboardEvent() */
-+ KdEnqueueKeyboardEvent (closure, (int)mediumraw_data << 7 | scancode, mediumraw_up);
-+ mediumraw_state = DEFAULT;
-+ break;
-+ }
- b++;
- }
- }
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch
deleted file mode 100644
index 779aa2d6ef..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dix/devices.c~ 2008-04-16 13:01:08.000000000 +0200
-+++ dix/devices.c 2008-04-16 13:01:08.000000000 +0200
-@@ -527,8 +527,8 @@
- #ifdef XKB
- if (dev->key->xkbInfo)
- XkbFreeInfo(dev->key->xkbInfo);
--#endif
- dev->key->xkbInfo = NULL;
-+#endif
- xfree(dev->key->curKeySyms.map);
- xfree(dev->key->modifierKeyMap);
- xfree(dev->key);
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch
deleted file mode 100644
index 0812a2e856..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: xorg-server-1.4/hw/kdrive/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200
-+++ xorg-server-1.4/hw/kdrive/Makefile.am 2007-09-06 23:33:44.000000000 +0200
-@@ -11,6 +11,10 @@
- XFAKE_SUBDIRS = fake
- endif
-
-+if KDRIVEW100
-+W100_SUBDIRS = w100
-+endif
-+
- if XSDLSERVER
- XSDL_SUBDIRS = sdl
- endif
-@@ -26,6 +30,7 @@
- SERVER_SUBDIRS = \
- $(XSDL_SUBDIRS) \
- $(FBDEV_SUBDIRS) \
-+ $(W100_SUBDIRS) \
- $(VESA_SUBDIRS) \
- $(XEPHYR_SUBDIRS) \
- $(XFAKE_SUBDIRS)
-Index: xorg-server-1.4/configure.ac
-===================================================================
---- xorg-server-1.4.orig/configure.ac 2007-09-06 23:32:05.000000000 +0200
-+++ xorg-server-1.4/configure.ac 2007-09-06 23:34:41.000000000 +0200
-@@ -535,6 +535,7 @@
- AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
- AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
- AC_ARG_ENABLE(xsdl, AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto])
-+AC_ARG_ENABLE(w100, AS_HELP_STRING([--enable-w100], [Build the kdrive Xw100 server (default: no)]), [KDRIVEW100=$enableval], [KDRIVEW100=no])
- AC_ARG_ENABLE(xfake, AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])
- AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto])
- AC_ARG_ENABLE(kdrive-vesa, AS_HELP_STRING([--enable-kdrive-vesa], [Build the kdrive VESA-based servers (default: auto)]), [KDRIVEVESA=$enableval], [KDRIVEVESA=auto])
-@@ -1669,6 +1670,10 @@
- fi
- AM_CONDITIONAL(XP_USE_FREETYPE, [test "x$XPRINT" = xyes && test "x$XP_USE_FREETYPE" = xyes])
-
-+AM_CONDITIONAL(KDRIVEW100, [test "x$KDRIVEW100" = xyes])
-+if test "x$KDRIVEW100" = xyes; then
-+ AC_DEFINE(KDRIVEW100, 1, [Build Xw100 server])
-+fi
-
- dnl XWin DDX
-
-@@ -2112,6 +2117,7 @@
- hw/kdrive/epson/Makefile
- hw/kdrive/fake/Makefile
- hw/kdrive/fbdev/Makefile
-+hw/kdrive/w100/Makefile
- hw/kdrive/i810/Makefile
- hw/kdrive/linux/Makefile
- hw/kdrive/mach64/Makefile
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/xorg-1.4-kdrive-rotation.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/xorg-1.4-kdrive-rotation.patch
deleted file mode 100644
index 5e3eb8ee14..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/xorg-1.4-kdrive-rotation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -rup a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
---- a/hw/kdrive/src/kinput.c 2007-08-23 21:04:53.000000000 +0200
-+++ b/hw/kdrive/src/kinput.c 2007-12-22 12:53:27.679853402 +0100
-@@ -2075,19 +2075,25 @@ KdEnqueuePointerEvent(KdPointerInfo *pi,
-
- /* we don't need to transform z, so we don't. */
- if (flags & KD_MOUSE_DELTA) {
-+/* does it really make sense to transform relative coordinates depending on screen rotation??
- if (pi->transformCoordinates) {
- x = matrix[0][0] * rx + matrix[0][1] * ry;
- y = matrix[1][0] * rx + matrix[1][1] * ry;
- }
-- else {
-+ else {*/
- x = rx;
- y = ry;
-- }
-+/* }*/
- }
- else {
- if (pi->transformCoordinates) {
- x = matrix[0][0] * rx + matrix[0][1] * ry;
- y = matrix[1][0] * rx + matrix[1][1] * ry;
-+/* negative absolute values indicate calculation from the oposite end of the axis */
-+ if (x < 0)
-+ x += matrix[0][2];
-+ if (y < 0)
-+ y += matrix[1][2];
- }
- else {
- x = rx;