[oe-commits] org.oe.dev merge of '58ee0064f80d00d7772adc0a5d1103aad7affb32'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sun Sep 9 06:09:30 UTC 2007
merge of '58ee0064f80d00d7772adc0a5d1103aad7affb32'
and 'daf8fa0ad9a599d77e90c1e38b8b2821a7aceab7'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 36bb11ae5d36a6ad5a636ed1f3161763b847741a
ViewMTN: http://monotone.openembedded.org/revision/info/36bb11ae5d36a6ad5a636ed1f3161763b847741a
Files:
1
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
classes/qmake-base.bbclass
classes/qmake_base.bbclass
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/linux/linux-handhelds-2.6_2.6.21-hh15.bb
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
classes/qmake.bbclass
classes/qmake2.bbclass
classes/qt3e.bbclass
classes/qt3x11.bbclass
packages/base-files/base-files_3.0.14.bb
packages/linux/linux-ezx_2.6.21.bb
packages/netbase/netbase_4.21.bb
packages/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb
packages/nonworking/zethereal/zethereal_1.0.0.bb
packages/putty/putty_svn.bb
packages/qt/qt-x11-free-native_3.3.5.bb
packages/qt/qt4-x11-free_4.1.2.bb
packages/taglib/taglib_1.4.bb
packages/taglib/taglibc_1.4.bb
packages/uicmoc/uicmoc-native_2.3.10.bb
packages/uicmoc/uicmoc3-native_3.3.5.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 -r58ee0064f80d00d7772adc0a5d1103aad7affb32 -r36bb11ae5d36a6ad5a636ed1f3161763b847741a
#
#
#
# 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 "classes/qmake-base.bbclass"
# to "classes/qmake_base.bbclass"
#
# 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/linux/linux-handhelds-2.6_2.6.21-hh15.bb"
# content [252b9c26ddd2fda4271f4352999ce0facbfece99]
#
# 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 "classes/qmake.bbclass"
# from [3ef973d2c334ac644e2f124902ea399136985ee5]
# to [4fb295886f71d537f0bdce9a0c0548d276e993e9]
#
# patch "classes/qmake2.bbclass"
# from [a1af56cd2193e33f5e44f6c7781760386a74d850]
# to [4720a6ca5e41a1786e98f6876c83791801e04a1a]
#
# patch "classes/qmake_base.bbclass"
# from [ad812ccb8f270d4c422cc80258d173e249f04f12]
# to [257ee0c42b534ce40a854f7500ead08cdc37287a]
#
# patch "classes/qt3e.bbclass"
# from [fc9de250333c26f3395549302051e5f0d3cbeaa9]
# to [13fd2f64835873afe33fd96ebb2d538da23fbd4f]
#
# patch "classes/qt3x11.bbclass"
# from [2ec159a14bb13067cc41509f582734ae8329cbb6]
# to [021061b87cd1c52fec22479c0efe7312a0d41898]
#
# 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/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb"
# from [35f93ddc3180d0d88cb37f504ed87cad1f09f104]
# to [365900054bc871c7d50d2ae0e76fe932475431d8]
#
# patch "packages/nonworking/zethereal/zethereal_1.0.0.bb"
# from [a85d3daf3ac29cf7b5e7cb2454d339e7b686a8a4]
# to [ea1de8219c2fed20fdabc89e425518654aaf0997]
#
# patch "packages/putty/putty_svn.bb"
# from [f58f9c215ec8c94ae9d7401adfa1c2315b6f9372]
# to [7407e5ea942f7936e600c68bcaceff08c8556d99]
#
# patch "packages/qt/qt-x11-free-native_3.3.5.bb"
# from [6f26a634b3717bf6128b607b1328c561494948f9]
# to [59251d06fe96fd830e70b5d3f020c7ae2c0aec22]
#
# patch "packages/qt/qt4-x11-free_4.1.2.bb"
# from [6f37f072d6f0ee744fb3b14a36b451bfb7f15d39]
# to [87ff0a36e1696d7c7726c3e3ffd517ca7f9233f3]
#
# patch "packages/taglib/taglib_1.4.bb"
# from [95c3d0a183ed6167101a89a3684c94090bca0b9a]
# to [ba6c47f548d00f94ed177f8934c40cbaea043095]
#
# patch "packages/taglib/taglibc_1.4.bb"
# from [c612c09cd5e88f8074a856179ff84c2431ff0eec]
# to [f43aaaf6f92e11d94d08a787158d2f93d7afd217]
#
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
# from [aef21967161c38e506e0763c794755313d83cad0]
# to [d343168478c8c6e8b0748587327fb181ecea6164]
#
# patch "packages/uicmoc/uicmoc3-native_3.3.5.bb"
# from [d698d734a6f89bc64b45c009e340ef00d1ed100e]
# to [f5fb5daae8ef66f9b2d4df4f8372d83f7815347c]
#
# patch "packages/xorg-xserver/xserver-kdrive/w100.patch"
# from [0dc0af956140187d39a116a70f71c42db605b00b]
# to [a7f0fd47571239758e6d509c7ac7a660753c8b3a]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [69820edb24da782a8f84fb3676ee676aa0293a7a]
# 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 [f1d269441b9c1ea3d35fa9d2311f41849ec9952e]
# to [7f2e709c62424285446c1f454d2bd609e6ab405d]
#
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
# from [42b262dd40e9be4cfc18266789dfbcb89138c6e1]
# to [071ef9bf1599c5bad428889ff124bb453f739da6]
#
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh15.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- 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 %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdaf8fa0ad9a599d77e90c1e38b8b2821a7aceab7 -r36bb11ae5d36a6ad5a636ed1f3161763b847741a
#
#
# no changes
#
More information about the Openembedded-commits
mailing list