--- deliantra/Deliantra-Client/makebin.linux	2008/03/30 08:01:55	1.16
+++ deliantra/Deliantra-Client/makebin.linux	2009/01/14 23:51:18	1.22
@@ -1,15 +1,33 @@
 #!/bin/bash
 
+# ./configure --disable-joystick --disable-cdrom --disable-alsa-shared --disable-esd-shared --disable-arts --disable-nas --disable-diskaudio --disable-dga --disable-video-fbcon --disable-video-directfb --disable-video-svga --disable-timidity
+
 # Convert a gtk2-perl program to a standalone linux binary
 
-PERL=/usr
-PERLLIB=/usr/lib/perl5/
+EV_EVENTFD=
+
+if [ $(arch) = i686 ]; then
+   PERL=/usr
+   PERLLIB=/usr/lib/perl5/
+   PP=/usr/bin/pp
+   LIBDB=db-4.6
+   ARCHNAME=x86
+   PERLARCH=i486-linux-gnu-thread-multi
+else
+   PERL=/usr
+   PERLLIB=/usr/lib/perl5/
+   PP=/usr/local/bin/pp
+   LIBDB=db-4.7
+   ARCHNAME=amd64
+   PERLARCH=x86_64-linux-gnu-thread-multi
+fi
+
 PANGO=1.5.0
 #PERL=/opt/perl
 #PERLLIB=/opt/perl/lib/perl5/
 #PANGO=1.6.0
 
