wok rev 21576

Update some websites
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun May 19 13:14:32 2019 +0200 (12 months ago)
parents a6d601cd1930
children f0393127d176
files linld/stuff/src/ISO9660.CPP linld/stuff/src/LINLD.CPP linld/stuff/src/LOAD.CPP linld/stuff/src/TAZBOOT.CPP linld/stuff/src/pipehole.awk orpheus/receipt swfdec-dev/receipt swfdec/receipt
line diff
     1.1 --- a/linld/stuff/src/ISO9660.CPP	Sun May 19 10:40:55 2019 +0100
     1.2 +++ b/linld/stuff/src/ISO9660.CPP	Sun May 19 13:14:32 2019 +0200
     1.3 @@ -126,7 +126,7 @@
     1.4  	do s++; while (*s != '/' && *s);
     1.5  	c = *s;
     1.6  	*s = 0;
     1.7 -	for (x->curdirsize = 0xFFFF; isoreaddir() == 0;) {
     1.8 +	for (x->curdirsize = 0xFFFF; isoreaddir() != -1;) {
     1.9  		const char *n = name, *i = x->filename;
    1.10  		if (_64bits) {
    1.11  			if (strhead(i, n)) continue;
     2.1 --- a/linld/stuff/src/LINLD.CPP	Sun May 19 10:40:55 2019 +0100
     2.2 +++ b/linld/stuff/src/LINLD.CPP	Sun May 19 13:14:32 2019 +0200
     2.3 @@ -49,7 +49,8 @@
     2.4  
     2.5      // Parse command line
     2.6  #ifdef	USE_ARGSTR
     2.7 -    if (argv[1]) {for (;;) {
     2.8 +    if (!argv[1]) syntax();
     2.9 +    {for (;;) {
    2.10  	const char **clp = &cmdline;
    2.11      next:
    2.12  	argv++;
    2.13 @@ -64,8 +65,8 @@
    2.14  	    skip_alloc++;
    2.15  	    goto next;
    2.16  	}
    2.17 -	if (argstr(*argv,"cl|image|initrd",clp) == 0);
    2.18 -	else if (fileexist(*argv) >= 0)
    2.19 +	if (argstr(*argv,"cl|image|initrd",clp) != -1);
    2.20 +	else if (fileexist(*argv) != -1)
    2.21              kernel_name=*argv;
    2.22  	else if (*argv) {
    2.23  	    argnum(*argv,"root|vga|mem|-b",&root_dev);
    2.24 @@ -77,7 +78,8 @@
    2.25          }
    2.26      }
    2.27  #else
    2.28 -    if (argv[1]) while (1) {
    2.29 +    if (!argv[1]) syntax();
    2.30 +    while (1) {
    2.31  	char *s;
    2.32      next:
    2.33  	argv++;
    2.34 @@ -152,7 +154,6 @@
    2.35  	}
    2.36      }
    2.37  #endif
    2.38 -    syntax();
    2.39  
    2.40      // Let compiler be happy
    2.41      return _AX;
     3.1 --- a/linld/stuff/src/LOAD.CPP	Sun May 19 10:40:55 2019 +0100
     3.2 +++ b/linld/stuff/src/LOAD.CPP	Sun May 19 13:14:32 2019 +0200
     3.3 @@ -237,8 +237,8 @@
     3.4      u16     version;        // 0206 Boot protocol version supported
     3.5      u16     realmode_switch_ofs; // 0208 Hook called just before rm->pm
     3.6      u16     realmode_switch_seg;
     3.7 -    u16     start_sys_seg;  // 020E
     3.8 -    u16     kernel_version; // 020C Points to kernel version string
     3.9 +    u16     start_sys_seg;  // 020C
    3.10 +    u16     kernel_version; // 020E Points to kernel version string
    3.11      u8      type_of_loader; // 0210 Boot loader identifier
    3.12      u8      loadflags;      // 0211 Boot protocol option flags
    3.13      u16     setup_move_size;// 0212 Move to high memory size (used with hooks)
     4.1 --- a/linld/stuff/src/TAZBOOT.CPP	Sun May 19 10:40:55 2019 +0100
     4.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Sun May 19 13:14:32 2019 +0200
     4.3 @@ -91,7 +91,7 @@
     4.4  			break;
     4.5  		}
     4.6  	} while (isoopen("isolinux") >= 0);		// Knoppix
     4.7 -	for (c = 0, x->curdirsize = 0xFFFF; isoreaddir() == 0;) {
     4.8 +	for (c = 0, x->curdirsize = 0xFFFF; isoreaddir() != -1;) {
     4.9  		if (strstr(x->filename, ".gz"))
    4.10  			strcpy(fallback, x->filename);
    4.11  		if (strhead(x->filename, "rootfs") 
    4.12 @@ -194,8 +194,8 @@
    4.13  			skip_alloc++;
    4.14  			goto next;
    4.15  		}
    4.16 -		if (argstr(s,"kernel/image|initrd|bootfrom/iso",&kernel_name) == 0);
    4.17 -		else if (argnum(s,"root|vga|mem/-e|-b",&root_dev) == 0);
    4.18 +		if (argstr(s,"kernel/image|initrd|bootfrom/iso",&kernel_name) != -1);
    4.19 +		else if (argnum(s,"root|vga|mem/-e|-b",&root_dev) != -1);
    4.20  		else if(i == 1 && fileexist(s) != -1) {
    4.21  			kernel_name = s;
    4.22  		}
     5.1 --- a/linld/stuff/src/pipehole.awk	Sun May 19 10:40:55 2019 +0100
     5.2 +++ b/linld/stuff/src/pipehole.awk	Sun May 19 13:14:32 2019 +0200
     5.3 @@ -3,6 +3,7 @@
     5.4  {
     5.5  	sub(/segment word public/,"segment byte public")
     5.6  
     5.7 +	if (/^@.*:$/ || /	endp$/) afterjmp=0
     5.8  	if (hold == 0) {
     5.9  		s=$0
    5.10  		if (/^	mov	.[ix],bx$/ || /^	mov	.[ix],.i$/) {
    5.11 @@ -68,6 +69,7 @@
    5.12  	}
    5.13  	else if (hold == 3) {
    5.14  		hold=0
    5.15 +		if (/^	call	/ && regs[2] == "ax") s="	xchg	ax," regs[1]
    5.16  		if (/^	add	[abcds][ix],/) {
    5.17  			split($2,regs2,",")
    5.18  			if (regs[1] == regs2[1] && (regs2[2] == "offset" || isnum(regs2[2]))) {
    5.19 @@ -210,7 +212,10 @@
    5.20  		hold=0;
    5.21  		if (/^	cmp	ax,-1$/) { print "	inc	ax"; next; }
    5.22  	}
    5.23 -	if (/^	call	near ptr @fileexist\$/) { print; hold=17; next; }
    5.24 +	if (/^	call	near ptr @fileexist\$/ || 	# return boolean :
    5.25 +	    /^	call	near ptr @isoreaddir\$/ ||	#  0=true, -1=false
    5.26 +	    /^	call	near ptr @argstr\$/ ||
    5.27 +	    /^	call	near ptr @argnum\$/) { print; hold=17; next; }
    5.28  	s=$0
    5.29  	# These optimisation may break ZF or CF
    5.30  	if (/^	sub	sp,2$/) { print "	push	ax"; next }
    5.31 @@ -305,5 +310,7 @@
    5.32  			}
    5.33  		}
    5.34  	}
    5.35 -	print
    5.36 +	if (afterjmp) print ";" $0
    5.37 +	else print
    5.38 +	if (/^	jmp	/) afterjmp=1
    5.39  }
     6.1 --- a/orpheus/receipt	Sun May 19 10:40:55 2019 +0100
     6.2 +++ b/orpheus/receipt	Sun May 19 13:14:32 2019 +0200
     6.3 @@ -8,7 +8,7 @@
     6.4  LICENSE="GPL2"
     6.5  SUGGESTED="mpg123"
     6.6  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     6.7 -WEB_SITE="http://thekonst.net/en/orpheus"
     6.8 +WEB_SITE="https://web.archive.org/web/20180602005123/http://thekonst.net/en/orpheus"
     6.9  WGET_URL="http://thekonst.net/download/$TARBALL"
    6.10  TAGS="audio sound music player"
    6.11  
    6.12 @@ -18,7 +18,6 @@
    6.13  # Rules to configure and make the package.
    6.14  compile_rules()
    6.15  {
    6.16 -	cd $src
    6.17  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -logg"
    6.18  	unset CFLAGS CXXFLAGS
    6.19  	./configure 2>&1 | grep -v /config.rpath &&
    6.20 @@ -32,4 +31,3 @@
    6.21  	mkdir -p $fs/usr
    6.22  	cp -a $install/usr/bin $fs/usr
    6.23  }
    6.24 -
     7.1 --- a/swfdec-dev/receipt	Sun May 19 10:40:55 2019 +0100
     7.2 +++ b/swfdec-dev/receipt	Sun May 19 13:14:32 2019 +0200
     7.3 @@ -6,7 +6,7 @@
     7.4  SHORT_DESC="Macromedia Flash decoding library"
     7.5  MAINTAINER="devl547@gmail.com"
     7.6  LICENSE="LGPL2.1"
     7.7 -WEB_SITE="https://swfdec.freedesktop.org/wiki/"
     7.8 +WEB_SITE="https://github.com/mltframework/swfdec"
     7.9  WANTED="swfdec"
    7.10  
    7.11  DEPENDS="pkg-config"
     8.1 --- a/swfdec/receipt	Sun May 19 10:40:55 2019 +0100
     8.2 +++ b/swfdec/receipt	Sun May 19 13:14:32 2019 +0200
     8.3 @@ -7,7 +7,7 @@
     8.4  MAINTAINER="devl547@gmail.com"
     8.5  LICENSE="LGPL2.1"
     8.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
     8.7 -WEB_SITE="https://swfdec.freedesktop.org/wiki/"
     8.8 +WEB_SITE="https://github.com/mltframework/swfdec"
     8.9  WGET_URL="http://swfdec.freedesktop.org/download/swfdec/${VERSION%.*}/$TARBALL"
    8.10  
    8.11  DEPENDS="glib liboil pango gtk+ libsoup cairo alsa-lib gstreamer gst-plugins-base"