# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1645958858 0
# Node ID 8db826af003e1c9a9b9e35d43047fa9fedd1def2
# Parent  3911e4610e396dc0bd2af8f429f1c315df41c68d
freetype-dev: add pkgconfig folder

diff -r 3911e4610e39 -r 8db826af003e freetype-dev/receipt
--- a/freetype-dev/receipt	Sun Feb 27 11:03:39 2022 +0100
+++ b/freetype-dev/receipt	Sun Feb 27 10:47:38 2022 +0000
@@ -17,5 +17,6 @@
 genpkg_rules()
 {
 	cook_copy_folders	include
+	cook_copy_folders	pkgconfig
 	cook_copy_files		*.*a
 }
diff -r 3911e4610e39 -r 8db826af003e linld/stuff/src/LINLD.CPP
--- a/linld/stuff/src/LINLD.CPP	Sun Feb 27 11:03:39 2022 +0100
+++ b/linld/stuff/src/LINLD.CPP	Sun Feb 27 10:47:38 2022 +0000
@@ -11,23 +11,26 @@
 
 inline void syntax() {
     die("Syntax:" NL
-        "LINLD [image=file] [initrd=files] [vga=mode] [root=num] [mem=max] [cl=cmdline] "
+        "LINLD [image=file] [initrd=files] [vga=mode] [root=num] [mem=topLoad] [cl=cmdline] "
 #ifdef ISO9660
 	"[iso=file] "
 #endif
 	"..." NL
-        "vga mode: ask,extended,normal or dec/oct/hex number" NL
+        "\tvga mode: ask,extended,normal or dec/oct/hex number" NL
+	"\t-b baseLoad" NL
+#ifdef MINRAM
+	"\t-r minRAM" NL
+#endif
 #ifdef CPUTYPE
-        "-m mincpu	family*256+model" NL
+        "\t-m minCPU	family*256+model" NL
 #endif
 #ifdef CPU64
-        "-64 for cpu64 only" NL
+        "\t-64 cpu64 only" NL
 #endif
-        "Defaults:" NL
-        "\timage=bzImage" NL
-        "\tinitrd,vga,root=(void)" NL
-        "\tmem=256m" NL
-        "\tcl=auto" NL
+        "Defaults:"
+        "\timage=bzImage"
+        "\tmem=256m"
+        "\tcl=auto" 
         "\t-b 1088k" NL
         "Use quotes: \"cl=...\" if you need spaces in cmdline" NL
         "Use cl=@filename to get it from a file"
@@ -44,6 +47,7 @@
         "initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "
 	"\"cl=root=/dev/null video=-32\""
 	NL "\tLINLD memtest"
+	NL "\tLINLD @args"
 #endif
     );
 }
@@ -75,7 +79,7 @@
 	strcatb((const char *) heap_top,*argv);
     } while (*++argv);
 #ifdef MINRAM
-    if ((minram>>16) > (memtop()>>16) && (minram>>16) != 0) exit();	
+    if ((minram>>16) > (memtop()>>16)) exit();	
 #endif
 #ifdef CPUTYPE
     if (mincpu > cputype) exit();
diff -r 3911e4610e39 -r 8db826af003e linld/stuff/src/pipehole.awk
--- a/linld/stuff/src/pipehole.awk	Sun Feb 27 11:03:39 2022 +0100
+++ b/linld/stuff/src/pipehole.awk	Sun Feb 27 10:47:38 2022 +0000
@@ -67,12 +67,10 @@
 	if (islinld==7) {
 		if (/endif/) islinld=0
 		if (/mov/) sub(/ax/,"cx");
-		if (/;/ || /_memtop/ || /mov/) { print; next }
-		if (/ax,0/) {
-			print "	jcxz	minram_done"
-			print "	cmp	cx,dx"
+		if (/;/ || /_memtop/) print
+		if (/cmdnum/) {
+			print
 			print "	ja	call_exit"
-			print "minram_done:"
 		}
 		next
 	}
diff -r 3911e4610e39 -r 8db826af003e sokojs/stuff/shrink.sh
--- a/sokojs/stuff/shrink.sh	Sun Feb 27 11:03:39 2022 +0100
+++ b/sokojs/stuff/shrink.sh	Sun Feb 27 10:47:38 2022 +0000
@@ -6,7 +6,7 @@
 	sed -i 's|.*//!||' $@ ;;
 *)	for file in $@ ; do
 		[ -s "$file" ] || continue
-		grep -q '//!||' && continue 
+		grep -q '//!' && continue 
 		awk 'BEGIN { begin=9999; end=9999; tab=" " }
 function scan(s) {
   i=2