-for mod in AnyEvent EV JSON-XS Deliantra Compress-LZF BDB; do
+for mod in AnyEvent EV JSON-XS Deliantra Compress-LZF BDB Guard; do
    (
       cd /root/src/$mod
       $PERL/bin/perl Makefile.PL </dev/null
@@ -21,25 +39,63 @@
 done
 
 (
-   # patch braindamaged pango
+#   # patch braindamaged pango
    perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' </usr/lib/libpango-1.0.so.0 >pango-1.0.so.0
    printf "%s" "$PANGO" >pangoversion
+#pangoversion;root/pangoversion
    cat <<EOF
-pangoversion;root/pangoversion
-pango-1.0.so.0;shlib/i486-linux-gnu-thread-multi/libpango-1.0.so.0
-/usr/lib/libglib-2.0.so.0;shlib/i486-linux-gnu-thread-multi/libglib-2.0.so.0
-/usr/lib/libstdc++.so.6;shlib/i486-linux-gnu-thread-multi/libstdc++.so.6
-/usr/lib/libaudio.so.2;shlib/i486-linux-gnu-thread-multi/libaudio.so.2
-/lib/libgcc_s.so.1;shlib/i486-linux-gnu-thread-multi/libgcc_s.so.1
+pango-1.0.so.0;shlib/$PERLARCH/libpango-1.0.so.0
+/usr/lib/libglib-2.0.so.0;shlib/$PERLARCH/libglib-2.0.so.0
+/usr/lib/libstdc++.so.6;shlib/$PERLARCH/libstdc++.so.6
+/lib/libgcc_s.so.1;shlib/$PERLARCH/libgcc_s.so.1
 /usr/lib/pango/$PANGO;root/usr/lib/pango/$PANGO
+pango-1.0.so.0;shlib/$PERLARCH/libpango-1.0.so.0
 docwiki.pst;root/Deliantra/Client/private/resources/docwiki.pst
 EOF
 
+   cat <<EOF >pango.rc
+[Pango]
+ModuleFiles = pango.modules
+EOF
+   echo "pango.rc;root/pango.rc"
+
+   cat >fonts.conf <<EOF
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+	<match target="pattern"> <test qual="any" name="family"> <string>mono</string> </test> <edit name="family" mode="assign"> <string>monospace</string> </edit> </match>
+
+	<match target="pattern"> <test qual="any" name="family"> <string>sans serif</string> </test> <edit name="family" mode="assign"> <string>sans-serif</string> </edit> </match>
+
+	<match target="pattern"> <test qual="any" name="family"> <string>sans</string> </test> <edit name="family" mode="assign"> <string>sans-serif</string> </edit> </match>
+
+	<cachedir>fontconfig-cache</cachedir>
+
+	<config>
+		<blank>
+			<int>0x0020</int><int>0x00A0</int><int>0x00AD</int><int>0x034F</int><int>0x0600</int><int>0x0601</int><int>0x0602</int><int>0x0603</int><int>0x06DD</int><int>0x070F</int><int>0x115F</int><int>0x1160</int><int>0x1680</int><int>0x17B4</int><int>0x17B5</int><int>0x180E</int><int>0x2000</int><int>0x2001</int><int>0x2002</int><int>0x2003</int><int>0x2004</int><int>0x2005</int><int>0x2006</int><int>0x2007</int><int>0x2008</int><int>0x2009</int><int>0x200A</int><int>0x200B</int><int>0x200C</int><int>0x200D</int><int>0x200E</int><int>0x200F</int><int>0x2028</int><int>0x2029</int><int>0x202A</int><int>0x202B</int><int>0x202C</int><int>0x202D</int><int>0x202E</int><int>0x202F</int><int>0x205F</int><int>0x2060</int><int>0x2061</int><int>0x2062</int><int>0x2063</int><int>0x206A</int><int>0x206B</int><int>0x206C</int><int>0x206D</int><int>0x206E</int><int>0x206F</int><int>0x2800</int><int>0x3000</int><int>0x3164</int><int>0xFEFF</int><int>0xFFA0</int><int>0xFFF9</int><int>0xFFFA</int><int>0xFFFB</int>
+		</blank>
+	</config>
+
+</fontconfig>
+EOF
+   echo "fonts.conf;root/fonts.conf"
+
+   (
+      cat /usr/lib/pango/$PANGO/module-files.d/* | grep ^/usr | while read so rest; do
+         base=$(basename "$so")
+         echo "$so;root/$base"
+         echo "$base $rest" >&5
+      done
+   ) 5>pango.modules
+   echo "pango.modules;root/pango.modules"
+
    perl -ne '/^(resources\/.*)/ and print "$1;root/Deliantra/Client/private/$1\n"' <MANIFEST
 
 ) >addlist
 
-trap "rm addlist pangoversion pango-1.0.so.0" 0
+trap "rm addlist pangoversion pango-1.0.so.0 fonts.conf" 0
 
 $PERL/bin/perl Makefile.PL
 make clean
@@ -48,20 +104,23 @@
 
 wait
 
+        #-l asound -l esd \
 LD_LIBRARY_PATH=/lib:/usr/lib \
-$PERL/bin/pp -C -I /root/src/Deliantra \
+$PP -C -I /root/src/Deliantra \
         -M AnyEvent::Impl::EV \
         -M attributes \
         -a "blib/arch/auto/Deliantra/Client/Client.so;lib/auto/Deliantra/Client/Client.so" \
-        -l db-4.6 \
+        -l $LIBDB \
         -l glib-2.0 -l gobject-2.0 -l gmodule-2.0 \
         -l pangoft2-1.0 \
-        -l SDL -l asound \
+        -l SDL \
         -l SDL_mixer -l vorbisfile -l vorbis -l ogg -l smpeg -l stdc++ \
         -l SDL_image -l png12 -l z \
-        -o deliantra-gnu-linux-x86.bin -A addlist bin/deliantra || exit
+        -o deliantra-gnu-linux-$ARCHNAME -A addlist bin/deliantra || exit
 
 make clean
 
-todata deliantra-gnu-linux-x86.bin
+tar cf deliantra-gnu-linux-$ARCHNAME.tar deliantra-gnu-linux-$ARCHNAME
+gzip -9vf deliantra-gnu-linux-$ARCHNAME.tar
+todata deliantra-gnu-linux-$ARCHNAME.tar.gz