[oe-commits] org.oe.dev merge of '0586913037c8e52dc1d456b0d681720a0d6a1580'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sun Sep 9 06:09:12 UTC 2007
merge of '0586913037c8e52dc1d456b0d681720a0d6a1580'
and '371291ba5b2d3d86534d42fdb26b7e29b9e18bff'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 62587daa7e0ad5129712e1e4666b16c8a1971428
ViewMTN: http://monotone.openembedded.org/revision/info/62587daa7e0ad5129712e1e4666b16c8a1971428
Files:
1
classes/qmake-base.bbclass
classes/qmake_base.bbclass
classes/qmake.bbclass
classes/qmake2.bbclass
packages/netbase/netbase/a780
packages/netbase/netbase/a780/interfaces
packages/netbase/netbase/e680
packages/netbase/netbase/e680/interfaces
packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch
packages/xorg-xserver/xserver-kdrive/devfs.patch
packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
packages/xorg-xserver/xserver-kdrive/enable-epson.patch
packages/xorg-xserver/xserver-kdrive-1.1.0/enable-epson.patch
packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.1.0/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
packages/xorg-xserver/xserver-kdrive-1.1.0/optional-xkb.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch
packages/xorg-xserver/xserver-kdrive/fix_default_mode.patch
packages/xorg-xserver/xserver-kdrive-1.1.0
packages/xorg-xserver/xserver-kdrive-1.4
packages/xorg-xserver/xserver-kdrive-git
packages/xorg-xserver/xserver-kdrive/fbdev-evdev.patch
packages/xorg-xserver/xserver-kdrive/tslib-default-device.patch
packages/xorg-xserver/xserver-kdrive/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch
packages/xorg-xserver/xserver-kdrive/xcalibrate-new-input-world-order.patch
packages/xorg-xserver/xserver-kdrive/xcalibrate_coords.patch
packages/xorg-xserver/xserver-kdrive-1.4/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-1.4/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.4/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-1.4/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive-git/enable-epson.patch
packages/xorg-xserver/xserver-kdrive-git/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-git/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-git/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive-git/w100-post-1.4-buildfix.patch
packages/xorg-xserver/xserver-kdrive-git/xephyr-post-1.4-buildfix.patch
packages/xorg-xserver/xserver-kdrive_1.4.bb
packages/base-files/base-files_3.0.14.bb
packages/linux/linux-ezx_2.6.21.bb
packages/netbase/netbase_4.21.bb
packages/xorg-xserver/xserver-kdrive/w100.patch
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xorg-xserver/xserver-kdrive_git.bb
Diffs:
#
# mt diff -r0586913037c8e52dc1d456b0d681720a0d6a1580 -r62587daa7e0ad5129712e1e4666b16c8a1971428
#
#
#
# rename "classes/qmake-base.bbclass"
# to "classes/qmake_base.bbclass"
#
# patch "classes/qmake.bbclass"
# from [3ef973d2c334ac644e2f124902ea399136985ee5]
# to [4fb295886f71d537f0bdce9a0c0548d276e993e9]
#
# patch "classes/qmake2.bbclass"
# from [a1af56cd2193e33f5e44f6c7781760386a74d850]
# to [4720a6ca5e41a1786e98f6876c83791801e04a1a]
#
# patch "classes/qmake_base.bbclass"
# from [ad812ccb8f270d4c422cc80258d173e249f04f12]
# to [257ee0c42b534ce40a854f7500ead08cdc37287a]
#
============================================================
--- classes/qmake.bbclass 3ef973d2c334ac644e2f124902ea399136985ee5
+++ classes/qmake.bbclass 4fb295886f71d537f0bdce9a0c0548d276e993e9
@@ -1,4 +1,4 @@
-inherit qmake-base
+inherit qmake_base
DEPENDS_prepend = "qmake-native "
============================================================
--- classes/qmake2.bbclass a1af56cd2193e33f5e44f6c7781760386a74d850
+++ classes/qmake2.bbclass 4720a6ca5e41a1786e98f6876c83791801e04a1a
@@ -1,7 +1,7 @@
#
# QMake variables for Qt4
#
-inherit qmake-base
+inherit qmake_base
DEPENDS_prepend = "qmake2-native uicmoc4-native "
============================================================
--- classes/qmake-base.bbclass ad812ccb8f270d4c422cc80258d173e249f04f12
+++ classes/qmake_base.bbclass 257ee0c42b534ce40a854f7500ead08cdc37287a
@@ -31,7 +31,7 @@ oe_qmake_mkspecs () {
done
}
-qmake-base_do_configure() {
+qmake_base_do_configure() {
case ${QMAKESPEC} in
*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
;;
#
# mt diff -r371291ba5b2d3d86534d42fdb26b7e29b9e18bff -r62587daa7e0ad5129712e1e4666b16c8a1971428
#
#
#
# delete "packages/netbase/netbase/a780"
#
# delete "packages/netbase/netbase/a780/interfaces"
#
# delete "packages/netbase/netbase/e680"
#
# delete "packages/netbase/netbase/e680/interfaces"
#
# delete "packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch"
#
# delete "packages/xorg-xserver/xserver-kdrive/devfs.patch"
#
# delete "packages/xorg-xserver/xserver-kdrive/faster-rotated.patch"
#
# delete "packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive/enable-epson.patch"
# to "packages/xorg-xserver/xserver-kdrive-1.1.0/enable-epson.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive/enable-tslib.patch"
# to "packages/xorg-xserver/xserver-kdrive-1.1.0/enable-tslib.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive/optional-xkb.patch"
# to "packages/xorg-xserver/xserver-kdrive-1.1.0/optional-xkb.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch"
# to "packages/xorg-xserver/xserver-kdrive/fix_default_mode.patch"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.1.0"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.4"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-git"
#
# add_file "packages/xorg-xserver/xserver-kdrive/enable-epson.patch"
# content [b50349474f8d1803cef15512f95a4b4166905d74]
#
# add_file "packages/xorg-xserver/xserver-kdrive/fbdev-evdev.patch"
# content [0d39700c7dda9f0e282dd3638b3b0822e8e50127]
#
# add_file "packages/xorg-xserver/xserver-kdrive/optional-xkb.patch"
# content [98dc794e9631ab770a2d951909a6976b250fa4e8]
#
# add_file "packages/xorg-xserver/xserver-kdrive/tslib-default-device.patch"
# content [92a70fc2ecbf0243c3e6ee5ab7e0ed0686284568]
#
# add_file "packages/xorg-xserver/xserver-kdrive/w100-autofoo.patch"
# content [57abbc0692fd1d555d9a4415b8b32874e2fa6856]
#
# add_file "packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch"
# content [6045c1bf5a2f86e83240d1c1718bf41574dda458]
#
# add_file "packages/xorg-xserver/xserver-kdrive/xcalibrate-new-input-world-order.patch"
# content [cdd73e5679fed84bbed80a0585ddf4b074d28241]
#
# add_file "packages/xorg-xserver/xserver-kdrive/xcalibrate_coords.patch"
# content [088e08e2806c67c085c9dc8ffffea069e7da97b5]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/disable-xf86-dga-xorgcfg.patch"
# content [0e8754f39994efeff67f876087794543f5ec4a2f]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/enable-tslib.patch"
# content [d8f011120dc0a345fc9c5f897049fea887c705c3]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/enable-xcalibrate.patch"
# content [08d76cc4f9d1c156f3ac72604bd0b9eb126d9b48]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/w100-autofoo.patch"
# content [93931fd9a64ed0b3fee8337b05894bab22e14f63]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/enable-epson.patch"
# content [56d6ba391c1bba04f130af29dbb020558d21ce27]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/enable-tslib.patch"
# content [f62f7ac48ba6955a87651622b7b11a1de9ddd992]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/enable-xcalibrate.patch"
# content [e02870f2fb2e036cbac227b0ac28978e1741d2c4]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/w100-autofoo.patch"
# content [6f05b71251d094a674b948defb10df73039cbb13]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/w100-post-1.4-buildfix.patch"
# content [4e1b8078b6020505d5801133b25d2b6b3a10a59d]
#
# add_file "packages/xorg-xserver/xserver-kdrive-git/xephyr-post-1.4-buildfix.patch"
# content [76414d87c4e38fec11b5dc9b0fffeef8132776b2]
#
# add_file "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# content [c9837b4198cd07399be8e9f76ed051e1a9919cfe]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [7d46d8dffa08a722ac5317549a58f8520ccae5a5]
# to [26083a7751f60fc116a9d07b00b6fa20ed63f4fc]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [935dbd5faafe8b44a770899fe547001db05d19df]
# to [588f101b4da30e1657158e350bb0804c67ecc7fb]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [6f3ca0feab30d1dfc81d97ff3ab8c242e8084886]
# to [8d3a1db23199321161b8aec311e1e9170f56d2bb]
#
# patch "packages/xorg-xserver/xserver-kdrive/w100.patch"
# from [0dc0af956140187d39a116a70f71c42db605b00b]
# to [a7f0fd47571239758e6d509c7ac7a660753c8b3a]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [701a8d99a136183c1057c39066992f41228dd86c]
# to [41111959110e4d02e8cbcb965b17cd1d2494d5b9]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
# from [5d4c1648cee1599f242309505ed0ccb3ea412b96]
# to [01b72f8f41c67dcc67866b812084e1deabea0619]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [ac40a8d7e0dff290e512317059626ae16986ffef]
# to [7f2e709c62424285446c1f454d2bd609e6ab405d]
#
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
# from [42b262dd40e9be4cfc18266789dfbcb89138c6e1]
# to [071ef9bf1599c5bad428889ff124bb453f739da6]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive/enable-epson.patch b50349474f8d1803cef15512f95a4b4166905d74
+++ packages/xorg-xserver/xserver-kdrive/enable-epson.patch b50349474f8d1803cef15512f95a4b4166905d74
@@ -0,0 +1,17 @@
+Index: xorg-server-1.4/hw/kdrive/Makefile.am
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-08-30 01:48:57.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/Makefile.am 2007-09-06 23:24:29.000000000 +0200
+@@ -1,10 +1,10 @@
+ if KDRIVEVESA
+-VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
++VESA_SUBDIRS = vesa ati chips i810 mach64 mga nvidia pm2 r128 \
+ smi via
+ endif
+
+ if BUILD_KDRIVEFBDEVLIB
+-FBDEV_SUBDIRS = fbdev
++FBDEV_SUBDIRS = fbdev epson
+ endif
+
+ if XFAKESERVER
============================================================
--- packages/xorg-xserver/xserver-kdrive/fbdev-evdev.patch 0d39700c7dda9f0e282dd3638b3b0822e8e50127
+++ packages/xorg-xserver/xserver-kdrive/fbdev-evdev.patch 0d39700c7dda9f0e282dd3638b3b0822e8e50127
@@ -0,0 +1,19 @@
+Index: xorg-server-1.4/hw/kdrive/fbdev/fbinit.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/fbdev/fbinit.c 2007-09-08 21:27:44.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/fbdev/fbinit.c 2007-09-08 21:28:55.000000000 +0200
+@@ -46,11 +46,13 @@
+
+ KdAddKeyboardDriver (&LinuxKeyboardDriver);
+ KdAddPointerDriver (&LinuxMouseDriver);
++ KdAddKeyboardDriver (&LinuxEvdevKeyboardDriver);
++ KdAddPointerDriver (&LinuxEvdevMouseDriver);
+ #ifdef TSLIB
+ KdAddPointerDriver (&TsDriver);
+ #endif
+
+- ki = KdParseKeyboard ("keybd");
++ ki = KdParseKeyboard ("keyboard");
+ KdAddKeyboard(ki);
+
+ KdInitInput ();
============================================================
--- packages/xorg-xserver/xserver-kdrive/optional-xkb.patch 98dc794e9631ab770a2d951909a6976b250fa4e8
+++ packages/xorg-xserver/xserver-kdrive/optional-xkb.patch 98dc794e9631ab770a2d951909a6976b250fa4e8
@@ -0,0 +1,58 @@
+Index: xorg-server-1.4/Makefile.am
+===================================================================
+--- xorg-server-1.4.orig/Makefile.am 2007-08-23 21:04:52.000000000 +0200
++++ xorg-server-1.4/Makefile.am 2007-09-06 23:19:59.000000000 +0200
+@@ -26,6 +26,10 @@
+ GLX_DIR=GL
+ endif
+
++if XKB
++XKB_DIR=xkb
++endif
++
+ if DBE
+ DBE_DIR=dbe
+ endif
+@@ -42,7 +46,7 @@
+ randr \
+ render \
+ Xi \
+- xkb \
++ $(XKB_DIR) \
+ $(DBE_DIR) \
+ $(MFB_DIR) \
+ $(AFB_DIR) \
+Index: xorg-server-1.4/configure.ac
+===================================================================
+--- xorg-server-1.4.orig/configure.ac 2007-09-06 07:59:00.000000000 +0200
++++ xorg-server-1.4/configure.ac 2007-09-06 23:19:19.000000000 +0200
+@@ -514,6 +514,7 @@
+ AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])
+ AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
+ AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
+
+ dnl DDXes.
+ AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+@@ -889,12 +890,15 @@
+
+ AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+
+-AC_DEFINE(XKB, 1, [Build XKB])
+-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
+-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
++if test "x$XKB" = xyes; then
++ AC_DEFINE(XKB, 1, [Build XKB])
++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
++ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++fi
+
+ AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
+ [Do not have 'strcasecmp'.]))
============================================================
--- packages/xorg-xserver/xserver-kdrive/tslib-default-device.patch 92a70fc2ecbf0243c3e6ee5ab7e0ed0686284568
+++ packages/xorg-xserver/xserver-kdrive/tslib-default-device.patch 92a70fc2ecbf0243c3e6ee5ab7e0ed0686284568
@@ -0,0 +1,15 @@
+Index: xorg-server-1.4/hw/kdrive/linux/tslib.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/linux/tslib.c 2007-09-08 19:58:08.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/linux/tslib.c 2007-09-08 19:58:09.000000000 +0200
+@@ -121,6 +121,10 @@
+
+ private->raw_event_hook = NULL;
+ private->raw_event_closure = NULL;
++ if (!pi->path) {
++ pi->path = "/dev/input/touchscreen0";
++ ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path);
++ }
+ private->tsDev = ts_open(pi->path, 0);
+ private->fd = ts_fd(private->tsDev);
+ if (!private->tsDev || ts_config(private->tsDev) || private->fd < 0) {
============================================================
--- packages/xorg-xserver/xserver-kdrive/w100-autofoo.patch 57abbc0692fd1d555d9a4415b8b32874e2fa6856
+++ packages/xorg-xserver/xserver-kdrive/w100-autofoo.patch 57abbc0692fd1d555d9a4415b8b32874e2fa6856
@@ -0,0 +1,54 @@
+Index: git/hw/kdrive/Makefile.am
+===================================================================
+--- git.orig/hw/kdrive/Makefile.am 2006-09-02 12:12:13.000000000 +0200
++++ git/hw/kdrive/Makefile.am 2006-09-02 12:12:14.000000000 +0200
+@@ -7,6 +7,10 @@
+ FBDEV_SUBDIRS = fbdev epson
+ endif
+
++if KDRIVEW100
++W100_SUBDIRS = w100
++endif
++
+ if XSDLSERVER
+ XSDL_SUBDIRS = sdl
+ endif
+@@ -20,6 +24,7 @@
+ linux \
+ $(XSDL_SUBDIRS) \
+ $(FBDEV_SUBDIRS) \
++ $(W100_SUBDIRS) \
+ $(VESA_SUBDIRS) \
+ $(XEPHYR_SUBDIRS) \
+ fake
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac 2006-09-02 12:12:14.000000000 +0200
++++ git/configure.ac 2006-09-02 12:12:14.000000000 +0200
+@@ -442,6 +442,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])
+ dnl xprint
+ AC_ARG_ENABLE(freetype, AS_HELP_STRING([ --enable-freetype], [Build Xprint FreeType backend (default: yes)]), [XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=no])
+ AC_ARG_WITH(freetype-config, AS_HELP_STRING([ --with-freetype-config=PROG], [Use FreeType configuration program PROG (default: auto)]), freetype_config=$withval, freetype_config=auto)
+@@ -1519,6 +1520,10 @@
+ AC_SUBST([XSDL_LIBS])
+ AC_SUBST([XSDL_INCS])
+
++AM_CONDITIONAL(KDRIVEW100, [test "x$KDRIVEW100" = xyes])
++if test "x$KDRIVEW100" = xyes; then
++ AC_DEFINE(KDRIVEW100, 1, [Build Xw100 server])
++fi
+
+ dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
+ AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
+@@ -1753,6 +1758,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/w100-new-input-world-order.patch 6045c1bf5a2f86e83240d1c1718bf41574dda458
+++ packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch 6045c1bf5a2f86e83240d1c1718bf41574dda458
@@ -0,0 +1,28 @@
+Index: xorg-server-1.4/hw/kdrive/w100/ati_stub.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/w100/ati_stub.c 2007-09-08 21:40:26.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/w100/ati_stub.c 2007-09-08 22:04:27.000000000 +0200
+@@ -74,10 +74,20 @@
+ void
+ InitInput(int argc, char **argv)
+ {
+- KdInitInput(&LinuxMouseFuncs, &LinuxKeyboardFuncs);
+-#ifdef TOUCHSCREEN
+- KdAddMouseDriver(&TsFuncs);
++ KdKeyboardInfo *ki;
++
++ KdAddKeyboardDriver (&LinuxKeyboardDriver);
++ KdAddPointerDriver (&LinuxMouseDriver);
++ KdAddKeyboardDriver (&LinuxEvdevKeyboardDriver);
++ KdAddPointerDriver (&LinuxEvdevMouseDriver);
++#ifdef TSLIB
++ KdAddPointerDriver (&TsDriver);
+ #endif
++
++ ki = KdParseKeyboard ("keyboard");
++ KdAddKeyboard(ki);
++
++ KdInitInput ();
+ }
+
+ void
============================================================
--- packages/xorg-xserver/xserver-kdrive/xcalibrate-new-input-world-order.patch cdd73e5679fed84bbed80a0585ddf4b074d28241
+++ packages/xorg-xserver/xserver-kdrive/xcalibrate-new-input-world-order.patch cdd73e5679fed84bbed80a0585ddf4b074d28241
@@ -0,0 +1,159 @@
+CRUDE HACK ALERT: this patch adds a new device control (DEVICE_RAWEVENT)
+which cannot be exported in the protocol because the xDeviceRaweventCtl
+carries a C pointer to the tslib event hook. For lack of a better idea,
+I added this to get the event hook pointer from Xext/xcalibrate.c into
+tslib.c, where the now-private _raw_event_hook and _raw_event_closure
+pointers are manipulated instead of, like before, in the Xcalibrate
+extension itself.
+
+Index: xorg-server-1.4/Xext/xcalibrate.c
+===================================================================
+--- xorg-server-1.4.orig/Xext/xcalibrate.c 2007-09-08 13:22:55.000000000 +0200
++++ xorg-server-1.4/Xext/xcalibrate.c 2007-09-08 16:03:17.000000000 +0200
+@@ -33,14 +33,14 @@
+ #include "os.h"
+ #include "dixstruct.h"
+ #include "extnsionst.h"
++#include "inputstr.h" /* for inputInfo */
+ #include "swaprep.h"
+
++#include <X11/extensions/XI.h> /* for XI_TOUCHSCREEN */
++#include <X11/extensions/XIproto.h> /* for xDeviceCtl */
+ #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;
+-
+ static CARD8 XCalibrateReqCode;
+ int XCalibrateEventBase;
+ int XCalibrateReqBase;
+@@ -64,6 +64,31 @@
+ WriteEventsToClient (pClient, 1, (xEvent *) &ev);
+ }
+
++#define DEVICE_RAWEVENT 6
++typedef struct {
++ CARD16 control B16;
++ CARD16 length B16;
++ void *hook;
++} xDeviceRaweventCtl;
++
++static void
++xcalibrate_set_event_hook (void *hook, ClientPtr client)
++{
++ DeviceIntPtr devtmp;
++ Atom xiclass;
++ x%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list