# HG changeset patch # User Pascal Bellard # Date 1663402666 0 # Node ID ec9531d04de1ae326bac4a7c183474c3661df847 # Parent e3609bca257725aec15a5fd402ffc584975293bc BootProg/boot16.asm: too small fat16 support diff -r e3609bca2577 -r ec9531d04de1 BootProg/stuff/boot16.asm --- a/BootProg/stuff/boot16.asm Thu Sep 15 10:06:54 2022 +0000 +++ b/BootProg/stuff/boot16.asm Sat Sep 17 08:17:46 2022 +0000 @@ -306,28 +306,24 @@ FAT12 equ 1 FAT16 equ 1 - push di ; up to 2 * 635K / BytesPerCluster bytes + push di ; up to 2 * 635K / BytesPerCluster = 2540 bytes %if FAT12 == 1 - mov cl, 12 + mov cl, 4 %endif ClusterLoop: mov [di], si - add si, si ; si = cluster * 2 %if FAT16 == 1 mov ax, es ; ax = FAT segment = ImageLoadSeg jnc First64k mov ah, (1000h+ImageLoadSeg)>>8 ; adjust segment for 2nd part of FAT16 First64k: + %if FAT12 == 1 mov dx, 0FFF8h -%else - mov dx, 0FF8h -%endif - -%if FAT12 == 1 && FAT16 == 1 - cmp [bx(bpbSectorsPerFAT)], cx ; 1..12 = FAT12, 16..256 = FAT16 - ja ReadClusterFat16 + test [bx(bsFileSystem+4)], cl ; FAT12 or FAT16 ? clear C + jne ReadClusterFat16 mov dh, 0Fh + %endif %endif %if FAT12 == 1 add si, [di] @@ -340,16 +336,25 @@ lodsw ; ax = next cluster pop ds %else - lodsw ; ax = next cluster + es lodsw %endif %if FAT12 == 1 jnc ReadClusterEven - rol ax, cl + shr ax, cl ReadClusterEven: %endif scasw ; di += 2 +%if FAT12 == 1 && FAT16 == 1 and ah, dh ; mask cluster value cmp ax, dx +%else + %if FAT12 == 1 + and ah, 0Fh ; mask cluster value + cmp ax, 0FF8h + %else + cmp ax, 0FFF8h + %endif +%endif xchg ax, si jc ClusterLoop diff -r e3609bca2577 -r ec9531d04de1 gxine/receipt --- a/gxine/receipt Thu Sep 15 10:06:54 2022 +0000 +++ b/gxine/receipt Sat Sep 17 08:17:46 2022 +0000 @@ -7,7 +7,7 @@ MAINTAINER="jozee@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.xine-project.org" +WEB_SITE="https://www.xine-project.org/" WGET_URL="https://sourceforge.net/projects/xine/files/$PACKAGE/$VERSION/$TARBALL" DEPENDS="xine-lib libvorbis gtk+ spidermonkey dbus" diff -r e3609bca2577 -r ec9531d04de1 libtirpc-dev/receipt --- a/libtirpc-dev/receipt Thu Sep 15 10:06:54 2022 +0000 +++ b/libtirpc-dev/receipt Sat Sep 17 08:17:46 2022 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="Transport-Independent RPC library, development files." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" -WEB_SITE="https://sourceforge.net/projects/libtirpc/" +WEB_SITE="https://sourceforge.net/projects/libtirpc" DEPENDS="libtirpc pkg-config" WANTED="libtirpc" diff -r e3609bca2577 -r ec9531d04de1 libtirpc/receipt --- a/libtirpc/receipt Thu Sep 15 10:06:54 2022 +0000 +++ b/libtirpc/receipt Sat Sep 17 08:17:46 2022 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="Transport-Independent RPC library." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" -WEB_SITE="https://sourceforge.net/projects/libtirpc/" +WEB_SITE="https://sourceforge.net/projects/libtirpc" TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" diff -r e3609bca2577 -r ec9531d04de1 net-snmp-dev/receipt --- a/net-snmp-dev/receipt Thu Sep 15 10:06:54 2022 +0000 +++ b/net-snmp-dev/receipt Sat Sep 17 08:17:46 2022 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="Development files for net-snmp." MAINTAINER="allan316@gmail.com" LICENSE="BSD" -WEB_SITE="http://net-snmp.sourceforge.net" +WEB_SITE="https://sourceforge.net/projects/net-snmp" DEPENDS="net-snmp" WANTED="net-snmp" diff -r e3609bca2577 -r ec9531d04de1 net-snmp/receipt --- a/net-snmp/receipt Thu Sep 15 10:06:54 2022 +0000 +++ b/net-snmp/receipt Sat Sep 17 08:17:46 2022 +0000 @@ -7,7 +7,7 @@ SHORT_DESC="SNMP tools." MAINTAINER="allan316@gmail.com" LICENSE="BSD" -WEB_SITE="https://sourceforge.net/projects/net-snmp/" +WEB_SITE="https://sourceforge.net/projects/net-snmp" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" diff -r e3609bca2577 -r ec9531d04de1 xine-lib/receipt --- a/xine-lib/receipt Thu Sep 15 10:06:54 2022 +0000 +++ b/xine-lib/receipt Sat Sep 17 08:17:46 2022 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="Xine video library." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://www.xine-project.org/" +WEB_SITE="https://www.xine-project.org/" TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="http://downloads.sourceforge.net/project/xine/$PACKAGE/$VERSION/$TARBALL" diff -r e3609bca2577 -r ec9531d04de1 xine-ui/receipt --- a/xine-ui/receipt Thu Sep 15 10:06:54 2022 +0000 +++ b/xine-ui/receipt Sat Sep 17 08:17:46 2022 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://www.xine-project.org/" +WEB_SITE="https://www.xine-project.org/" WGET_URL="$SF_MIRROR/project/xine/xine-ui/$VERSION/$TARBALL" # Keep Xine small for Live system, we have MPlaye or VLC has big video player. @@ -19,6 +19,7 @@ # Use a custom .desktop file GENERIC_MENUS="no" +# What is the latest version available today? current_version() { wget -O - https://sourceforge.net/projects/xine/files/$PACKAGE/ 2>/dev/null | \