wok rev 13756

notification-daemon: update bdeps
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 03 10:48:05 2013 +0100 (2013-01-03)
parents c9439823a4b3
children b81932a5d9af
files notification-daemon/receipt syslinux/stuff/iso2exe/README syslinux/stuff/iso2exe/lzcom.S
line diff
     1.1 --- a/notification-daemon/receipt	Wed Jan 02 23:28:05 2013 -0500
     1.2 +++ b/notification-daemon/receipt	Thu Jan 03 10:48:05 2013 +0100
     1.3 @@ -11,7 +11,7 @@
     1.4  
     1.5  DEPENDS="dbus libnotify libcanberra libwnck GConf libogg libvorbis libltdl"
     1.6  BUILD_DEPENDS="dbus-dev libnotify-dev libcanberra-dev GConf-dev \
     1.7 -libwnck-dev libogg-dev libvorbis-dev intltool"
     1.8 +libwnck-dev libogg-dev libvorbis-dev intltool libtool"
     1.9  
    1.10  # Rules to configure and make the package.
    1.11  compile_rules()
     2.1 --- a/syslinux/stuff/iso2exe/README	Wed Jan 02 23:28:05 2013 -0500
     2.2 +++ b/syslinux/stuff/iso2exe/README	Thu Jan 03 10:48:05 2013 +0100
     2.3 @@ -20,6 +20,8 @@
     2.4  - to install SliTaz "a la UMSDOS" in the \slitaz\ subdirectory. The easiest
     2.5    way to install SliTaz. No partitioning. No questions.
     2.6  
     2.7 +- to create a SliTaz USB Key.
     2.8 +
     2.9  
    2.10  Usage:
    2.11  
    2.12 @@ -32,7 +34,7 @@
    2.13  - text	 	launch SliTaz in RAM with text mode
    2.14  - install	SliTaz UMSDOS like installation
    2.15  
    2.16 -If the program name includes one of the supported modes, the according mode is
    2.17 +If the prognam name includes one of the supported modes, the according mode is
    2.18  assumed. Example 'C:\> slitazlive.exe' starts SliTaz in RAM with graphics.
    2.19  
    2.20  
     3.1 --- a/syslinux/stuff/iso2exe/lzcom.S	Wed Jan 02 23:28:05 2013 -0500
     3.2 +++ b/syslinux/stuff/iso2exe/lzcom.S	Thu Jan 03 10:48:05 2013 +0100
     3.3 @@ -3,33 +3,78 @@
     3.4  	
     3.5  ORGCOM	=	0x100
     3.6  STKSZ	=	0x4000			// unlzma needs 16Kb
     3.7 -CODESZ	=	(0x10000-STKSZ)/2	//  max < 16 sectors = 32Kb
     3.8  
     3.9 +#undef	USE_CX_LOADER			// CX should be set by loader
    3.10 +#undef	SETUP_SS			// extends max code size from 47k to 63k
    3.11 +
    3.12 +#ifdef SETUP_SS
    3.13 +STKROOM = 256
    3.14 +#else
    3.15 +STKROOM = STKSZ
    3.16 +#endif
    3.17 +
    3.18 +CODESZ	=	(0x10000-STKROOM)/2	//  max < 16 sectors = 32Kb
    3.19  	.org	0
    3.20  
    3.21  	.globl	_start
    3.22  _start:
    3.23 -	cld
    3.24 -	movw	$packedcode-unpack, %ax
    3.25 -	movw	$packedcode+ORGCOM, %si
    3.26 -	movw	$-STKSZ-CODESZ, %di
    3.27 -	subw	%ax, %di
    3.28 -	pushw	%di
    3.29 -	movw	$CODESZ/2, %cx
    3.30 -	rep
    3.31 -	  movsw				// packed code
    3.32 -	movw	$unpack+ORGCOM, %si
    3.33 -	movw	%di, %bx
    3.34 -	xchgw	%ax, %cx
    3.35 +	movw	$ORGCOM, %ax
    3.36 +	pushw	%ax
    3.37 +	movw	$packedcode+ORGCOM-1, %si
    3.38 +#ifdef USE_CX_LOADER
    3.39 +	pushw	%cx
    3.40 +#endif
    3.41 +	movw	$-STKROOM-1, %di
    3.42 +	movw	$packedcode-unpack-1, %cx
    3.43 +	std
    3.44 +// *               max ~47k                  |     17k
    3.45 +// oouuuuppppppppppppppppppppp-------------------S---16k----
    3.46  	rep
    3.47  	  movsb				// decompressor
    3.48 -	movw	$ORGCOM, %di
    3.49 -	popw	%si
    3.50 +// oo----ppppppppppppppppppppp---------------uuuuS---16k----
    3.51 +#ifdef USE_CX_LOADER
    3.52 +	popw	%cx
    3.53  	pushw	%di
    3.54 -	pushw	%bx
    3.55 +	movsb
    3.56 +	movw	$packedcode+ORGCOM-1, %si
    3.57 +	addw	%cx, %si
    3.58 +#else
    3.59 +	pushw	%di
    3.60 +	movsb
    3.61 +#if (CODESZ % 256) == 0
    3.62 +	movb	$CODESZ/256, %ch
    3.63 +#else
    3.64 +	movw	$CODESZ, %cx		// the loader should update CX ...
    3.65 +#endif
    3.66 +	movw	$packedcode+ORGCOM+CODESZ-1, %si
    3.67 +//	unsigned char *code;		// But we can patch later:
    3.68 +//	size -= * (unsigned short *) (code + 19);
    3.69 +//	* (unsigned short *) (code + 19) += size;
    3.70 +//	* (unsigned short *) (code + 22) += size;
    3.71 +#endif
    3.72 +	rep
    3.73 +	  movsb				// packed code
    3.74 +// oo--------------------ppppppppppppppppppppuuuuS---16k----
    3.75 +//                                           *
    3.76 +	cld
    3.77 +	incw	%di
    3.78 +	xchgw	%ax, %di
    3.79 +	xchgw	%ax, %si
    3.80  	ret
    3.81 +// xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx------uuuuS---16k----
    3.82 +// *               max ~47k                  |     17k
    3.83  
    3.84  unpack:
    3.85 +#ifdef	SETUP_SS
    3.86 +	movw	%ss, %bx
    3.87 +	leaw	STKSZ/16(%bx), %ax
    3.88 +	movw	%ax, %ss
    3.89 +	pushw	%bx
    3.90 +	call	dounpack
    3.91 +	popw	%ss
    3.92 +	ret
    3.93 +dounpack:
    3.94 +#endif
    3.95  #define FLAT16
    3.96  #include "unlzma.S"
    3.97