# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1357206485 -3600
# Node ID 5b84cc8c400237ca0451c469baf92035e4a33fd8
# Parent  c9439823a4b33f1b3658d8c33358ba163d6679c3
notification-daemon: update bdeps

diff -r c9439823a4b3 -r 5b84cc8c4002 notification-daemon/receipt
--- a/notification-daemon/receipt	Wed Jan 02 23:28:05 2013 -0500
+++ b/notification-daemon/receipt	Thu Jan 03 10:48:05 2013 +0100
@@ -11,7 +11,7 @@
 
 DEPENDS="dbus libnotify libcanberra libwnck GConf libogg libvorbis libltdl"
 BUILD_DEPENDS="dbus-dev libnotify-dev libcanberra-dev GConf-dev \
-libwnck-dev libogg-dev libvorbis-dev intltool"
+libwnck-dev libogg-dev libvorbis-dev intltool libtool"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r c9439823a4b3 -r 5b84cc8c4002 syslinux/stuff/iso2exe/README
--- a/syslinux/stuff/iso2exe/README	Wed Jan 02 23:28:05 2013 -0500
+++ b/syslinux/stuff/iso2exe/README	Thu Jan 03 10:48:05 2013 +0100
@@ -20,6 +20,8 @@
 - to install SliTaz "a la UMSDOS" in the \slitaz\ subdirectory. The easiest
   way to install SliTaz. No partitioning. No questions.
 
+- to create a SliTaz USB Key.
+
 
 Usage:
 
@@ -32,7 +34,7 @@
 - text	 	launch SliTaz in RAM with text mode
 - install	SliTaz UMSDOS like installation
 
-If the program name includes one of the supported modes, the according mode is
+If the prognam name includes one of the supported modes, the according mode is
 assumed. Example 'C:\> slitazlive.exe' starts SliTaz in RAM with graphics.
 
 
diff -r c9439823a4b3 -r 5b84cc8c4002 syslinux/stuff/iso2exe/lzcom.S
--- a/syslinux/stuff/iso2exe/lzcom.S	Wed Jan 02 23:28:05 2013 -0500
+++ b/syslinux/stuff/iso2exe/lzcom.S	Thu Jan 03 10:48:05 2013 +0100
@@ -3,33 +3,78 @@
 	
 ORGCOM	=	0x100
 STKSZ	=	0x4000			// unlzma needs 16Kb
-CODESZ	=	(0x10000-STKSZ)/2	//  max < 16 sectors = 32Kb
 
+#undef	USE_CX_LOADER			// CX should be set by loader
+#undef	SETUP_SS			// extends max code size from 47k to 63k
+
+#ifdef SETUP_SS
+STKROOM = 256
+#else
+STKROOM = STKSZ
+#endif
+
+CODESZ	=	(0x10000-STKROOM)/2	//  max < 16 sectors = 32Kb
 	.org	0
 
 	.globl	_start
 _start:
-	cld
-	movw	$packedcode-unpack, %ax
-	movw	$packedcode+ORGCOM, %si
-	movw	$-STKSZ-CODESZ, %di
-	subw	%ax, %di
-	pushw	%di
-	movw	$CODESZ/2, %cx
-	rep
-	  movsw				// packed code
-	movw	$unpack+ORGCOM, %si
-	movw	%di, %bx
-	xchgw	%ax, %cx
+	movw	$ORGCOM, %ax
+	pushw	%ax
+	movw	$packedcode+ORGCOM-1, %si
+#ifdef USE_CX_LOADER
+	pushw	%cx
+#endif
+	movw	$-STKROOM-1, %di
+	movw	$packedcode-unpack-1, %cx
+	std
+// *               max ~47k                  |     17k
+// oouuuuppppppppppppppppppppp-------------------S---16k----
 	rep
 	  movsb				// decompressor
-	movw	$ORGCOM, %di
-	popw	%si
+// oo----ppppppppppppppppppppp---------------uuuuS---16k----
+#ifdef USE_CX_LOADER
+	popw	%cx
 	pushw	%di
-	pushw	%bx
+	movsb
+	movw	$packedcode+ORGCOM-1, %si
+	addw	%cx, %si
+#else
+	pushw	%di
+	movsb
+#if (CODESZ % 256) == 0
+	movb	$CODESZ/256, %ch
+#else
+	movw	$CODESZ, %cx		// the loader should update CX ...
+#endif
+	movw	$packedcode+ORGCOM+CODESZ-1, %si
+//	unsigned char *code;		// But we can patch later:
+//	size -= * (unsigned short *) (code + 19);
+//	* (unsigned short *) (code + 19) += size;
+//	* (unsigned short *) (code + 22) += size;
+#endif
+	rep
+	  movsb				// packed code
+// oo--------------------ppppppppppppppppppppuuuuS---16k----
+//                                           *
+	cld
+	incw	%di
+	xchgw	%ax, %di
+	xchgw	%ax, %si
 	ret
+// xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx------uuuuS---16k----
+// *               max ~47k                  |     17k
 
 unpack:
+#ifdef	SETUP_SS
+	movw	%ss, %bx
+	leaw	STKSZ/16(%bx), %ax
+	movw	%ax, %ss
+	pushw	%bx
+	call	dounpack
+	popw	%ss
+	ret
+dounpack:
+#endif
 #define FLAT16
 #include "unlzma.S"