wok-6.x rev 25453

BootProg/boot16.asm: too small fat16 support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Sep 17 08:17:46 2022 +0000 (2022-09-17)
parents e3609bca2577
children 78727b04c002
files BootProg/stuff/boot16.asm gxine/receipt libtirpc-dev/receipt libtirpc/receipt net-snmp-dev/receipt net-snmp/receipt xine-lib/receipt xine-ui/receipt
line diff
     1.1 --- a/BootProg/stuff/boot16.asm	Thu Sep 15 10:06:54 2022 +0000
     1.2 +++ b/BootProg/stuff/boot16.asm	Sat Sep 17 08:17:46 2022 +0000
     1.3 @@ -306,28 +306,24 @@
     1.4  
     1.5  FAT12   	equ       1
     1.6  FAT16   	equ       1
     1.7 -        push    di                      ; up to 2 * 635K / BytesPerCluster bytes
     1.8 +        push    di                      ; up to 2 * 635K / BytesPerCluster = 2540 bytes
     1.9  %if FAT12 == 1
    1.10 -        mov     cl, 12
    1.11 +        mov     cl, 4
    1.12  %endif
    1.13  ClusterLoop:
    1.14          mov     [di], si
    1.15 -
    1.16          add     si, si                  ; si = cluster * 2
    1.17  %if FAT16 == 1
    1.18          mov     ax, es                  ; ax = FAT segment = ImageLoadSeg
    1.19          jnc     First64k
    1.20          mov     ah, (1000h+ImageLoadSeg)>>8 ; adjust segment for 2nd part of FAT16
    1.21  First64k:
    1.22 + %if FAT12 == 1
    1.23          mov     dx, 0FFF8h
    1.24 -%else
    1.25 -        mov     dx, 0FF8h
    1.26 -%endif
    1.27 -
    1.28 -%if FAT12 == 1 && FAT16 == 1
    1.29 -        cmp     [bx(bpbSectorsPerFAT)], cx ; 1..12 = FAT12, 16..256 = FAT16
    1.30 -        ja      ReadClusterFat16
    1.31 +        test    [bx(bsFileSystem+4)], cl ; FAT12 or FAT16 ? clear C
    1.32 +        jne     ReadClusterFat16
    1.33          mov     dh, 0Fh
    1.34 + %endif
    1.35  %endif
    1.36  %if FAT12 == 1
    1.37          add     si, [di]
    1.38 @@ -340,16 +336,25 @@
    1.39          lodsw                           ; ax = next cluster
    1.40          pop     ds
    1.41  %else
    1.42 -        lodsw                           ; ax = next cluster
    1.43 +        es lodsw
    1.44  %endif
    1.45  %if FAT12 == 1
    1.46          jnc     ReadClusterEven
    1.47 -        rol     ax, cl
    1.48 +        shr     ax, cl
    1.49  ReadClusterEven:
    1.50  %endif
    1.51          scasw                           ; di += 2
    1.52 +%if FAT12 == 1 && FAT16 == 1
    1.53          and     ah, dh                  ; mask cluster value
    1.54          cmp     ax, dx
    1.55 +%else
    1.56 + %if FAT12 == 1
    1.57 +        and     ah, 0Fh                 ; mask cluster value
    1.58 +        cmp     ax, 0FF8h
    1.59 + %else
    1.60 +        cmp     ax, 0FFF8h
    1.61 + %endif
    1.62 +%endif
    1.63  
    1.64          xchg    ax, si
    1.65          jc      ClusterLoop
     2.1 --- a/gxine/receipt	Thu Sep 15 10:06:54 2022 +0000
     2.2 +++ b/gxine/receipt	Sat Sep 17 08:17:46 2022 +0000
     2.3 @@ -7,7 +7,7 @@
     2.4  MAINTAINER="jozee@slitaz.org"
     2.5  LICENSE="GPL2"
     2.6  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     2.7 -WEB_SITE="http://www.xine-project.org"
     2.8 +WEB_SITE="https://www.xine-project.org/"
     2.9  WGET_URL="https://sourceforge.net/projects/xine/files/$PACKAGE/$VERSION/$TARBALL"
    2.10  
    2.11  DEPENDS="xine-lib libvorbis gtk+ spidermonkey dbus"
     3.1 --- a/libtirpc-dev/receipt	Thu Sep 15 10:06:54 2022 +0000
     3.2 +++ b/libtirpc-dev/receipt	Sat Sep 17 08:17:46 2022 +0000
     3.3 @@ -6,7 +6,7 @@
     3.4  SHORT_DESC="Transport-Independent RPC library, development files."
     3.5  MAINTAINER="pascal.bellard@slitaz.org"
     3.6  LICENSE="BSD"
     3.7 -WEB_SITE="https://sourceforge.net/projects/libtirpc/"
     3.8 +WEB_SITE="https://sourceforge.net/projects/libtirpc"
     3.9  
    3.10  DEPENDS="libtirpc pkg-config"
    3.11  WANTED="libtirpc"
     4.1 --- a/libtirpc/receipt	Thu Sep 15 10:06:54 2022 +0000
     4.2 +++ b/libtirpc/receipt	Sat Sep 17 08:17:46 2022 +0000
     4.3 @@ -6,7 +6,7 @@
     4.4  SHORT_DESC="Transport-Independent RPC library."
     4.5  MAINTAINER="pascal.bellard@slitaz.org"
     4.6  LICENSE="BSD"
     4.7 -WEB_SITE="https://sourceforge.net/projects/libtirpc/"
     4.8 +WEB_SITE="https://sourceforge.net/projects/libtirpc"
     4.9  
    4.10  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    4.11  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     5.1 --- a/net-snmp-dev/receipt	Thu Sep 15 10:06:54 2022 +0000
     5.2 +++ b/net-snmp-dev/receipt	Sat Sep 17 08:17:46 2022 +0000
     5.3 @@ -6,7 +6,7 @@
     5.4  SHORT_DESC="Development files for net-snmp."
     5.5  MAINTAINER="allan316@gmail.com"
     5.6  LICENSE="BSD"
     5.7 -WEB_SITE="http://net-snmp.sourceforge.net"
     5.8 +WEB_SITE="https://sourceforge.net/projects/net-snmp"
     5.9  
    5.10  DEPENDS="net-snmp"
    5.11  WANTED="net-snmp"
     6.1 --- a/net-snmp/receipt	Thu Sep 15 10:06:54 2022 +0000
     6.2 +++ b/net-snmp/receipt	Sat Sep 17 08:17:46 2022 +0000
     6.3 @@ -7,7 +7,7 @@
     6.4  SHORT_DESC="SNMP tools."
     6.5  MAINTAINER="allan316@gmail.com"
     6.6  LICENSE="BSD"
     6.7 -WEB_SITE="https://sourceforge.net/projects/net-snmp/"
     6.8 +WEB_SITE="https://sourceforge.net/projects/net-snmp"
     6.9  
    6.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    6.11  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     7.1 --- a/xine-lib/receipt	Thu Sep 15 10:06:54 2022 +0000
     7.2 +++ b/xine-lib/receipt	Sat Sep 17 08:17:46 2022 +0000
     7.3 @@ -6,7 +6,7 @@
     7.4  SHORT_DESC="Xine video library."
     7.5  MAINTAINER="pankso@slitaz.org"
     7.6  LICENSE="GPL2"
     7.7 -WEB_SITE="http://www.xine-project.org/"
     7.8 +WEB_SITE="https://www.xine-project.org/"
     7.9  
    7.10  TARBALL="$PACKAGE-$VERSION.tar.xz"
    7.11  WGET_URL="http://downloads.sourceforge.net/project/xine/$PACKAGE/$VERSION/$TARBALL"
     8.1 --- a/xine-ui/receipt	Thu Sep 15 10:06:54 2022 +0000
     8.2 +++ b/xine-ui/receipt	Sat Sep 17 08:17:46 2022 +0000
     8.3 @@ -7,7 +7,7 @@
     8.4  MAINTAINER="pankso@slitaz.org"
     8.5  LICENSE="GPL2"
     8.6  TARBALL="$PACKAGE-$VERSION.tar.xz"
     8.7 -WEB_SITE="http://www.xine-project.org/"
     8.8 +WEB_SITE="https://www.xine-project.org/"
     8.9  WGET_URL="$SF_MIRROR/project/xine/xine-ui/$VERSION/$TARBALL"
    8.10  
    8.11  # Keep Xine small for Live system, we have MPlaye or VLC has big video player.
    8.12 @@ -19,6 +19,7 @@
    8.13  # Use a custom .desktop file
    8.14  GENERIC_MENUS="no"
    8.15  
    8.16 +# What is the latest version available today?
    8.17  current_version()
    8.18  {
    8.19  	wget -O - https://sourceforge.net/projects/xine/files/$PACKAGE/ 2>/dev/null | \