# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1571473512 -7200
# Node ID 5b6c86ca3faad6b9908a2a78639db455d3f4e739
# Parent  a83fad834b7a509f47b27f5b49cb0489babd6b31
yarock: fix FindTaglib.cmake

diff -r a83fad834b7a -r 5b6c86ca3faa celestia/receipt
--- a/celestia/receipt	Fri Oct 18 17:47:01 2019 +0100
+++ b/celestia/receipt	Sat Oct 19 10:25:12 2019 +0200
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.shatters.net/celestia/"
+WEB_SITE="https://celestia.space/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 DEPENDS="gtk+ glew libtheora lua5.1 gtkglext freeglut xorg-libXmu mesa libglu-mesa libjpeg jpeg zlib"
diff -r a83fad834b7a -r 5b6c86ca3faa htmldoc/receipt
--- a/htmldoc/receipt	Fri Oct 18 17:47:01 2019 +0100
+++ b/htmldoc/receipt	Sat Oct 19 10:25:12 2019 +0200
@@ -7,7 +7,7 @@
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION-source.tar.bz2"
-WEB_SITE="http://www.htmldoc.org"
+WEB_SITE="https://www.htmldoc.org"
 WGET_URL="http://ftp.easysw.com/pub/$PACKAGE/$VERSION/$TARBALL"
 
 DEPENDS="jpeg libpng fltk"
diff -r a83fad834b7a -r 5b6c86ca3faa linld/stuff/src/CRTL.ASM
--- a/linld/stuff/src/CRTL.ASM	Fri Oct 18 17:47:01 2019 +0100
+++ b/linld/stuff/src/CRTL.ASM	Sat Oct 19 10:25:12 2019 +0200
@@ -51,7 +51,7 @@
 c		db	?		;34	char c;
 _64bits		db	?		;35	char _64bits;
 buffer		db	?		;36	char buffer[2048+512];
-ends					; } isostate;
+ends		isostate		; } isostate;
 		public	_isostate
 _isostate	isostate	<?>
 		org	$-7
@@ -561,19 +561,7 @@
 
 	endp	@die$qpxzc
 
-struc   image_himem		;struct image_himem {
-fd		dw	?	; 0    int fd;
-fallback	dd	?	; 2    u32 fallback;
-size		dd	?	; 6    u32 size;
-remaining	dd	?	;10    u32 remaining;
-buf		dd	?	;14    u32 buf;
-bufv		dw	?	;18    u32 *bufv;
-errmsg		dw	?	;20    char *errmsg;
-chunk_size	dd	?	;22    u32 chunk_size;
-next_chunk	dw	?	;26    void (*next_chunk)(struct image_himem *);
-state		dw	?	;28    u16 state;
-fd2close	dw	?	;30    u16 fd2close;
-ends				;};
+		include	"himem.inc"
 
 ;***************************************************************
 ;static long next_chunk(struct image_himem *di);
@@ -648,7 +636,7 @@
 pageidx		dw	?		;   6  int pageidx;
 cache		dd	1024 dup(?)	;   8  int cache;
 page		dd	1024 dup(?)	;4104  int page;
-ends					;}; // size=8200
+ends	data_himem			;}; // size=8200
 	endif
 
 ;***************************************************************
diff -r a83fad834b7a -r 5b6c86ca3faa linld/stuff/src/HIMEM.INC
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linld/stuff/src/HIMEM.INC	Sat Oct 19 10:25:12 2019 +0200
@@ -0,0 +1,13 @@
+struc   image_himem		;struct image_himem {
+fd		dw	?	; 0    int fd;
+fallback	dd	?	; 2    u32 fallback;
+size		dd	?	; 6    u32 size;
+remaining	dd	?	;10    u32 remaining;
+buf		dd	?	;14    u32 buf;
+bufv		dw	?	;18    u32 *bufv;
+errmsg		dw	?	;20    char *errmsg;
+chunk_size	dd	?	;22    u32 chunk_size;
+next_chunk	dw	?	;26    void (*next_chunk)(struct image_himem *);
+state		dw	?	;28    u16 state;
+fd2close	dw	?	;30    u16 fd2close;
+ends	image_himem		;};
diff -r a83fad834b7a -r 5b6c86ca3faa linld/stuff/src/XMM.ASM
--- a/linld/stuff/src/XMM.ASM	Fri Oct 18 17:47:01 2019 +0100
+++ b/linld/stuff/src/XMM.ASM	Sat Oct 19 10:25:12 2019 +0200
@@ -78,20 +78,7 @@
 
         endp    xmm_driver
 
-
-struc   image_himem		;struct image_himem {
-fd		dw	?	; 0    int fd;
-fallback	dd	?	; 2    u32 fallback;
-size		dd	?	; 6    u32 size;
-remaining	dd	?	;10    u32 remaining;
-buf		dd	?	;14    u32 buf;
-bufv		dw	?	;18    u32 *bufv;
-errmsg		dw	?	;20    char *errmsg;
-chunk_size	dd	?	;22    u32 chunk_size;
-next_chunk	dw	?	;26    void (*next_chunk)(struct image_himem *);
-state		dw	?	;28    u16 state;
-fd2close	dw	?	;30    u16 fd2close;
-ends				;};
+		include	"himem.inc"
 
 ;***************************************************************
 ;_fastcall void xmm_alloc(struct image_himem *m)
diff -r a83fad834b7a -r 5b6c86ca3faa linld/stuff/src/_BEG.ASM
--- a/linld/stuff/src/_BEG.ASM	Fri Oct 18 17:47:01 2019 +0100
+++ b/linld/stuff/src/_BEG.ASM	Sat Oct 19 10:25:12 2019 +0200
@@ -18,11 +18,11 @@
         global  _data_start:byte
         label   _data_start byte
 		ifndef	NO386
-msg_badcpu      db      "I need 386+ CPU in real mode or under VCPI manager"
+msg_badcpu      db      "I need 386+ CPU in real mode or under VCPI manager",0
 		endif
         global  _vcpi:byte
+msg_badmapping  db      "VCPI: low 640k need 1:1 mapping"
 _vcpi		db	0
-msg_badmapping  db      "VCPI: low 640k need 1:1 mapping",0
 
         ends    _DATA
 
diff -r a83fad834b7a -r 5b6c86ca3faa yarock/receipt
--- a/yarock/receipt	Fri Oct 18 17:47:01 2019 +0100
+++ b/yarock/receipt	Sat Oct 19 10:25:12 2019 +0200
@@ -26,6 +26,7 @@
 {
 	cp -f $stuff/yarock_ru.ts $src/translation
 	patch -p0 < $stuff/yarock.patch
+	sed -i 's| STRLESS | VERSION_LESS |' cmake/FindTaglib.cmake
 
 	mkdir build; cd build
 	cmake -DCMAKE_INSTALL_PREFIX=/usr ..