Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 84 insertions, 4 deletions

diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index edb7d0a67..5e26c53b8 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xterm
-PKG_VERSION:=		267
+PKG_VERSION:=		297
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3945ab70cfa2a9e95804157ee1b0f8e8
+PKG_MD5SUM:=		45610ae6fe90cf086fcd75b9cb97bbaf
 PKG_DESCR:=		Terminal Emulator for X Windows
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libxaw libxt libncurses libxft fontconfig
@@ -20,7 +20,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XTERM,xterm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--with-app-defaults=/usr/lib/X11/app-defaults
+CONFIGURE_ARGS+=	--with-app-defaults=/usr/lib/X11/app-defaults \
+			--disable-pty-handshake
 
 xterm-install:
 	$(INSTALL_DIR) $(IDIR_XTERM)/usr/bin
diff --git a/package/xterm/patches/patch-main_c b/package/xterm/patches/patch-main_c
new file mode 100644
index 000000000..dbe55d4ed
--- /dev/null
+++ b/package/xterm/patches/patch-main_c
@@ -0,0 +1,41 @@
+--- xterm-297.orig/main.c	2013-05-28 00:11:11.000000000 +0200
++++ xterm-297/main.c	2013-10-31 12:24:52.000000000 +0100
+@@ -2583,7 +2583,7 @@ main(int argc, char *argv[]ENVP_ARG)
+     }
+ }
+ 
+-#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ #define USE_OPENPTY 1
+ static int opened_tty = -1;
+ #endif
+@@ -3134,7 +3134,7 @@ find_utmp(struct UTMP_STR *tofind)
+ 
+ #define close_fd(fd) close(fd), fd = -1
+ 
+-#if defined(TIOCNOTTY) && (!defined(__GLIBC__) || (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))
++#if defined(TIOCNOTTY) && defined(__linux__)
+ #define USE_NO_DEV_TTY 1
+ #else
+ #define USE_NO_DEV_TTY 0
+@@ -3378,7 +3378,8 @@ spawnXTerm(XtermWidget xw)
+ 	    }
+ #endif /* __MVS__ */
+ 
+-	    close_fd(ttyfd);
++	    // do not close it here
++	    // close_fd(ttyfd);
+ 	}
+ 
+ 	if (get_pty(&screen->respond, XDisplayString(screen->display))) {
+@@ -3807,8 +3808,9 @@ spawnXTerm(XtermWidget xw)
+ 		   eg. by lineedit in the shell, or emacs, etc. then tio
+ 		   will have bad values.  Let's just get termio from the
+ 		   new tty and tailor it.  */
+-		if (ttyGetAttr(ttyfd, &tio) == -1)
++		if (ttyGetAttr(ttyfd, &tio) == -1) {
+ 		    SysError(ERROR_TIOCGETP);
++		}
+ 		tio.c_lflag |= ECHOE;
+ #endif /* umips */
+ 		/* Now is also the time to change the modes of the
diff --git a/package/xterm/patches/patch-ptyx_h b/package/xterm/patches/patch-ptyx_h
new file mode 100644
index 000000000..cd2fa7cad
--- /dev/null
+++ b/package/xterm/patches/patch-ptyx_h
@@ -0,0 +1,11 @@
+--- xterm-297.orig/ptyx.h	2013-09-10 20:10:00.000000000 +0200
++++ xterm-297/ptyx.h	2013-10-30 10:30:07.000000000 +0100
+@@ -169,7 +169,7 @@
+ #define USE_PTY_DEVICE 1
+ #define USE_PTY_SEARCH 1
+ 
+-#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__osf__) || defined(linux) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ #undef USE_PTY_DEVICE
+ #undef USE_PTY_SEARCH
+ #define USE_PTS_DEVICE 1
diff --git a/package/xterm/patches/patch-xterm_h b/package/xterm/patches/patch-xterm_h
new file mode 100644
index 000000000..7a3418a11
--- /dev/null
+++ b/package/xterm/patches/patch-xterm_h
@@ -0,0 +1,11 @@
+--- xterm-297.orig/xterm.h	2013-09-10 12:55:04.000000000 +0200
++++ xterm-297/xterm.h	2013-10-30 17:19:53.000000000 +0100
+@@ -99,7 +99,7 @@
+ #define HAVE_PUTENV 1
+ #endif
+ 
+-#if defined(CSRG_BASED) || defined(__GNU__)
++#if defined(CSRG_BASED) || defined(__linux__)
+ #define USE_POSIX_TERMIOS 1
+ #endif
+ 
diff --git a/package/xterm/patches/patch-xterm_io_h b/package/xterm/patches/patch-xterm_io_h
new file mode 100644
index 000000000..3ca39b3f6
--- /dev/null
+++ b/package/xterm/patches/patch-xterm_io_h
@@ -0,0 +1,11 @@
+--- xterm-297.orig/xterm_io.h	2013-01-06 16:20:45.000000000 +0100
++++ xterm-297/xterm_io.h	2013-10-30 17:21:10.000000000 +0100
+@@ -66,7 +66,7 @@
+ #endif
+ 
+ #ifdef linux
+-#define USE_TERMIOS
++#define USE_POSIX_TERMIOS
+ #endif
+ 
+ #ifdef __SCO__
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 1459039b6..e2e3051da 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -176,6 +176,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_KPACKAGE_KMOD_USB
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
diff --git a/target/packages/pkg-available/xorg b/target/packages/pkg-available/xorg
index 5a41eede2..fdb5667da 100644
--- a/target/packages/pkg-available/xorg
+++ b/target/packages/pkg-available/xorg
@@ -22,6 +22,8 @@ config ADK_PKG_XORG
 	select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_TAROX_PC
+	select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_I686
+	select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_PACKAGE_FONT_MISC_MISC
 	select ADK_PACKAGE_SETXKBMAP
 	select ADK_PACKAGE_XBINDKEYS
diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686
index d77d074e3..e78d6579b 100644
--- a/target/x86/sys-available/qemu-i686
+++ b/target/x86/sys-available/qemu-i686
@@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_QEMU_I686
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_WITH_USB
 	help
 	 Support for Qemu Emulator (i686).
 
diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64
index bf3079be7..abffcaae9 100644
--- a/target/x86_64/sys-available/qemu-x86_64
+++ b/target/x86_64/sys-available/qemu-x86_64
@@ -7,9 +7,9 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_MAY_64BIT
 	help
 	 Support for Qemu Emulator.