[Glibc-bsd-commits] r3151 - in trunk/kfreebsd-8/debian: . arch/amd64 patches

[Petr Salinger]

Author: ps-guest
Date: 2010-08-07 11:17:25 +0000 (Sat, 07 Aug 2010)
New Revision: 3151

Added:
   trunk/kfreebsd-8/debian/patches/106_teken_op.diff
Modified:
   trunk/kfreebsd-8/debian/arch/amd64/amd64.config
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
* teach how to handle orig_pair ESC sequence for TERM=cons25. Closes: #559364.    
* enable VESA also for 64-bit kernel, similarly as for 32-bits kernels since 8.0-3


Modified: trunk/kfreebsd-8/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/amd64/amd64.config	2010-08-06 20:48:16 UTC (rev 3150)
+++ trunk/kfreebsd-8/debian/arch/amd64/amd64.config	2010-08-07 11:17:25 UTC (rev 3151)
@@ -13,6 +13,7 @@
 options		TMPFS
 
 # UTF-8 console support
+options		VESA
 options		SC_PIXEL_MODE	# add support for the raster text mode
 options		TEKEN_UTF8	# UTF-8 output handling
 options		TEKEN_XTERM	# xterm-style terminal emulation

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2010-08-06 20:48:16 UTC (rev 3150)
+++ trunk/kfreebsd-8/debian/changelog	2010-08-07 11:17:25 UTC (rev 3151)
@@ -1,7 +1,18 @@
+kfreebsd-8 (8.1-4) UNSTABLE; urgency=low
+
+  [ Petr Salinger]
+  * Report i686 instead of i386 on amd64 machine for 32-bit binaries.
+  * Teach how to handle orig_pair ESC sequence for TERM=cons25.
+    Closes: #559364.    
+  * enable VESA also for 64-bit kernel, similarly as for 32-bits
+    kernels since 8.0-3
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 06 Aug 2010 06:58:01 +0200
+
 kfreebsd-8 (8.1-3) unstable; urgency=high
 
   [ Aurelien Jarno ]
-  * Backport adaptive_machine_arch support from -CURRENT, change and amd64
+  * Backport adaptive_machine_arch support from -CURRENT, change an amd64
     machine into i386 for 32-bit binaries.
   * Call postinst/postrm hooks as defined by the "Policy for Linux kernel, 
     initramfs, boot loader update process".

Added: trunk/kfreebsd-8/debian/patches/106_teken_op.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/106_teken_op.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/106_teken_op.diff	2010-08-07 11:17:25 UTC (rev 3151)
@@ -0,0 +1,34 @@
+
+  teach how to handle orig_pair ESC sequence 
+  generated by "TERM=cons25 tput op"
+   TERM=cons25 tput op | od -ax
+  see #559364
+
+--- a/sys/dev/syscons/teken/sequences
++++ b/sys/dev/syscons/teken/sequences
+@@ -88,6 +88,7 @@
+ IL	Insert line				^[ [ L		n
+ IND	Index					^[ D
+ NEL	Next line				^[ E
++OP	Orig Pair				^[ [ x
+ RI	Reverse index				^[ M
+ RIS	Reset to Initial State			^[ c
+ RM	Reset Mode				^[ [ l		r
+--- a/sys/dev/syscons/teken/teken_subr.h
++++ b/sys/dev/syscons/teken/teken_subr.h
+@@ -1056,6 +1056,15 @@
+ }
+ 
+ static void
++teken_subr_orig_pair(teken_t *t)
++{
++	/* Set default foreground color. */
++	t->t_curattr.ta_fgcolor = t->t_defattr.ta_fgcolor;
++	/* Set default background color. */
++	t->t_curattr.ta_bgcolor = t->t_defattr.ta_bgcolor;
++}
++
++static void
+ teken_subr_set_graphic_rendition(teken_t *t, unsigned int ncmds,
+     unsigned int cmds[])
+ {

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2010-08-06 20:48:16 UTC (rev 3150)
+++ trunk/kfreebsd-8/debian/patches/series	2010-08-07 11:17:25 UTC (rev 3151)
@@ -14,6 +14,7 @@
 103_stat_pipe.diff
 104_linprocfs.diff
 105_apm_amd64.diff
+106_teken_op.diff
 902_version.diff
 903_disable_non-free_drivers.diff 
 904_dev_full.diff