wok rev 22007

yarock: fix FindTaglib.cmake
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Oct 19 10:25:12 2019 +0200 (18 months ago)
parents a83fad834b7a
children e45e765b1037
files celestia/receipt htmldoc/receipt linld/stuff/src/CRTL.ASM linld/stuff/src/HIMEM.INC linld/stuff/src/XMM.ASM linld/stuff/src/_BEG.ASM yarock/receipt
line diff
     1.1 --- a/celestia/receipt	Fri Oct 18 17:47:01 2019 +0100
     1.2 +++ b/celestia/receipt	Sat Oct 19 10:25:12 2019 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  MAINTAINER="slaxemulator@gmail.com"
     1.5  LICENSE="GPL2"
     1.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.7 -WEB_SITE="http://www.shatters.net/celestia/"
     1.8 +WEB_SITE="https://celestia.space/"
     1.9  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.10  
    1.11  DEPENDS="gtk+ glew libtheora lua5.1 gtkglext freeglut xorg-libXmu mesa libglu-mesa libjpeg jpeg zlib"
     2.1 --- a/htmldoc/receipt	Fri Oct 18 17:47:01 2019 +0100
     2.2 +++ b/htmldoc/receipt	Sat Oct 19 10:25:12 2019 +0200
     2.3 @@ -7,7 +7,7 @@
     2.4  MAINTAINER="gokhlayeh@slitaz.org"
     2.5  LICENSE="GPL2"
     2.6  TARBALL="$PACKAGE-$VERSION-source.tar.bz2"
     2.7 -WEB_SITE="http://www.htmldoc.org"
     2.8 +WEB_SITE="https://www.htmldoc.org"
     2.9  WGET_URL="http://ftp.easysw.com/pub/$PACKAGE/$VERSION/$TARBALL"
    2.10  
    2.11  DEPENDS="jpeg libpng fltk"
     3.1 --- a/linld/stuff/src/CRTL.ASM	Fri Oct 18 17:47:01 2019 +0100
     3.2 +++ b/linld/stuff/src/CRTL.ASM	Sat Oct 19 10:25:12 2019 +0200
     3.3 @@ -51,7 +51,7 @@
     3.4  c		db	?		;34	char c;
     3.5  _64bits		db	?		;35	char _64bits;
     3.6  buffer		db	?		;36	char buffer[2048+512];
     3.7 -ends					; } isostate;
     3.8 +ends		isostate		; } isostate;
     3.9  		public	_isostate
    3.10  _isostate	isostate	<?>
    3.11  		org	$-7
    3.12 @@ -561,19 +561,7 @@
    3.13  
    3.14  	endp	@die$qpxzc
    3.15  
    3.16 -struc   image_himem		;struct image_himem {
    3.17 -fd		dw	?	; 0    int fd;
    3.18 -fallback	dd	?	; 2    u32 fallback;
    3.19 -size		dd	?	; 6    u32 size;
    3.20 -remaining	dd	?	;10    u32 remaining;
    3.21 -buf		dd	?	;14    u32 buf;
    3.22 -bufv		dw	?	;18    u32 *bufv;
    3.23 -errmsg		dw	?	;20    char *errmsg;
    3.24 -chunk_size	dd	?	;22    u32 chunk_size;
    3.25 -next_chunk	dw	?	;26    void (*next_chunk)(struct image_himem *);
    3.26 -state		dw	?	;28    u16 state;
    3.27 -fd2close	dw	?	;30    u16 fd2close;
    3.28 -ends				;};
    3.29 +		include	"himem.inc"
    3.30  
    3.31  ;***************************************************************
    3.32  ;static long next_chunk(struct image_himem *di);
    3.33 @@ -648,7 +636,7 @@
    3.34  pageidx		dw	?		;   6  int pageidx;
    3.35  cache		dd	1024 dup(?)	;   8  int cache;
    3.36  page		dd	1024 dup(?)	;4104  int page;
    3.37 -ends					;}; // size=8200
    3.38 +ends	data_himem			;}; // size=8200
    3.39  	endif
    3.40  
    3.41  ;***************************************************************
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/linld/stuff/src/HIMEM.INC	Sat Oct 19 10:25:12 2019 +0200
     4.3 @@ -0,0 +1,13 @@
     4.4 +struc   image_himem		;struct image_himem {
     4.5 +fd		dw	?	; 0    int fd;
     4.6 +fallback	dd	?	; 2    u32 fallback;
     4.7 +size		dd	?	; 6    u32 size;
     4.8 +remaining	dd	?	;10    u32 remaining;
     4.9 +buf		dd	?	;14    u32 buf;
    4.10 +bufv		dw	?	;18    u32 *bufv;
    4.11 +errmsg		dw	?	;20    char *errmsg;
    4.12 +chunk_size	dd	?	;22    u32 chunk_size;
    4.13 +next_chunk	dw	?	;26    void (*next_chunk)(struct image_himem *);
    4.14 +state		dw	?	;28    u16 state;
    4.15 +fd2close	dw	?	;30    u16 fd2close;
    4.16 +ends	image_himem		;};
     5.1 --- a/linld/stuff/src/XMM.ASM	Fri Oct 18 17:47:01 2019 +0100
     5.2 +++ b/linld/stuff/src/XMM.ASM	Sat Oct 19 10:25:12 2019 +0200
     5.3 @@ -78,20 +78,7 @@
     5.4  
     5.5          endp    xmm_driver
     5.6  
     5.7 -
     5.8 -struc   image_himem		;struct image_himem {
     5.9 -fd		dw	?	; 0    int fd;
    5.10 -fallback	dd	?	; 2    u32 fallback;
    5.11 -size		dd	?	; 6    u32 size;
    5.12 -remaining	dd	?	;10    u32 remaining;
    5.13 -buf		dd	?	;14    u32 buf;
    5.14 -bufv		dw	?	;18    u32 *bufv;
    5.15 -errmsg		dw	?	;20    char *errmsg;
    5.16 -chunk_size	dd	?	;22    u32 chunk_size;
    5.17 -next_chunk	dw	?	;26    void (*next_chunk)(struct image_himem *);
    5.18 -state		dw	?	;28    u16 state;
    5.19 -fd2close	dw	?	;30    u16 fd2close;
    5.20 -ends				;};
    5.21 +		include	"himem.inc"
    5.22  
    5.23  ;***************************************************************
    5.24  ;_fastcall void xmm_alloc(struct image_himem *m)
     6.1 --- a/linld/stuff/src/_BEG.ASM	Fri Oct 18 17:47:01 2019 +0100
     6.2 +++ b/linld/stuff/src/_BEG.ASM	Sat Oct 19 10:25:12 2019 +0200
     6.3 @@ -18,11 +18,11 @@
     6.4          global  _data_start:byte
     6.5          label   _data_start byte
     6.6  		ifndef	NO386
     6.7 -msg_badcpu      db      "I need 386+ CPU in real mode or under VCPI manager"
     6.8 +msg_badcpu      db      "I need 386+ CPU in real mode or under VCPI manager",0
     6.9  		endif
    6.10          global  _vcpi:byte
    6.11 +msg_badmapping  db      "VCPI: low 640k need 1:1 mapping"
    6.12  _vcpi		db	0
    6.13 -msg_badmapping  db      "VCPI: low 640k need 1:1 mapping",0
    6.14  
    6.15          ends    _DATA
    6.16  
     7.1 --- a/yarock/receipt	Fri Oct 18 17:47:01 2019 +0100
     7.2 +++ b/yarock/receipt	Sat Oct 19 10:25:12 2019 +0200
     7.3 @@ -26,6 +26,7 @@
     7.4  {
     7.5  	cp -f $stuff/yarock_ru.ts $src/translation
     7.6  	patch -p0 < $stuff/yarock.patch
     7.7 +	sed -i 's| STRLESS | VERSION_LESS |' cmake/FindTaglib.cmake
     7.8  
     7.9  	mkdir build; cd build
    7.10  	cmake -DCMAKE_INSTALL_PREFIX=/usr ..