import clean BK tree at cset 1.3670

7 files changed, 216 insertions, 0 deletions

diff --git a/packages/nonworking/xfree86/.mtn2git_empty b/packages/nonworking/xfree86/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/xfree86/.mtn2git_empty
diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/.mtn2git_empty b/packages/nonworking/xfree86/xfree86-4.3.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/xfree86/xfree86-4.3.0/.mtn2git_empty
diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch b/packages/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch
index e69de29bb2..dbddb41bee 100644
--- a/packages/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch
+++ b/packages/nonworking/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch
@@ -0,0 +1,35 @@
+--- xc/programs/xterm/util.c.orig	2003-03-18 00:24:46.000000000 +0000
++++ xc/programs/xterm/util.c	2003-03-18 00:21:37.000000000 +0000
+@@ -1336,7 +1336,7 @@
+     }
+ #endif
+     ReverseOldColors();
+-    update_reversevideo();
++    //    update_reversevideo();
+ }
+ 
+ void
+@@ -2111,10 +2111,12 @@
+ {
++    /*
+     update_delete_del();
+     update_old_fkeys();
+     update_hp_fkeys();
+     update_sco_fkeys();
+     update_sun_fkeys();
+     update_sun_kbd();
++    */
+ }
+ 
+ void
+@@ -2145,8 +2147,8 @@
+     }
+ 
+     if (save != term->keyboard.type) {
+-	update_keyboard_type();
+-    }
++      //update_keyboard_type();
++       }
+ }
+ 
+ void
diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/host.def b/packages/nonworking/xfree86/xfree86-4.3.0/host.def
index e69de29bb2..586c04f5f2 100644
--- a/packages/nonworking/xfree86/xfree86-4.3.0/host.def
+++ b/packages/nonworking/xfree86/xfree86-4.3.0/host.def
@@ -0,0 +1,22 @@
+#define KDriveXServer              YES
+#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension -fexpensive-optimizations -fomit-frame-pointer -O2 -march=armv4 -mtune=xscale -mapcs-32
+#define TinyXServer                YES
+#define CrossCompiling             YES 
+#define TouchScreen                YES
+#define ItsyCompilerBug            YES
+#undef BuildRandR
+#define BuildRandR                 YES
+#define BuildXInputLib             YES
+#define ProjectRoot                /usr/X11R6
+#define Freetype2Dir               $(TOP)/extras/freetype2
+#define Freetype2LibDir            $(TOP)/exports/lib
+#define BuildXTrueType             YES
+#define BuildScreenSaverExt        YES
+#define BuildScreenSaverLibrary    YES
+#define SharedLibXss               YES
+#define ServerXdmcpDefines
+#define XfbdevServer               YES
+#define HasTsLib                   YES
+#define BuildXResExt               YES
+#define XResExtension              YES
+#define BuildXcursorgen            NO
diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch b/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch
index e69de29bb2..2c5355c9e4 100644
--- a/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch
+++ b/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch
@@ -0,0 +1,37 @@
+--- xc/programs/Xserver/hw/kdrive/linux/keyboard.c.orig	2001-11-08 10:26:24.000000000 +0000
++++ xc/programs/Xserver/hw/kdrive/linux/keyboard.c	2003-03-11 21:13:09.000000000 +0000
+@@ -397,12 +397,13 @@
+ static struct termios	LinuxTermios;
+ static int		LinuxKbdType;
+ 
+-void
++int
+ LinuxKeyboardEnable (int fd, void *closure)
+ {
+     struct termios nTty;
+     unsigned char   buf[256];
+     int		    n;
++    int             fd_orig_flags;
+ 
+     ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
+     tcgetattr (fd, &LinuxTermios);
+@@ -420,9 +421,18 @@
+     tcsetattr(fd, TCSANOW, &nTty);
+     /*
+      * Flush any pending keystrokes
++     *
++     * Also set to nonblock, just to be safe
+      */
++    fd_orig_flags  =  fcntl( fd , F_GETFL, 0 );
++    fcntl ( fd, F_SETFL, fd_orig_flags | O_NONBLOCK );
++
+     while ((n = read (fd, buf, sizeof (buf))) > 0)
+-	;
++    	;
++
++    fcntl ( fd ,  F_SETFL, fd_orig_flags );
++
++    return fd;
+ }
+ 
+ void
diff --git a/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch b/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch
index e69de29bb2..dc1cc86343 100644
--- a/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch
+++ b/packages/nonworking/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch
@@ -0,0 +1,69 @@
+--- xc/programs/Xserver/hw/kdrive/linux/tslib.c.orig	2002-11-05 05:28:06.000000000 +0000
++++ xc/programs/Xserver/hw/kdrive/linux/tslib.c	2003-03-11 21:11:37.000000000 +0000
+@@ -119,6 +119,29 @@
+ int TsInputType;
+ 
+ int
++TslibEnable (int not_needed_fd, void *closure)
++{
++  KdMouseInfo	    *mi = closure;
++  int		     fd = 0;
++
++  if(!(tsDev = ts_open(mi->name, 0))) {
++    fprintf(stderr, "%s() failed to open %s\n", __func__, mi->name );
++    return -1; 			/* XXX Not sure what to return here */
++  }
++  
++  ts_config(tsDev); 
++  fd=ts_fd(tsDev);
++
++  return fd;
++}
++
++void
++TslibDisable (int fd, void *closure)
++{
++  ts_close(tsDev);
++}
++
++int
+ TslibInit (void)
+ {
+     int		i;
+@@ -128,7 +151,7 @@
+ 
+     if (!TsInputType)
+ 	TsInputType = KdAllocInputType ();
+-    
++
+     for (mi = kdMouseInfo; mi; mi = next)
+     {
+ 	next = mi->next;
+@@ -148,14 +171,25 @@
+ 		    break;
+ 		}
+ 	    }
++	} else {
++
++	  if(!(tsDev = ts_open(mi->name,0))) 
++	    continue;
++	  ts_config(tsDev); 
++	  fd=ts_fd(tsDev);
++
+ 	}
+ 
+ 	if (fd > 0 && tsDev != 0) 
+ 	  {
+ 	    mi->driver = (void *) fd;
+ 	    mi->inputType = TsInputType;
+-	    	if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
+-		    n++;
++	    if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
++	      n++;
++
++	    /* Set callbacks for vt switches etc */
++	    KdRegisterFdEnableDisable (fd, TslibEnable, TslibDisable);
++
+ 	  } 
+ 	else 
+ 	  if (fd > 0) close(fd);
diff --git a/packages/nonworking/xfree86/xfree86_4.3.0.bb b/packages/nonworking/xfree86/xfree86_4.3.0.bb
index e69de29bb2..84dc69ecb6 100644
--- a/packages/nonworking/xfree86/xfree86_4.3.0.bb
+++ b/packages/nonworking/xfree86/xfree86_4.3.0.bb
@@ -0,0 +1,53 @@
+SECTION="base"
+PRIORITY="required"
+MAINTAINER="Greg Gilbert <greg@treke.net>"
+DEPENDS=zlib tslib ncurses
+
+SRC_URI = "ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz;"
+SRC_URI_append =" ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz;"
+SRC_URI_append =" ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz;"
+SRC_URI_append =" file://${FILESDIR}/tinyx-kbd-enable-fix.patch;patch=1"
+SRC_URI_append =" file://${FILESDIR}/tinyx-tslib-reset-and-vt-switch-fixes.patch;patch=1"
+SRC_URI_append =" file://${FILESDIR}/dirty-3.2-xterm-breakage-fix.patch;patch=1"
+
+S=${WORKDIR}/xc
+
+
+do_configure() {
+    rm -fr ${WORKDIR}/XXcompiler; 
+    mkdir -p ${WORKDIR}/XXcompiler 
+    pushd ./ 
+    cd ${CROSS_DIR}/bin/; 
+    echo ${CC}
+    for i in *; do  
+       echo " linking ${WORKDIR}/XXcompiler/$i to $i"; 
+            ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$i ; 
+            toolname=`echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//`
+            echo `echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//`
+            echo " linking ${WORKDIR}/XXcompiler/$i to $toolname"; 
+            ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$toolname; 
+    done                                   
+    echo "#!/bin/sh" >  ${WORKDIR}/XXcompiler/cc
+    echo "${CC} \$*" >> ${WORKDIR}/XXcompiler/cc
+    chmod 755 ${WORKDIR}/XXcompiler/cc
+    popd ;
+        
+
+}
+
+XCURSORGEN=/usr/local/X11R6/bin/xcursorgen
+EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \
+	      CROSSCOMPILEDIR='${WORKDIR}/XXcompiler' \
+	      EXTRA_LDOPTIONS='${LDFLAGS}' \
+	      EXTRA_INCLUDES='-I${STAGING_DIR}/target/include' "
+do_compile() {
+    sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def; 
+
+    oe_runmake  World
+
+}
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+
+}