wok-current rev 19397
Up brotli (0.5.2)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Sep 02 13:32:28 2016 +0200 (2016-09-02) |
parents | 4458f0f34c92 |
children | 80800de950ff |
files | brotli/receipt memtest/stuff/memtest86+-5.01-setup.patch |
line diff
1.1 --- a/brotli/receipt Thu Sep 01 16:30:12 2016 +0200 1.2 +++ b/brotli/receipt Fri Sep 02 13:32:28 2016 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="brotli" 1.7 -VERSION="0.3.0" 1.8 +VERSION="0.5.2" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="A generic-purpose lossless compression algorithm." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 @@ -12,21 +12,18 @@ 1.13 TAGS="compression" 1.14 1.15 DEPENDS="gcc-lib-base" 1.16 -BUILD_DEPENDS="python-dev setuptools" 1.17 +BUILD_DEPENDS="python-dev setuptools cmake" 1.18 1.19 # Rules to configure and make the package. 1.20 compile_rules() 1.21 { 1.22 - python setup.py build && 1.23 - python setup.py install --root=$DESTDIR 1.24 - sed -i 's/ -std=c++11//' shared.mk 1.25 - cd tools 1.26 - make 1.27 + cmake . 1.28 + make bro 1.29 } 1.30 1.31 # Rules to gen a SliTaz package suitable for Tazpkg. 1.32 genpkg_rules() 1.33 { 1.34 mkdir -p $fs/usr/bin 1.35 - cp -a $src/tools/bro $fs/usr/bin/ 1.36 + cp -a $src/bin/bro $fs/usr/bin/ 1.37 }
2.1 --- a/memtest/stuff/memtest86+-5.01-setup.patch Thu Sep 01 16:30:12 2016 +0200 2.2 +++ b/memtest/stuff/memtest86+-5.01-setup.patch Fri Sep 02 13:32:28 2016 +0200 2.3 @@ -1,19 +1,20 @@ 2.4 --- memtest86+-5.01/setup.S 2.5 +++ memtest86+-5.01/setup.S 2.6 -@@ -27,11 +27,10 @@ 2.7 +@@ -27,11 +27,11 @@ 2.8 #ljmp $INITSEG, $(reload - start + 0x200) 2.9 reload: 2.10 movw $INITSEG, %ax 2.11 - movw %ax, %ds 2.12 movw %ax, %es 2.13 movw %ax, %fs 2.14 ++ movw %ax, %gs 2.15 movw %ax, %ss # reset the stack to INITSEG:0x4000-12. 2.16 - movw %dx, %sp 2.17 + movw $0x4000-12, %sp 2.18 push %cs 2.19 pop %ds 2.20 lidt idt_48 - start # load idt with 0,0 2.21 -@@ -50,13 +49,13 @@ 2.22 +@@ -50,13 +50,13 @@ 2.23 jz alt_a20_done 2.24 2.25 /* set or clear bit1, the ALT_A20_GATE bit */ 2.26 @@ -32,13 +33,37 @@ 2.27 2.28 /* clear the INIT_NOW bit; don't accidently reset the machine */ 2.29 alt_a20_cont2: 2.30 -@@ -87,8 +86,8 @@ 2.31 +@@ -87,9 +87,9 @@ 2.32 movw $KERNEL_DS, %ax 2.33 movw %ax, %ds 2.34 movw %ax, %es 2.35 - movw %ax, %ss 2.36 movw %ax, %fs 2.37 + movw %ax, %gs 2.38 + movw %ax, %ss 2.39 - movw %ax, %gs 2.40 2.41 data32 ljmp $KERNEL_CS, $(TSTLOAD <<4) # jmp offset 2000 of segment 0x10 (cs) 2.42 + 2.43 +@@ -100,18 +100,16 @@ 2.44 + * No timeout is used - if this hangs there is something wrong with 2.45 + * the machine, and we probably couldn't proceed anyway. 2.46 + */ 2.47 ++has_output: 2.48 ++ call delay 2.49 ++ inb $0x60, %al # read it 2.50 + empty_8042: 2.51 + call delay 2.52 + inb $0x64, %al # 8042 status port 2.53 + cmpb $0xff, %al # from grub-a20-patch, skip if not impl 2.54 + jz empty_8042_ret 2.55 + testb $1, %al # output buffer? 2.56 +- jz no_output 2.57 +- call delay 2.58 +- inb $0x60, %al # read it 2.59 +- jmp empty_8042 2.60 +- 2.61 +-no_output: 2.62 ++ jnz has_output 2.63 + testb $2, %al # is input buffer full? 2.64 + jnz empty_8042 # yes - loop 2.65 + empty_8042_ret: