wok-current rev 22632
linux: add CONFIG_SND_PCSP
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Jan 13 11:52:56 2020 +0100 (2020-01-13) |
| parents | c7c1f3ae73ab |
| children | 6222d1b9c074 |
| files | clipit/receipt duc/receipt enna/receipt libesmtp-dev/receipt libesmtp/receipt linld/stuff/src/COMMON.H linld/stuff/src/CRTL.ASM linld/stuff/src/CRTL.H linld/stuff/src/HIMEM.CPP linld/stuff/src/ISO9660.CPP linld/stuff/src/LINLD.CPP linld/stuff/src/LOAD.CPP linld/stuff/src/TAZBOOT.CPP linld/stuff/src/XMM.ASM linld/stuff/src/pipehole.awk linux/stuff/linux-slitaz.config linux/stuff/linux-slitaz.config64 usb-modeswitch-data/receipt usb-modeswitch/receipt |
line diff
1.1 --- a/clipit/receipt Mon Jan 13 08:55:12 2020 +0100 1.2 +++ b/clipit/receipt Mon Jan 13 11:52:56 2020 +0100 1.3 @@ -6,7 +6,7 @@ 1.4 SHORT_DESC="Lightweight, fully featured GTK+ clipboard manager" 1.5 MAINTAINER="al.bobylev@gmail.com" 1.6 LICENSE="GPL3" 1.7 -WEB_SITE="http://clipit.rspwn.com/" 1.8 +WEB_SITE="https://github.com/CristianHenzel/ClipIt" 1.9 1.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.11 WGET_URL="https://github.com/CristianHenzel/ClipIt/archive/v$VERSION.tar.gz"
2.1 --- a/duc/receipt Mon Jan 13 08:55:12 2020 +0100 2.2 +++ b/duc/receipt Mon Jan 13 11:52:56 2020 +0100 2.3 @@ -7,8 +7,8 @@ 2.4 MAINTAINER="pascal.bellard@slitaz.org" 2.5 LICENSE="LGPL3" 2.6 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.7 -WEB_SITE="https://duc.zevv.nl/" 2.8 -WGET_URL="https://github.com/zevv/duc/releases/download/$VERSION/$TARBALL" 2.9 +WEB_SITE="https://github.com/zevv/duc" 2.10 +WGET_URL="$WEB_SITE/releases/download/$VERSION/$TARBALL" 2.11 2.12 DEPENDS="ncursesw pango tokyocabinet" 2.13 BUILD_DEPENDS="ncursesw-dev pango-dev tokyocabinet-dev"
3.1 --- a/enna/receipt Mon Jan 13 08:55:12 2020 +0100 3.2 +++ b/enna/receipt Mon Jan 13 11:52:56 2020 +0100 3.3 @@ -6,7 +6,7 @@ 3.4 SHORT_DESC="Enna media center." 3.5 MAINTAINER="pankso@slitaz.org" 3.6 LICENSE="LGPL2.1" 3.7 -WEB_SITE="http://enna.geexbox.org/" 3.8 +WEB_SITE="https://enna.geexbox.org/" 3.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 3.10 WGET_URL="hg|http://hg.geexbox.org/enna" 3.11 BRANCH="$VERSION"
4.1 --- a/libesmtp-dev/receipt Mon Jan 13 08:55:12 2020 +0100 4.2 +++ b/libesmtp-dev/receipt Mon Jan 13 11:52:56 2020 +0100 4.3 @@ -6,7 +6,7 @@ 4.4 SHORT_DESC="Lesmpt headers files." 4.5 MAINTAINER="erjo@slitaz.org" 4.6 LICENSE="GPL2" 4.7 -WEB_SITE="http://brianstafford.info/libesmtp/" 4.8 +WEB_SITE="http://freecode.com/projects/libesmtp/" 4.9 WANTED="libesmtp" 4.10 4.11 DEPENDS="libesmtp"
5.1 --- a/libesmtp/receipt Mon Jan 13 08:55:12 2020 +0100 5.2 +++ b/libesmtp/receipt Mon Jan 13 11:52:56 2020 +0100 5.3 @@ -6,7 +6,7 @@ 5.4 SHORT_DESC="A Library for Posting Electronic Mai" 5.5 MAINTAINER="erjo@slitaz.org" 5.6 LICENSE="GPL2" 5.7 -WEB_SITE="http://brianstafford.info/libesmtp/" 5.8 +WEB_SITE="http://freecode.com/projects/libesmtp/" 5.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 5.10 WGET_URL="http://www.stafford.uklinux.net/libesmtp/$TARBALL" 5.11
6.1 --- a/linld/stuff/src/COMMON.H Mon Jan 13 08:55:12 2020 +0100 6.2 +++ b/linld/stuff/src/COMMON.H Mon Jan 13 11:52:56 2020 +0100 6.3 @@ -55,7 +55,7 @@ 6.4 #define pm2initrd(p) (p+1) 6.5 6.6 extern u8 pm_low; 6.7 -extern int skip_alloc; 6.8 +extern u16 skip_alloc; 6.9 extern u32 base_himem; 6.10 extern u32 far *initrd_desc; 6.11
7.1 --- a/linld/stuff/src/CRTL.ASM Mon Jan 13 08:55:12 2020 +0100 7.2 +++ b/linld/stuff/src/CRTL.ASM Mon Jan 13 11:52:56 2020 +0100 7.3 @@ -282,19 +282,12 @@ 7.4 endp @read$qipvi 7.5 7.6 ;*************************************************************** 7.7 -;_fastcall long lseekcur(ax:int fd, dx:int whence); 7.8 +;_fastcall long rewind(ax:int fd); 7.9 ;*************************************************************** 7.10 7.11 - global @lseekcur$qii:near ; fd=ax whence=dx 7.12 - proc @lseekcur$qii near 7.13 + global @rewind$qi:near ; fd=ax 7.14 + proc @rewind$qi near 7.15 7.16 - mov cl,1 7.17 - xchg ax,bx 7.18 - xchg ax,dx 7.19 - cwd 7.20 - xchg ax,dx 7.21 - xchg ax,cx 7.22 - jmp lseek 7.23 rewind: ; rewind(ax) 7.24 mov bl,0 7.25 lseek0: ; lseek0(ax,bl=dir) 7.26 @@ -306,12 +299,12 @@ 7.27 mov ah,42h ; bx=fd cx:dx=offset al=whence 7.28 jmp dos 7.29 7.30 - endp @lseekcur$qii 7.31 + endp @rewind$qi 7.32 7.33 ifdef EXTRA 7.34 ;*************************************************************** 7.35 ;_fastcall long isolseek(bx:const unsigned long *offset); 7.36 -;_fastcall long lseekset2(ax:int fd, bx:unsigned long* whence); 7.37 +;_fastcall long lseekset2(ax:int fd, bx:unsigned long* offset); 7.38 ;*************************************************************** 7.39 global @isolseek$qpxul:near 7.40 proc @isolseek$qpxul near 7.41 @@ -1087,7 +1080,7 @@ 7.42 cwd 7.43 jmp @@popsiret 7.44 @@notvga: 7.45 - mov cx,10 ; radix 7.46 + mov cl,10 ; radix 7.47 cmp al,'-' 7.48 ja @@radixkeep 7.49 cmc ; '+'=2B:C=0 '-'=2D:C=1 7.50 @@ -1162,11 +1155,11 @@ 7.51 ifndef USE_ARGSTR 7.52 mov si,bx 7.53 endif 7.54 + xor cx,cx 7.55 lodsb 7.56 or al,20h 7.57 cmp al,'a' 7.58 jb @@notvga 7.59 - xor cx,cx 7.60 sub al,'n' 7.61 @@vgaloop: 7.62 dec cx 7.63 @@ -1177,7 +1170,7 @@ 7.64 @@goend: 7.65 jmp @@popdisiret 7.66 @@notvga: 7.67 - mov cx,10 ; radix 7.68 + mov cl,10 ; radix 7.69 cmp al,'-' 7.70 ja @@radixkeep 7.71 cmc ; '+'=2B:C=0 '-'=2D:C=1
8.1 --- a/linld/stuff/src/CRTL.H Mon Jan 13 08:55:12 2020 +0100 8.2 +++ b/linld/stuff/src/CRTL.H Mon Jan 13 11:52:56 2020 +0100 8.3 @@ -37,7 +37,7 @@ 8.4 extern _fastcall int moverm(unsigned short *p); 8.5 extern _fastcall int readrm(struct image_himem *m, int sz); 8.6 extern _fastcall int read(int fd, void* data, int sz); 8.7 -extern _fastcall long lseekcur(int fd, int whence); 8.8 +extern _fastcall long rewind(int fd); 8.9 extern _fastcall int puts(const char* s); 8.10 extern _fastcall unsigned long strtol(const char *s); 8.11
9.1 --- a/linld/stuff/src/HIMEM.CPP Mon Jan 13 08:55:12 2020 +0100 9.2 +++ b/linld/stuff/src/HIMEM.CPP Mon Jan 13 11:52:56 2020 +0100 9.3 @@ -6,14 +6,14 @@ 9.4 #include "crtl.h" 9.5 #include "common.h" 9.6 9.7 -int skip_alloc; 9.8 +u16 skip_alloc; 9.9 9.10 void load_image(struct image_himem *m) { 9.11 m->remaining = m->size; 9.12 m->buf = m->fallback; // set no_exit btw: die() won't return to DOS 9.13 u32 buf; 9.14 u32* bufv= &buf; 9.15 - if(((u16 *)&m->fallback)[1] >= 0x10 && !skip_alloc) { // >= _1m ? 9.16 + if(((u16 *)&m->fallback)[1] >= (skip_alloc|0x10)) { // >= _1m ? 9.17 if(vcpi) { 9.18 bufv = (u32 *)malloc_bufv_or_die(m); // update m->bufv 9.19 }
10.1 --- a/linld/stuff/src/ISO9660.CPP Mon Jan 13 08:55:12 2020 +0100 10.2 +++ b/linld/stuff/src/ISO9660.CPP Mon Jan 13 11:52:56 2020 +0100 10.3 @@ -84,7 +84,7 @@ 10.4 p--; 10.5 if (((* (short *) p) & 0xFEFF) -1 == 0) { 10.6 x->filename = ".."; 10.7 - if ((* (short *) p) == 1) 10.8 + if (--(* (short *) p) == 0) 10.9 x->filename++; 10.10 } 10.11 else {
11.1 --- a/linld/stuff/src/LINLD.CPP Mon Jan 13 08:55:12 2020 +0100 11.2 +++ b/linld/stuff/src/LINLD.CPP Mon Jan 13 11:52:56 2020 +0100 11.3 @@ -63,7 +63,7 @@ 11.4 if (cpuhaslm() == 0) exit(); 11.5 } 11.6 if ((*(u16 *)*argv|0x2002) == 0x662F) { // -F /f 11.7 - skip_alloc++; 11.8 + skip_alloc--; 11.9 } 11.10 else if (argstr(*argv,"cl|image|initrd",clp) != -1); 11.11 else if (fileexist(*argv) != -1) 11.12 @@ -105,7 +105,7 @@ 11.13 if (cpuhaslm() == 0) exit(); 11.14 goto next; 11.15 case 0x662F: // -F /f 11.16 - skip_alloc++; 11.17 + skip_alloc--; 11.18 goto next; 11.19 case 0x622F: // -B /b 11.20 argv++;
12.1 --- a/linld/stuff/src/LOAD.CPP Mon Jan 13 08:55:12 2020 +0100 12.2 +++ b/linld/stuff/src/LOAD.CPP Mon Jan 13 11:52:56 2020 +0100 12.3 @@ -138,7 +138,7 @@ 12.4 do { 12.5 if (readrm(m, 0x200) == 0x200) { 12.6 12.7 - lseekcur(m->fd,-0x200); 12.8 + rewind(m->fd); 12.9 if(kernelparams->setup_sects == 0) { 12.10 #if 1 12.11 if(* (int *) &first1k->pad10[0x3F-0x24] == 0x3AE8) {
13.1 --- a/linld/stuff/src/TAZBOOT.CPP Mon Jan 13 08:55:12 2020 +0100 13.2 +++ b/linld/stuff/src/TAZBOOT.CPP Mon Jan 13 11:52:56 2020 +0100 13.3 @@ -73,7 +73,7 @@ 13.4 struct isostate *x=&isostate; 13.5 13.6 if (isoreset(*iso) == -1) return; 13.7 - skip_alloc++; 13.8 + skip_alloc--; 13.9 base_himem = memtop() /2; 13.10 //if (base_himem >= _64m) base_himem = _64m; 13.11 if (* ((char *) &base_himem +3) >= 4) ((short *)&base_himem)[1] = _64m/_64k; 13.12 @@ -193,7 +193,7 @@ 13.13 } 13.14 #ifdef USE_ARGSTR 13.15 if ((*(u16 *)s|0x2002) == 0x662F) { // -F /f 13.16 - skip_alloc++; 13.17 + skip_alloc--; 13.18 goto next; 13.19 } 13.20 if (argstr(s,"kernel/image|initrd|bootfrom/iso",&kernel_name) != -1); 13.21 @@ -232,7 +232,7 @@ 13.22 } 13.23 else switch (*(u16 *)s|0x2002) { 13.24 case 0x662F: // -F /f 13.25 - skip_alloc++; 13.26 + skip_alloc--; 13.27 goto next; 13.28 case 0x652F: // -E /e 13.29 s=*++argv;
14.1 --- a/linld/stuff/src/XMM.ASM Mon Jan 13 08:55:12 2020 +0100 14.2 +++ b/linld/stuff/src/XMM.ASM Mon Jan 13 11:52:56 2020 +0100 14.3 @@ -46,14 +46,17 @@ 14.4 mov si,offset xmm_handler 14.5 ifndef NO386 14.6 cmp [dword si],0 14.7 - else 14.8 - mov cx,[word si] 14.9 - or cx,[word si+2] 14.10 - endif 14.11 jne @@gotit 14.12 - 14.13 push ax ; save cmd 14.14 mov ax,4300h ; installation check in al 14.15 + else 14.16 + push ax ; save cmd 14.17 + lodsw 14.18 + or ax,[word si] 14.19 + jne @@gotit 14.20 + mov ah,43h ; installation check in al 14.21 + endif 14.22 + 14.23 int 2fh 14.24 mov bx,offset xmm_fail 14.25 push ds 14.26 @@ -63,11 +66,19 @@ 14.27 mov ax,4310h ; get driver address in es:bx 14.28 int 2fh 14.29 @@err: 14.30 + ifndef NO386 14.31 pop ax ; restore cmd 14.32 mov [si],bx 14.33 mov [si+2],es 14.34 @@gotit: 14.35 call [dword si] ; far ptr [si] 14.36 + else 14.37 + mov [si-2],bx 14.38 + mov [si],es 14.39 +@@gotit: 14.40 + pop ax ; restore cmd 14.41 + call [dword si-2] ; far ptr [si-2] 14.42 + endif 14.43 dec ax ; Z=1=OK 14.44 pop si 14.45 ret
15.1 --- a/linld/stuff/src/pipehole.awk Mon Jan 13 08:55:12 2020 +0100 15.2 +++ b/linld/stuff/src/pipehole.awk Mon Jan 13 11:52:56 2020 +0100 15.3 @@ -77,17 +77,6 @@ 15.4 } 15.5 } # file == "himem.cpp" 15.6 if (file == "load.cpp") { 15.7 - if (/== 0x200/) isload=13 15.8 - if (isload == 13) { # LOAD.LST 15.9 - if (/cmp/) { 15.10 - print " mov dx,-512" 15.11 - $0=" add ax,dx" 15.12 - } 15.13 - if (/dx,-512/) { 15.14 - isload=0 15.15 - $0="; " $0 15.16 - } 15.17 - } 15.18 if (/i\+21\],513$/) isload=11 15.19 if (isload == 12) { # LOAD.LST 15.20 if (/cmp/) next
16.1 --- a/linux/stuff/linux-slitaz.config Mon Jan 13 08:55:12 2020 +0100 16.2 +++ b/linux/stuff/linux-slitaz.config Mon Jan 13 11:52:56 2020 +0100 16.3 @@ -4106,7 +4106,7 @@ 16.4 CONFIG_SND_VX_LIB=m 16.5 CONFIG_SND_AC97_CODEC=m 16.6 CONFIG_SND_DRIVERS=y 16.7 -# CONFIG_SND_PCSP is not set 16.8 +CONFIG_SND_PCSP=m 16.9 # CONFIG_SND_DUMMY is not set 16.10 CONFIG_SND_ALOOP=m 16.11 CONFIG_SND_VIRMIDI=m
17.1 --- a/linux/stuff/linux-slitaz.config64 Mon Jan 13 08:55:12 2020 +0100 17.2 +++ b/linux/stuff/linux-slitaz.config64 Mon Jan 13 11:52:56 2020 +0100 17.3 @@ -3742,7 +3742,7 @@ 17.4 CONFIG_SND_VX_LIB=m 17.5 CONFIG_SND_AC97_CODEC=m 17.6 CONFIG_SND_DRIVERS=y 17.7 -# CONFIG_SND_PCSP is not set 17.8 +CONFIG_SND_PCSP=m 17.9 # CONFIG_SND_DUMMY is not set 17.10 CONFIG_SND_ALOOP=m 17.11 CONFIG_SND_VIRMIDI=m
18.1 --- a/usb-modeswitch-data/receipt Mon Jan 13 08:55:12 2020 +0100 18.2 +++ b/usb-modeswitch-data/receipt Mon Jan 13 11:52:56 2020 +0100 18.3 @@ -6,7 +6,7 @@ 18.4 SHORT_DESC="Device database and the rules file for usb_modeswitch." 18.5 MAINTAINER="pankso@slitaz.org" 18.6 LICENSE="GPL2" 18.7 -WEB_SITE="http://www.draisberghof.de/usb_modeswitch/" 18.8 +WEB_SITE="https://www.draisberghof.de/usb_modeswitch/" 18.9 18.10 TARBALL="$PACKAGE-$VERSION.tar.bz2" 18.11 WGET_URL="http://www.draisberghof.de/usb_modeswitch/$TARBALL"
19.1 --- a/usb-modeswitch/receipt Mon Jan 13 08:55:12 2020 +0100 19.2 +++ b/usb-modeswitch/receipt Mon Jan 13 11:52:56 2020 +0100 19.3 @@ -8,7 +8,7 @@ 19.4 SHORT_DESC="Handling Mode-Switching USB Devices on Linux." 19.5 MAINTAINER="pankso@slitaz.org" 19.6 LICENSE="GPL2" 19.7 -WEB_SITE="http://www.draisberghof.de/usb_modeswitch/" 19.8 +WEB_SITE="https://www.draisberghof.de/usb_modeswitch/" 19.9 19.10 TARBALL="$PACKAGE-$VERSION.tar.bz2" 19.11 EXTRA_SOURCE_FILES="$PACKAGE_DATA.tar.bz2 usb_modeswitch.setup"