[oe-commits] org.oe.dev xserver-kdrive: add 1.5rc (1.4.99.901). WIP, Disabled by default:
koen commit
oe at amethyst.openembedded.net
Wed Apr 16 10:39:15 UTC 2008
xserver-kdrive: add 1.5rc (1.4.99.901). WIP, Disabled by default:
patch status:
* enable-tslib: patch updated
* enable-xscalibrate: is upstream
* xcalibrate-coords: doesn't maybe, maybe it's already upstream
* root-ppm patch: doesn't apply, needs updating
* fbdev-evdev: removed since input-hotplug is all the rage now
build status:
* needs newer libdrm (2.3.1, oe has 2.3.0)
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7302918ab24706e666019913d11eca663e5ff960
ViewMTN: http://monotone.openembedded.org/revision/info/7302918ab24706e666019913d11eca663e5ff960
Files:
1
packages/xorg-xserver/xserver-kdrive-1.4.99.901
packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
Diffs:
#
# mt diff -r1023754a1f2fd2d6ed3755206ca695d4a877cf18 -r7302918ab24706e666019913d11eca663e5ff960
#
#
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.4.99.901"
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch"
# content [0e8754f39994efeff67f876087794543f5ec4a2f]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch"
# content [e4e8a8eaf8ef4e01658c38d62be037fe8a67c0ee]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch"
# content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch"
# content [faca4d8feba0272517c84f11ac61a39c0b055556]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch"
# content [93931fd9a64ed0b3fee8337b05894bab22e14f63]
#
# add_file "packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb"
# content [b4e6ae6d9910a862ac097c2fc2c5bde4b3dd24f6]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch 0e8754f39994efeff67f876087794543f5ec4a2f
+++ packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch 0e8754f39994efeff67f876087794543f5ec4a2f
@@ -0,0 +1,39 @@
+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],
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch e4e8a8eaf8ef4e01658c38d62be037fe8a67c0ee
+++ packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch e4e8a8eaf8ef4e01658c38d62be037fe8a67c0ee
@@ -0,0 +1,24 @@
+--- /tmp/configure.ac 2008-04-16 10:52:15.016442542 +0200
++++ xorg-server-1.4.99.901/configure.ac 2008-04-16 10:54:23.786428934 +0200
+@@ -1925,7 +1925,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
+@@ -1949,10 +1949,10 @@
+ ;;
+ esac
+ KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
+- KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
++ KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
+ KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+ KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
+- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
++ KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
+
+ # check if we can build Xephyr
+ PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
+++ packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
@@ -0,0 +1,16 @@
+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;
+ }
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch faca4d8feba0272517c84f11ac61a39c0b055556
+++ packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch faca4d8feba0272517c84f11ac61a39c0b055556
@@ -0,0 +1,44 @@
+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++;
+ }
+ }
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch 93931fd9a64ed0b3fee8337b05894bab22e14f63
+++ packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch 93931fd9a64ed0b3fee8337b05894bab22e14f63
@@ -0,0 +1,54 @@
+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
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b4e6ae6d9910a862ac097c2fc2c5bde4b3dd24f6
+++ packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b4e6ae6d9910a862ac097c2fc2c5bde4b3dd24f6
@@ -0,0 +1,34 @@
+require xserver-kdrive-common.inc
+
+DEPENDS += "hal libxkbfile libxcalibrate pixman"
+
+DEFAULT_PREFERENCE = "-99"
+
+PE = "1"
+PR = "r0"
+
+SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+ ${KDRIVE_COMMON_PATCHES} \
+ file://enable-epson.patch;patch=1 \
+ file://fix_default_mode.patch;patch=1 \
+# file://hide-cursor-and-ppm-root.patch;patch=1 \
+# file://xcalibrate_coords.patch;patch=1 \
+ file://w100.patch;patch=1 \
+ file://w100-autofoo.patch;patch=1 \
+ file://w100-fix-offscreen-bmp.patch;patch=1 \
+ file://w100-new-input-world-order.patch;patch=1 \
+ file://linux-keyboard-mediumraw.patch;patch=1 \
+ file://xcalibrate-new-input-world-order.patch;patch=1 \
+ file://tslib-default-device.patch;patch=1 \
+# file://fbdev-evdev.patch;patch=1 \
+ file://keyboard-resume-workaround.patch;patch=1 \
+ file://xorg-avr32-support.diff;patch=1 \
+# file://pkgconfig_fix.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/xorg-server-${PV}"
+
+W100_OECONF = "--disable-w100"
+W100_OECONF_arm = "--enable-w100"
+
+EXTRA_OECONF += "--enable-builtin-fonts"
More information about the Openembedded-commits
mailing list