[oe-commits] org.oe.dev merge of '333e287567474447d260204effba70e5e0c2eb71'
oe commit
oe at amethyst.openembedded.net
Tue Jun 17 18:46:29 UTC 2008
merge of '333e287567474447d260204effba70e5e0c2eb71'
and 'f0144e2c5085d88cf1861c146d6e33c2653a222e'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: c49479b10ba9741fbd29470907371c9def14355b
ViewMTN: http://monotone.openembedded.org/revision/info/c49479b10ba9741fbd29470907371c9def14355b
Files:
1
packages/fetchmail/fetchmail-6.3.8
packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
packages/fetchmail/fetchmail_6.3.8.bb
packages/meta/slugos-packages.bb
packages/xorg-xserver/xserver-kdrive-1.4.2
packages/xorg-xserver/xserver-xorg-1.4.2
packages/xorg-app/sessreg_1.0.4.bb
packages/xorg-app/xinit_1.1.0.bb
packages/xorg-xserver/xserver-kdrive-1.4.2/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/keyboard-resume-workaround.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/linux-keyboard-mediumraw.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/no_xkb.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive_1.4.2.bb
packages/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
packages/xorg-xserver/xserver-xorg_1.4.2.bb
Diffs:
#
# mt diff -r333e287567474447d260204effba70e5e0c2eb71 -rc49479b10ba9741fbd29470907371c9def14355b
#
#
#
# add_dir "packages/fetchmail/fetchmail-6.3.8"
#
# add_file "packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch"
# content [43420cf3d87053e2d4e56ae314920ae659928942]
#
# add_file "packages/fetchmail/fetchmail_6.3.8.bb"
# content [6a789128113572f654ad3969d3db1e5b310ec06f]
#
# patch "packages/meta/slugos-packages.bb"
# from [b232bd82ca02284c159702832aeb2b433fca3c4b]
# to [28581128f0072432d1d45dbfc5a38389fb81eab2]
#
============================================================
--- packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch 43420cf3d87053e2d4e56ae314920ae659928942
+++ packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch 43420cf3d87053e2d4e56ae314920ae659928942
@@ -0,0 +1,11 @@
+--- fetchmail-6.3.8-orig/sink.c
++++ fetchmail-6.3.8/sink.c
+@@ -262,7 +262,7 @@
+ const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
+
+ /* don't bounce in reply to undeliverable bounces */
+- if (!msg->return_path[0] ||
++ if (!msg || !msg->return_path[0] ||
+ strcmp(msg->return_path, "<>") == 0 ||
+ strcasecmp(msg->return_path, md1) == 0 ||
+ strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
============================================================
--- packages/fetchmail/fetchmail_6.3.8.bb 6a789128113572f654ad3969d3db1e5b310ec06f
+++ packages/fetchmail/fetchmail_6.3.8.bb 6a789128113572f654ad3969d3db1e5b310ec06f
@@ -0,0 +1,20 @@
+DESCRIPTION = "Fetchmail is a free, full-featured, robust, \
+well-documented remote-mail retrieval and forwarding utility \
+intended to be used over on-demand TCP/IP links \
+(such as SLIP or PPP connections)."
+SECTION = "console/network"
+
+LICENSE = "GPL"
+
+PR = "r2"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
+ file://CVE-2007-4565.patch;patch=1 \
+ "
+
+inherit autotools gettext
+
+FILES_${PN} = "${bindir}/fetchmail"
+PACKAGES += "${PN}conf"
+FILES_${PN}conf = "${libdir}/python2.5/site-packages/fetchmailconf.py* ${bindir}/fetchmailconf"
+rdepends_${PN}conf = "${PN}"
============================================================
--- packages/meta/slugos-packages.bb b232bd82ca02284c159702832aeb2b433fca3c4b
+++ packages/meta/slugos-packages.bb 28581128f0072432d1d45dbfc5a38389fb81eab2
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r56"
+PR = "r57"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -81,6 +81,7 @@ SLUGOS_PACKAGES = "\
expat \
ez-ipupdate \
fconfig \
+ fetchmail \
file \
findutils \
fis \
@@ -256,7 +257,6 @@ SLUGOS_BROKEN_PACKAGES = "\
ctorrent \
dsniff \
eciadsl \
- fetchmail \
gspcav1 \
linphone \
lirc-modules lirc \
#
# mt diff -rf0144e2c5085d88cf1861c146d6e33c2653a222e -rc49479b10ba9741fbd29470907371c9def14355b
#
#
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.4.2"
#
# add_dir "packages/xorg-xserver/xserver-xorg-1.4.2"
#
# add_file "packages/xorg-app/sessreg_1.0.4.bb"
# content [cac4367fdd9e349cfed34a7ac5a972138ab7d6a3]
#
# add_file "packages/xorg-app/xinit_1.1.0.bb"
# content [11fa62b52d00712f372c7092ec265b4dae6c213a]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/disable-xf86-dga-xorgcfg.patch"
# content [0e8754f39994efeff67f876087794543f5ec4a2f]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/enable-tslib.patch"
# content [d8f011120dc0a345fc9c5f897049fea887c705c3]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/enable-xcalibrate.patch"
# content [08d76cc4f9d1c156f3ac72604bd0b9eb126d9b48]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/keyboard-resume-workaround.patch"
# content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/linux-keyboard-mediumraw.patch"
# content [faca4d8feba0272517c84f11ac61a39c0b055556]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/no_xkb.patch"
# content [17027e633e5809ba281942d8c0a5d96710ff3b44]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch"
# content [93931fd9a64ed0b3fee8337b05894bab22e14f63]
#
# add_file "packages/xorg-xserver/xserver-kdrive_1.4.2.bb"
# content [b2ad79cb8f03fec0ebecebdde76443a33a601362]
#
# add_file "packages/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch"
# content [1f677919202395a75968515302a556e50edaa142]
#
# add_file "packages/xorg-xserver/xserver-xorg_1.4.2.bb"
# content [82f378de1913460628054471e7fd0daca8a411a1]
#
============================================================
--- packages/xorg-app/sessreg_1.0.4.bb cac4367fdd9e349cfed34a7ac5a972138ab7d6a3
+++ packages/xorg-app/sessreg_1.0.4.bb cac4367fdd9e349cfed34a7ac5a972138ab7d6a3
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "a simple program for managing utmp/wtmp entries"
+
+DEPENDS += " virtual/libx11"
+
============================================================
--- packages/xorg-app/xinit_1.1.0.bb 11fa62b52d00712f372c7092ec265b4dae6c213a
+++ packages/xorg-app/xinit_1.1.0.bb 11fa62b52d00712f372c7092ec265b4dae6c213a
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+
+FILES_${PN} += "${libdir}X11/xinit"
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.2/disable-xf86-dga-xorgcfg.patch 0e8754f39994efeff67f876087794543f5ec4a2f
+++ packages/xorg-xserver/xserver-kdrive-1.4.2/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.2/enable-tslib.patch d8f011120dc0a345fc9c5f897049fea887c705c3
+++ packages/xorg-xserver/xserver-kdrive-1.4.2/enable-tslib.patch d8f011120dc0a345fc9c5f897049fea887c705c3
@@ -0,0 +1,24 @@
+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"])
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.2/enable-xcalibrate.patch 08d76cc4f9d1c156f3ac72604bd0b9eb126d9b48
+++ packages/xorg-xserver/xserver-kdrive-1.4.2/enable-xcalibrate.patch 08d76cc4f9d1c156f3ac72604bd0b9eb126d9b48
@@ -0,0 +1,77 @@
+---
+ 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_ */
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.2/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
+++ packages/xorg-xserver/xserver-kdrive-1.4.2/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.2/linux-keyboard-mediumraw.patch faca4d8feba0272517c84f11ac61a39c0b055556
+++ packages/xorg-xserver/xserver-kdrive-1.4.2/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.2/no_xkb.patch 17027e633e5809ba281942d8c0a5d96710ff3b44
+++ packages/xorg-xserver/xserver-kdrive-1.4.2/no_xkb.patch 17027e633e5809ba281942d8c0a5d96710ff3b44
@@ -0,0 +1,12 @@
+--- 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);
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch 93931fd9a64ed0b3fee8337b05894bab22e14f63
+++ packages/xorg-xserver/xserver-kdrive-1.4.2/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.2.bb b2ad79cb8f03fec0ebecebdde76443a33a601362
+++ packages/xorg-xserver/xserver-kdrive_1.4.2.bb b2ad79cb8f03fec0ebecebdde76443a33a601362
@@ -0,0 +1,33 @@
+require xserver-kdrive-common.inc
+
+DEPENDS += "h%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list