13 files changed, 473 insertions, 116 deletions

diff --git a/tools/build-info.pl b/tools/build-info.pl
index e4222643a1..fb89a80441 100755
--- a/tools/build-info.pl
+++ b/tools/build-info.pl
@@ -23,16 +23,29 @@ foreach my $b (&stablebuilds) {
     my $ver;
     if(exists($builds{$b}{release})) {
         $ver = $builds{$b}{release};
-    }
-    else {
+    } else {
         $ver = $publicrelease;
     }
-#    print "$b=$ver,$baseurl/release/$ver/rockbox-$b-$ver.zip\n";
-    print "$b=$ver\n";
+    if ($ver <= $publicrelease) {
+        print "$b=$ver\n";
+    }
 }
 
 print "[status]\n";
 
 foreach my $b (&allbuilds) {
-    print "$b=$builds{$b}{status}\n";
+    my $ver;
+    my $status = $builds{$b}{status};
+
+    if(exists($builds{$b}{release})) {
+        $ver = $builds{$b}{release};
+    } else {
+        $ver = $publicrelease;
+    }
+    if ($ver > $publicrelease) {
+        $status=2;
+    }
+    print "$b=$status\n";
 }
+
+print "\n";
diff --git a/tools/builds.pm b/tools/builds.pm
index 75d34dc079..0b7c768888 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -16,7 +16,7 @@ $releasenotes="/wiki/ReleaseNotes315";
 #    icon => 'modelname3',               # optional (uses modelname3's icon)
 #    voice => 'modelname4'               # optional (uses modelname4's voice)
 #    release => '3.14',                  # optional (final release version, if different from above)
-#    manualok => 1,                      # optional (builds manual even if target is not stable)
+#    manualok => 1,                      # optional (defaults 1 for status 3 and 0 for rest)
 # }
 
 %builds = (
@@ -71,10 +71,12 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'gogearhdd1630' => {
         name => 'Philips GoGear HDD1630',
+        manualok => 0,
         status => 3,
     },
     'gogearhdd6330' => {
         name => 'Philips GoGear HDD6330',
+        manualok => 0,
         status => 3,
     },
     'gogearsa9200' => {
@@ -369,6 +371,7 @@ $releasenotes="/wiki/ReleaseNotes315";
     'creativezenxfi3' => {
         name => 'Creative Zen X-Fi3',
         status => 3,
+        manualok => 0,
     },
     'sonynwze350' => {
         name => 'Sony NWZ-E350',
@@ -378,10 +381,12 @@ $releasenotes="/wiki/ReleaseNotes315";
     'sonynwze360' => {
         name => 'Sony NWZ-E360',
         status => 3,
+        manualok => 0,
     },
     'sonynwze370' => {
         name => 'Sony NWZ-E370/E380',
         status => 3,
+        manualok => 0,
     },
     'sonynwze450' => {
         name => 'Sony NWZ-E450',
@@ -424,11 +429,13 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'creativezenxfi' => {
         name => 'Creative Zen X-Fi',
-        status => 3
+        status => 3,
+        manualok => 0,
     },
     'creativezenxfistyle' => {
         name => 'Creative Zen X-Fi Style',
-        status => 3
+        status => 3,
+        manualok => 0,
     },
     'creativezen' => {
         name => 'Creative Zen',
@@ -436,24 +443,30 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'creativezenmozaic' => {
         name => 'Creative Zen Mozaic',
-        status => 3
+        status => 3,
+        manualok => 0,
     },
     'agptekrocker' => {
         name => 'Agptek Rocker',
-        status => 2,
-        manualok => 1, # Remove once status moves to 3
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'xduoox3' => {
         name => 'xDuoo X3',
         status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'xduoox3ii' => {
         name => 'xDuoo X3ii',
-        status => 2,
+        manualok => 0,     # Remove when manual is written
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'xduoox20' => {
         name => 'xDuoo X20',
-        status => 2,
+        manualok => 0,     # Remove when manual is written
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'fiiom3klinux' => {
         name => 'FiiO M3K (Linux)',
@@ -461,16 +474,17 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'fiiom3k' => {
         name => 'FiiO M3K',
-        status => 2,
-        manualok => 1, # Remove once status moves to 3
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'aigoerosq' => {
         name => 'AIGO EROS Q / K (Hosted)',
-        status => 2,
+        status => 2,  # Do we promote this to stable?
     },
     'erosqnative' => {
         name => 'AIGO EROS Q / K (Native)',
-        status => 2,
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'ihifi770' => {
         name => 'Xuelin iHIFI 770',
@@ -486,8 +500,8 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'shanlingq1' => {
         name => 'Shanling Q1',
-        status => 2,
-        manualok => 1, # Remove once status moves to 3
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
 );
 
@@ -511,7 +525,18 @@ sub usablebuilds {
     my @list;
 
     for my $b (sort byname keys %builds) {
-        push @list, $b if ($builds{$b}{status} >= 2 || defined($builds{$b}{manualok}));
+        push @list, $b if ($builds{$b}{status} >= 2);
+    }
+
+    return @list;
+}
+
+sub manualbuilds {
+    my @list;
+
+    for my $b (sort byname keys %builds) {
+        push @list, $b if (($builds{$b}{status} > 2 && !defined($builds{$b}{manualok})) ||
+                          (defined($builds{$b}{manualok}) && ($builds{$b}{manualok} > 0)));
     }
 
     return @list;
@@ -572,21 +597,45 @@ sub simbuilds {
         'lang' => 'english',
         'name' => 'UK English',
         'short' => 'en-gb',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'festival' => '--language english',
             'espeak' => '-ven-gb -k 5',
             'gtts' => '-l en -t co.uk',
-            'piper' => 'en_GB-cori-high.onnx',
+            'piper' => 'en_GB-semaine-medium.onnx',
         },
         'enabled' => 1,
     },
     # Everything else in alphabetical order
+    'bulgarian' => {
+        'lang' => 'bulgarian',
+        'name' => 'Български (Bulgarian)',
+        'short' => 'bg',
+        'defengine' => 'espeak',  # XXX Switch to gtts when buildserver is updated
+        'engines' => {
+            'espeak' => '-vbg',
+            'gtts' => '-l bg',
+            # No piper voice yet.
+        },
+        'enabled' => 1,
+    },
+    'chinese-simp' => {  # Mandarin?
+        'lang' => 'chinese-simp',
+        'name' => '简体中文 (Chinese Simplified)',
+        'short' => 'zh_cn',
+        'defengine' => 'piper',
+        'engines' => {
+            'espeak' => '-vzh',
+            'gtts' => '-l zh',
+            'piper' => 'zh_CN-huayan-medium.onnx',
+        },
+        'enabled' => 1,
+    },
     'czech' => {
         'lang' => 'czech',
         'name' => 'Čeština (Czech)',
         'short' => 'cs',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vcs',
             'gtts' => '-l cs',
@@ -598,7 +647,7 @@ sub simbuilds {
         'lang' => 'dansk',
         'name' => 'Dansk (Danish)',
         'short' => 'da',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vda',
             'gtts' => '-l da',
@@ -610,7 +659,7 @@ sub simbuilds {
         'lang' => 'deutsch',
         'name' => 'Deutsch (German)',
         'short' => 'de',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vde',
             'gtts' => '-l de',
@@ -634,7 +683,7 @@ sub simbuilds {
         'lang' => 'english-us',
         'name' => 'American English',
         'short' => 'en-us',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'festival' => '--language english',
             'espeak' => '-ven-us -k 5',
@@ -647,7 +696,7 @@ sub simbuilds {
         'lang' => 'espanol',
         'name' => 'Spanish (Peninsular)',
         'short' => 'es-es',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'festival' => '--language spanish',
             'espeak' => '-ves -k 5',
@@ -672,7 +721,7 @@ sub simbuilds {
         'lang' => 'francais',
         'name' => 'Français (French)',
         'short' => 'fr',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vfr-fr',
             'gtts' => '-l fr',
@@ -684,7 +733,7 @@ sub simbuilds {
         'lang' => 'greek',
         'name' => 'Ελληνικά (Greek)',
         'short' => 'el',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vel',
             'gtts' => '-l el',
@@ -696,7 +745,7 @@ sub simbuilds {
         'lang' => 'italiano',
         'name' => 'Italiano (Italian)',
         'short' => 'it',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vit',
             'gtts' => '-l it',
@@ -704,11 +753,22 @@ sub simbuilds {
         },
         'enabled' => 1,
     },
+    'korean' => {  #
+        'lang' => 'korean',
+        'name' => '한국어 (Korean)',
+        'short' => 'ko',
+        'defengine' => 'espeak',
+        'engines' => {
+            'espeak' => '-vko',
+            'gtts' => '-l ko',
+        },
+        'enabled' => 1,
+    },
     'nederlands' => {
         'lang' => 'nederlands',
         'name' => 'Nederlands (Dutch)',
         'short' => 'nl',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vnl',
             'gtts' => '-l nl',
@@ -720,7 +780,7 @@ sub simbuilds {
         'lang' => 'norsk',
         'name' => 'Norsk (Norwegian)',
         'short' => 'no',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vno',
             'gtts' => '-l no',
@@ -732,7 +792,7 @@ sub simbuilds {
         'lang' => 'polski',
         'name' => 'Polski (Polish)',
         'short' => 'pl',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vpl',
             'gtts' => '-l pl',
@@ -744,7 +804,7 @@ sub simbuilds {
         'lang' => 'russian',
         'name' => 'Русский (Russian)',
         'short' => 'ru',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vru',
             'gtts' => '-l ru',
@@ -768,7 +828,7 @@ sub simbuilds {
         'lang' => 'srpski',
         'name' => 'српски (Serbian)',
         'short' => 'sr',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vsr',
             'gtts' => '-l sr',
@@ -780,7 +840,7 @@ sub simbuilds {
         'lang' => 'svenska',
         'name' => 'Svenska (Swedish)',
         'short' => 'sr',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vsv',
             'gtts' => '-l sv',
@@ -792,7 +852,7 @@ sub simbuilds {
         'lang' => 'turkce',
         'name' => 'Türkçe (Turkish)',
         'short' => 'tr',
-        'defengine' => 'espeak',
+        'defengine' => 'piper',
         'engines' => {
             'espeak' => '-vtr',
             'gtts' => '-l tr',
@@ -802,14 +862,14 @@ sub simbuilds {
     },
 );
 
-sub bylang {
-    return uc $voices{$a}{lang} cmp uc $voices{$b}{lang};
+sub byshortname {
+    return uc $voices{$a}{short} cmp uc $voices{$b}{short};
 }
 
 sub allvoices {
     my @list;
 
-    for my $b (sort bylang keys %voices) {
+    for my $b (sort byshortname keys %voices) {
         push @list, $b if (defined($voices{$b}->{enabled}) && $voices{$b}->{enabled});
     }
 
@@ -820,7 +880,7 @@ sub voicesforlang($) {
     my $l = shift @_;
     my @list;
 
-    for my $b (sort bylang keys %voices) {
+    for my $b (sort byshortname keys %voices) {
         push @list, $b if ($voices{$b}{lang} eq $b && defined($voices{$b}->{enabled}) && $voices{$b}->{enabled});
     }
 
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index fb26597290..12ca9de1d9 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -380,6 +380,7 @@ sub buildzip {
         my $cmd = "$ROOT/tools/convbdf -f $ROOT/fonts/*bdf >/dev/null 2>&1";
         print($cmd."\n") if $verbose;
         system($cmd);
+        copy("$ROOT/fonts/COPYING", "COPYING-fonts.txt");
         chdir("../../");
 
         if($fonts < 2) {
diff --git a/tools/configure b/tools/configure
index 35f4b6d107..43f119ae17 100755
--- a/tools/configure
+++ b/tools/configure
@@ -435,6 +435,9 @@ simcc () {
         else
           echo "Your sdl-config does not know about static libs, falling back to shared library"
           sdlldopts=$($sdl --libs)
+#          if [ "$win32crosscompile" = "yes" ] ; then
+              LDOPTS=`echo $LDOPTS | sed -e s/-static//`
+#          fi
         fi
         GCCOPTS="$GCCOPTS ${sdlccopts}"
         LDOPTS="$LDOPTS ${sdlldopts}"
@@ -840,7 +843,7 @@ androidcc () {
             endian="little"
             gcctarget="i686-linux-android-"
             echo "${make_toolchain} --toolchain=x86-${gccchoice} --platform=android-android-$ANDROID_PLATFORM_VERSION --install-dir=${pwd}/android-toolchain"
-            ${make_toolchain} --toolchain=x86-${gccchoice} --platform=android-android-$ANDROID_PLATFORM_VERSION --install-dir=${pwd}/android-toolchain
+            ${make_toolchain} --toolchain=x86-${gccchoice} --platform=android-$ANDROID_PLATFORM_VERSION --install-dir=${pwd}/android-toolchain
             if [ ${?} != 0 ]; then
                 exit
             fi
@@ -1673,6 +1676,8 @@ cat <<EOF
  ==AIGO==                 244) M3K Linux
  245) Eros Q / K          246) M3K baremetal     ==Shanling==
  247) Eros Q / K native                          260) Q1
+ 248) Eros Q / K native v3 
+      (GC9A01 LCD Controller)
 EOF
 
   buildfor=`input`;
@@ -4187,8 +4192,39 @@ fi
     t_cpu="mips"
     t_manufacturer="ingenic_x1000"
     t_model="erosqnative"
+    # player version, for bootloader usage
+    # versions 1 and 2 both use 1
+    extradefines="$extradefines -DEROSQN_VER=1"
     ;;
 
+    248|erosqnative_v3)
+    target_id=117
+    modelname="erosqnative_v3"
+    target="EROS_QN"
+    memory=32
+    mipsr2elcc
+    appextra="recorder:gui"
+    plugins="yes"
+    tool="$rootdir/tools/scramble -add=erosqnative "
+    boottool="$rootdir/tools/mkspl-x1000 -type=nand -ppb=2 -bpp=2 "
+    output="rockbox.erosq"
+    bootoutput="bootloader.erosq"
+    sysfontbl="16-Terminus"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset="$x1000tools"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="mips"
+    t_manufacturer="ingenic_x1000"
+    t_model="erosqnative"
+    # player version, for bootloader usage
+    # version 3
+    extradefines="$extradefines -DEROSQN_VER=3"
+    ;;
+
+
    *)
     echo "Please select a supported target platform!"
     exit 7
@@ -4735,7 +4771,7 @@ cmdline=`echo $cmdline | sed -e s,--target=[a-zA-Z_0-9]\*,,g \
                             -e s,--ram=[0-9]\*,,g \
                             -e s,--rbdir=[./a-zA-Z0-9]\*,,g \
                             -e s,--voice=[-_./a-zA-Z0-9]\*,,g \
-                            -e s,--type=[a-zA-Z]\*,,g`
+                            -e s,--type=[a-zA-Z0-9]\*,,g`
 cmdline="$cmdline --target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts"
 
 ### end of cmdline
diff --git a/tools/genlang b/tools/genlang
index 45f7bc82d9..6d0aa12528 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -21,14 +21,6 @@ my $LANGUAGE_FLAG_UNITS_FIRST = 0x02;
 my $HEADER_SIZE       = 4;
 my $SUBHEADER_SIZE    = 6;
 
-# A note for future users and readers: The original v1 language system allowed
-# the build to create and use a different language than english built-in. We
-# removed that feature from our build-system, but the build scripts still had
-# the ability. But, starting now, this ability is no longer provided since I
-# figured it was boring and unnecessary to write support for now since we
-# don't use it anymore.
-
-
 if(!$ARGV[0]) {
     print <<MOO
 Usage: genlang [options] <langv2 file>
@@ -46,11 +38,7 @@ Usage: genlang [options] <langv2 file>
 
  -e=<english lang file>
     Point out the english (original source) file, to use that as master
-    language template. Used in combination with -b, -u or -s.
-
- -s
-    Sort the Update language file in the same order as the strings in the
-    English file.
+    language template. Used in combination with -b.
 
  -t=<target>
     Specify which target you want the translations/phrases for. Required when
@@ -73,41 +61,26 @@ MOO
     exit;
 }
 
-# How update works:
-#
-# 1) scan the english file, keep the whole <phrase> for each phrase.
-# 2) read the translated file, for each end of phrase, compare:
-#  A) all source strings, if there's any change there should be a comment about
-#     it output
-#  B) the desc fields
-#
-# 3) output the phrase with the comments from above
-# 4) check which phrases that the translated version didn't have, and spit out
-#    the english version of those
-#
-
 my $prefix = $p;
 my $binary = $b;
-my $sortfile = $s;
 my $binvoice = $c;
 
 my $english = $e;
 my $voiceout = $o;
 
-my $check = ($binary?.5:0) + ($prefix?1:0) + ($voiceout?1:0) + ($sortfile?1:0) + ($binvoice?.5:0);
+my $check = ($binary?.5:0) + ($prefix?1:0) + ($voiceout?1:0) + ($binvoice?.5:0);
 
 if($check > 1) {
-    print STDERR "Please use only one of -p, -o, -b, -c and -s\n";
+    print STDERR "Please use only one of -p, -o, -b, and -c\n";
     exit;
 }
 if(!$check) {
-    print STDERR "Please use at least one of -p, -o, -c, -e and -s\n";
+    print STDERR "Please use at least one of -p, -o, -c, and -e\n";
     exit;
 }
 
-
-if(($binary || $voiceout || $sortfile) && !$english) {
-    print STDERR "Please use -e too when you use -b, -o, -u or -s\n";
+if(($binary || $voiceout) && !$english) {
+    print STDERR "Please use -e too when you use -b, or -o\n";
     exit;
 }
 
@@ -118,7 +91,7 @@ if($binary && !$target_id) {
 }
 
 my $target = $t;
-if(!$target && !$sortfile) {
+if(!$target) {
     print STDERR "Please specify a target (with -t)!\n";
     exit;
 }
@@ -234,9 +207,8 @@ if($english) {
 }
 
 sub readenglish {
-    # For the cases where the english file needs to be scanned/read, we do
-    # it before we read the translated file. For -b it isn't necessary, but for
-    # -u it is convenient.
+    # For the cases where the english file needs to be scanned/read, we must
+    # do it before we read the translated file.
 
     my @idnum = ((0));       # start with a true number
     my @vidnum = ((0x8000)); # first voice id
@@ -318,7 +290,7 @@ sub readenglish {
             elsif($withindest && ($_ =~ / *([^:]+): *(.*)/)) {
                 my ($name, $val)=($1, $2);
                 $dest=""; # in case it is left untouched for when the
-                # model name isn't "our"
+                # model name isn't "ours"
                 dest($_, $name, $val);
 
                 if($dest) {
@@ -358,7 +330,6 @@ for (keys %users) {
 
 open(LANG, "<$input") || die "Error: couldn't read language file named $input\n";
 my @phrase;
-my $header = 1;
 my $langoptions = 0;
 
 while(<LANG>) {
@@ -376,13 +347,8 @@ while(<LANG>) {
         if ($_ =~ /LANGUAGE_UNITS_FIRST/) {
             $langoptions |= $LANGUAGE_FLAG_UNITS_FIRST;
         }
-
-        if ($header and $sortfile) {
-            print($_);
-        }
         next;
     }
-    $header = 0;
 
     my $ll = $_;
 
diff --git a/tools/hibyos_nativepatcher/hibyos_nativepatcher.sh b/tools/hibyos_nativepatcher/hibyos_nativepatcher.sh
new file mode 100755
index 0000000000..3c6661863f
--- /dev/null
+++ b/tools/hibyos_nativepatcher/hibyos_nativepatcher.sh
@@ -0,0 +1,221 @@
+#!/bin/bash
+# hibyos_nativepatcher.sh
+#
+# NOTE: THIS SCRIPT IS NOT TOLERANT OF WHITESPACE IN FILENAMES OR PATHS
+
+usage="hibyos_nativepatcher.sh
+    
+    USAGE: 
+    
+    hibyos_nativepatcher.sh <mkrbinstall/mkstockuboot> [arguments depend on mode, see below]
+
+    hibyos_nativepatcher.sh mkrbinstall <OFVERNAME (erosq or eros_h2)>
+        <path/to/output> <path/to/bootloader.erosq> <HWVER (hw1hw2 or hw3)> 
+        Output file will be path/to/output/erosqnative_RBVER-HWVER-OFVERNAME.upt.
+        Only the Hifiwalker H2 v1.3 uses "eros_h2", everything else uses "erosq".
+
+    hibyos_nativepatcher.sh mkstockuboot <path/to/OFupdatefile.upt>
+        Output file will be path/to/OFupdatefile-rbuninstall.upt.
+    
+    NOTE: THIS SCRIPT IS NOT TOLERANT OF WHITESPACE IN FILENAMES OR PATHS!"
+
+# check OS type and for any needed tools
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    echo "$OSTYPE DETECTED"
+elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    echo "$OSTYPE DETECTED"
+    if !(which 7z > /dev/null); then
+        echo "PLEASE INSTALL 7z (usually part of p7zip-full package)"
+        exit 1
+    fi
+    if !(which genisoimage > /dev/null); then
+        echo "PLEASE INSTALL genisoimage"
+        exit 1
+    fi
+else
+    echo "SCRIPT NOT IMPLEMENTED ON $OSTYPE YET!"
+    exit 1
+fi
+
+# make sure we can find patch_manifest
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+if !(which $SCRIPT_DIR/patch_manifest.pl > /dev/null); then
+    echo "couldn't find patch_manifest.pl!"
+    exit 1
+fi
+
+###########################################################################
+# MKRBINSTALL
+###########################################################################
+if [[ "$1" == "mkrbinstall" ]]; then
+    echo "Creating installation image from bootloader file..."
+
+    # make sure all arguments are accounted for...
+    if [[ -z "$5" ]]; then
+        echo "not all parameters included, please see usage:"
+        echo "$usage"
+        exit 1
+    fi
+
+    # validate arguments
+    outputdir=$(realpath --relative-base=$(pwd) $3)
+    if !(ls $outputdir >& /dev/null); then
+        echo "directory $outputdir doesn't seem to exist. Please make sure it exists, then re-run hibyos_nativepatcher.sh."
+        exit 1
+    fi
+
+    # note, bootloaderfile might still be a valid path, but not a valid bootloader file... check to make sure tar can extract it okay.
+    bootloaderfile=$(realpath --relative-base=$(pwd) $4)
+    if !(ls $bootloaderfile >& /dev/null); then
+        echo "bootloader file $bootloaderfile doesn't seem to exist. Please make sure it exists, then re-run hibyos_nativepatcher.sh."
+        exit 1
+    fi
+
+    # make working directory...
+    mkdir $outputdir/working_dir
+    workingdir=$(realpath $outputdir/working_dir)
+    mkdir $workingdir/bootloader
+
+    # extract bootloader file
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        # macos
+        tar -xvf $bootloaderfile --cd $workingdir/bootloader
+    elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        # linux-gnu
+        tar -xvf $bootloaderfile -C $workingdir/bootloader
+    fi
+
+    # make sure we got what we wanted
+    if !(ls $workingdir/bootloader/bootloader.ucl >& /dev/null); then
+        echo "can't find bootloader.ucl! help!"
+        rm -rf $workingdir
+        exit 1
+    elif !(ls $workingdir/bootloader/spl.erosq >& /dev/null); then
+        echo "can't find spl.erosq! help!"
+        rm -rf $workingdir
+        exit 1
+    fi
+
+    bootver=$(cat $workingdir/bootloader/bootloader-info.txt)
+    if [ -z "$bootver" ]; then
+        echo "COULDN'T FIND BOOTLOADER-INFO!"
+        rm -rf $workingdir
+        exit 1
+    fi
+
+    # if uboot.bin already exists, something is weird.
+    if (ls $workingdir/image_contents/uboot.bin >& /dev/null); then
+        echo "$workingdir/image_contents/uboot.bin already exists, something went weird."
+        rm -rf $workingdir
+        exit 1
+    fi
+
+    # everything exists, make the bin
+    mkdir $workingdir/image_contents/
+    touch $workingdir/image_contents/uboot.bin
+    echo "PATCHING!"
+    dd if=$workingdir/bootloader/spl.erosq of=$workingdir/image_contents/uboot.bin obs=1 seek=0 conv=notrunc
+    dd if=$workingdir/bootloader/bootloader.ucl of=$workingdir/image_contents/uboot.bin obs=1 seek=26624 conv=notrunc
+
+    # create update.txt
+    md5=($(md5sum $workingdir/image_contents/uboot.bin))
+    if [ -z "$md5" ]; then
+        echo "COULDN'T MD5SUM UBOOT.BIN!"
+        rm -rf $workingdir
+        exit 1
+    fi
+    echo "Create update manifest with md5sum $md5"
+    echo "" > $workingdir/image_contents/update.txt
+    $SCRIPT_DIR/patch_manifest.pl $md5 $workingdir/image_contents/update.txt
+
+    # create version.txt
+    echo "version={
+        name=$2
+        ver=2024-09-10T14:42:18+08:00
+}" > $workingdir/image_contents/version.txt
+
+    outputfilename="erosqnative_$bootver-$5-$2"
+
+
+###########################################################################
+# MKSTOCKUBOOT
+###########################################################################
+elif [[ "$1" == "mkstockuboot" ]]; then
+    echo "Creating uninstallation image from stock update image..."
+
+    # make sure all arguments are accounted for...
+    if [[ -z "$2" ]]; then
+        echo "not all parameters included, please see usage:"
+        echo "$usage"
+        exit 1
+    fi
+
+    updatefile=$(realpath --relative-base=$(pwd) $2)
+    updatefile_path=$(echo "$updatefile" | perl -ne "s/\/[\w\.\_\-]*$// && print")
+    updatefile_name=$(basename $updatefile)
+    updatefile_name_noext=$(echo "$updatefile_name" | perl -ne "s/\.\w*$// && print")
+    outputdir=$updatefile_path
+    outputfilename="$updatefile_name_noext-rbuninstall"
+
+    mkdir $updatefile_path/working_dir
+    workingdir=$(realpath $updatefile_path/working_dir)
+
+    # copy update.upt to update.iso
+    cp $updatefile $workingdir/$updatefile_name_noext-cpy.iso
+
+    mkdir $workingdir/image_contents
+
+    # extract iso
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        # macos
+        hdiutil attach $workingdir/$updatefile_name_noext-cpy.iso -mountpoint $workingdir/contentsiso
+
+        # copy out iso contents
+        cp $workingdir/contentsiso/* $workingdir/image_contents
+
+        # unmount iso
+        hdiutil detach $workingdir/contentsiso
+    elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        # linux-gnu
+        7z -o$workingdir/image_contents x $workingdir/$updatefile_name_noext-cpy.iso
+    fi
+
+    chmod 777 $workingdir/image_contents/*
+
+    # modify update.txt
+    md5=($(md5sum $workingdir/image_contents/uboot.bin))
+    if [ -z "$md5" ]; then
+        echo "COULDN'T MD5SUM UBOOT.BIN!"
+        rm -rf $working_dir
+        exit 1
+    fi
+    echo "add to update manifest with md5sum $md5"
+    $SCRIPT_DIR/patch_manifest.pl $md5 $workingdir/image_contents/update.txt
+
+######################################################################
+# PRINT USAGE
+######################################################################
+else
+    echo "$usage"
+    exit 1
+fi
+
+######################################################################
+# Common: make the image
+######################################################################
+# make the image
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    # macos
+    hdiutil makehybrid -iso -joliet -o $outputdir/output.iso $workingdir/image_contents/
+elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    # linux-gnu
+    genisoimage -o $outputdir/output.iso $workingdir/image_contents/
+fi
+
+# rename
+mv $outputdir/output.iso $outputdir/$outputfilename.upt
+
+# cleaning up
+rm -rf $workingdir
+
+exit 0
diff --git a/tools/hibyos_nativepatcher/patch_manifest.pl b/tools/hibyos_nativepatcher/patch_manifest.pl
new file mode 100755
index 0000000000..82c6378c65
--- /dev/null
+++ b/tools/hibyos_nativepatcher/patch_manifest.pl
@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+# add bootloader info to update manifest
+# usage: ./patch_manifest.pl <md5sum> <path/to/update.txt>
+
+my $md5 = $ARGV[0];
+my $updatefile = $ARGV[1];
+my $bootloader_manif =
+"bootloader={
+        name=uboot
+        file_path=autoupdate/uboot.bin
+        md5=$md5
+}\n";
+
+# read in existing manifest
+open(FH, '<', "$updatefile");
+read(FH, my $manifest, -s FH);
+close(FH);
+
+# delete existing bootloader entry if exists
+$manifest =~ s/bootloader\s*=\s*{[^}]*}//;
+
+# add our own bootloader entry
+$manifest = "$bootloader_manif$manifest";
+
+open(FH, '>', "$updatefile");
+print FH $manifest;
+close(FH);
diff --git a/tools/release/manuals.pl b/tools/release/manuals.pl
index 61d298fd38..3493aac86d 100755
--- a/tools/release/manuals.pl
+++ b/tools/release/manuals.pl
@@ -28,7 +28,7 @@ sub runone {
 
     chdir "..";
 
-    my $o="buildm-$dir/rockbox-$dir-$version.pdf";
+    my $o="buildm-$dir/rockbox-manual.pdf";
     if (-f $o) {
         my $newo="$outdir/rockbox-$dir-$version.pdf";
         system("mv $o $newo");
@@ -74,6 +74,6 @@ sub buildit {
 
 `mkdir -p $outdir`;
 
-for my $b (&usablebuilds) {
+for my $b (&manualbuilds) {
     runone($b);
 }
diff --git a/tools/release/voices.pl b/tools/release/voices.pl
index 42bf533118..1b08123673 100755
--- a/tools/release/voices.pl
+++ b/tools/release/voices.pl
@@ -68,12 +68,13 @@ sub buildit {
 # run make in tools first to make sure they're up-to-date
 `(cd tools && make ) >/dev/null 2>&1`;
 
-my $home=$ENV{'HOME'};
-
-my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
-`mkdir -p $pool`;
-`rm -f $pool/*`;
-$ENV{'POOL'}="$pool";
+if (!defined($ENV{'POOL'}) {
+    my $home=$ENV{'HOME'};
+    my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
+    `mkdir -p $pool`;
+    $ENV{'POOL'}="$pool";
+}
+# `rm -f $pool/*`;
 
 `mkdir -p $outdir`;
 
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 63b1a1f5a1..f8e9ab2140 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -378,8 +378,14 @@ buildtool() {
             $config_opt
     elif [ "$config_opt" != "NO_CONFIGURE" ]; then
         echo "ROCKBOXDEV: $toolname/configure"
+        cflags='-U_FORTIFY_SOURCE -fgnu89-inline -O2'
+        if [ "$tool" == "glib" ]; then
+            run_cmd "$logfile" sed -i -e 's/m4_copy/m4_copy_force/g' "$cfg_dir/m4macros/glib-gettext.m4"
+            run_cmd "$logfile" autoreconf -fiv "$cfg_dir"
+            cflags="$cflags -Wno-format-nonliteral -Wno-format-overflow"
+        fi
         # NOTE glibc requires to be compiled with optimization
-        CFLAGS='-U_FORTIFY_SOURCE -fgnu89-inline -O2' CXXFLAGS="$CXXFLAGS" run_cmd "$logfile" \
+        CFLAGS="$cflags" CXXFLAGS="$CXXFLAGS" run_cmd "$logfile" \
             "$cfg_dir/configure" "--prefix=$prefix" \
             --disable-docs $config_opt
     fi
diff --git a/tools/updatelang b/tools/updatelang
index a05011e645..ff4ce340e0 100755
--- a/tools/updatelang
+++ b/tools/updatelang
@@ -158,7 +158,7 @@ sub reduceformat($) {
 ##################
 
 if($#ARGV != 2) {
-    print "Usage: updatelang <english.lang> <otherlang> <outfile|->\n";
+    print "Usage: [ENGLISHORDER=1] updatelang <english.lang> <otherlang> <outfile|->\n";
     exit;
 }
 
@@ -402,9 +402,9 @@ foreach my $id (@langorder) {
 
         my $sane = $lang{$id}{'dest'}{$tgt};
         $sane =~ s/^~?(.*)/$1/;  # Strip off leading ~ if it's there as it's not a legal character otherwise
-        if ($sane =~ tr/"~//) {
+        if ($sane =~ tr/"~<>//) {
             # If it has suspicious characters that are not allowed
-            $lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' has some suspicious characters (eg '~'), please double-check!\n";
+            $lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' has some suspicious characters (eg \",~,<,>), please double-check!\n";
 #           print "#!! '$id:$tgt' suspicious characters\n";
         }
     }
@@ -476,9 +476,9 @@ foreach my $id (@langorder) {
         }
         my $sane = $lang{$id}{'voice'}{$tgt};
         $sane =~ s/^~?(.*)/$1/;  # Strip off leading ~ if it's there as it's not a legal character otherwise
-        if ($sane =~ tr/%"~//) {
-            # If it has suspicious characters that are not normally voiced..
-            $lang{$id}{'notes'} .= "### The <voice> section for '$id:$tgt' has some suspicious characters (eg '%' or '~'), please double-check!\n";
+        if ($sane =~ tr/%"~:\[\]<>{}\|//) {
+            # Suspicious characters that are not typically voiced..
+            $lang{$id}{'notes'} .= "### The <voice> section for '$id:$tgt' has some suspicious characters (eg %,\",~,:,<,>,[,],{,},|), please correct!\n";
 #            print "#!! '$id:$tgt' suspicious characters\n";
         }
         if ($lang{$id}{'voice'}{$tgt} =~ /\.\.\./) {
@@ -502,7 +502,14 @@ foreach (@langheader) {
     print $fh $_;
 }
 
-my @finalorder = @langorder;  # TODO make configurable vs @englishorder
+my @finalorder;
+
+if ($ENV{'ENGLISHORDER'}) {
+    @finalorder = @englishorder;
+} else {
+    @finalorder = @langorder;
+}
+
 foreach my $id (@finalorder) {
     if (!defined($english{$id})) {
         next;
diff --git a/tools/voice.pl b/tools/voice.pl
index 1c547c7d96..1180565b64 100755
--- a/tools/voice.pl
+++ b/tools/voice.pl
@@ -8,6 +8,7 @@
 # $Id$
 #
 # Copyright (C) 2007 Jonas Häggqvist
+# Copyright (C) 2020 Solomon Peachy
 #
 # All files in this archive are subject to the GNU General Public License.
 # See the file COPYING in the source tree root for full license agreement.
@@ -87,6 +88,8 @@ my %festival_lang_map = (
 
 my %gtts_lang_map = (
     'english' => '-l en -t co.uk',  # Always first, it's the golden master
+    'bulgarian' => '-l bg',
+    'chinese-simp' => '-l zh',
     'czech' => '-l cs',
     'dansk' => '-l da',
     'deutsch' => '-l de',
@@ -95,8 +98,9 @@ my %gtts_lang_map = (
     'espanol' => '-l es',
     'francais' => '-l fr',
     'greek' => '-l el',
-    'magyar' => '-l hu',
     'italiano' => '-l it',
+    'korean' => '-l ko',
+    'magyar' => '-l hu',
     'nederlands' => '-l nl',
     'norsk' => '-l no',
     'polski' => '-l pl',
@@ -109,6 +113,8 @@ my %gtts_lang_map = (
 
 my %espeak_lang_map = (
     'english' => '-ven-gb -k 5',  # Always first, it's the golden master
+    'bulgarian' => '-vbg',
+    'chinese-simp' => '-vzh',
     'czech' => '-vcs',
     'dansk' => '-vda',
     'deutsch' => '-vde',
@@ -117,9 +123,10 @@ my %espeak_lang_map = (
     'espanol' => '-ves',
     'francais' => '-vfr-fr',
     'greek' => '-vel',
-    'magyar' => '-vhu',
     'italiano' => '-vit',
     'japanese' => '-vja',
+    'korean' => '-vko',
+    'magyar' => '-vhu',
     'nederlands' => '-vnl',
     'norsk' => '-vno',
     'polski' => '-vpl',
@@ -131,7 +138,9 @@ my %espeak_lang_map = (
     );
 
 my %piper_lang_map = (
-    'english' => 'en_GB-cori-high.onnx',  # Always first, it's the golden master
+    'english' => 'en_GB-semaine-medium.onnx',  # Always first, it's the golden master
+#    'bulgarian' => '-vbg',
+    'chinese-simp' => 'zh_CN-huayan-medium.onnx',
     'czech' => 'cs_CZ-jirka-medium.onnx',
     'dansk' => 'da_DK-talesyntese-medium.onnx',
     'deutsch' => 'de_DE-thorsten-high.onnx',
@@ -140,9 +149,10 @@ my %piper_lang_map = (
     'espanol' => 'es_ES-sharvard-medium.onnx',
     'francais' => 'fr_FR-siwis-medium.onnx',
     'greek' => 'el_GR-rapunzelina-low.onnx',
-    'magyar' => 'hu_HU-anna-medium.onnx',
     'italiano' => 'it_IT-paola-medium.onnx',
 #    'japanese' => '-vja',
+#    'korean' => '-vko',
+    'magyar' => 'hu_HU-anna-medium.onnx',
     'nederlands' => 'nl_NL-mls-medium.onnx',
     'norsk' => 'no_NO-talesyntese-medium.onnx',
     'polski' => 'pl_PL-gosia-medium.onnx',
@@ -153,7 +163,7 @@ my %piper_lang_map = (
     'turkce' => 'tr_TR-fettah-medium.onnx',
 );
 
-my $trim_thresh = 500;   # Trim silence if over this, in ms
+my $trim_thresh = 250;   # Trim silence if over this, in ms
 my $force = 0;           # Don't regenerate files already present
 
 # Initialize TTS engine. May return an object or value which will be passed
@@ -476,7 +486,7 @@ sub generateclips {
                 # If we have a pool of snippets, see if the string exists there first
                 if (defined($ENV{'POOL'})) {
                     $pool_file = sprintf("%s/%s-%s.enc", $ENV{'POOL'},
-                                         md5_hex(Encode::encode_utf8("$voice ". $tts_object->{"name"}." $tts_engine_opts $encoder_opts")),
+                                         md5_hex(Encode::encode_utf8("$voice ". $tts_object->{"name"}." $tts_engine_opts ".$tts_object->{"ttsoptions"}." $encoder_opts")),
                                          $language);
                     if (-f $pool_file) {
                         printf("Re-using %s (%s) from pool\n", $id, $voice) if $verbose;
@@ -585,17 +595,21 @@ sub gentalkclips {
             print(".");
         }
 
-        # Convert to a complete path
-        my $path = sprintf("%s/%s", $dir, $file);
-
-        $voice = $file;
-        $wav = sprintf("%s.talk.wav", $path);
-
         # Ignore dot-dirs and talk files
         if ($file eq '.' || $file eq '..' || $file =~ /\.talk$/) {
             next;
         }
 
+        $voice = $file;
+
+        # Convert some symbols to spaces
+        $voice =~ tr/_-/  /;
+
+        # Convert to a complete path
+        my $path = sprintf("%s/%s", $dir, $file);
+
+        $wav = sprintf("%s.talk.wav", $path);
+
         if ( -d $path) { # Element is a dir
             $enc = sprintf("%s/_dirname.talk", $path);
             if (! -e "$path/talkclips.ignore") { # Skip directories containing "talkclips.ignore"
@@ -670,7 +684,7 @@ if ($V == 1) {
 
     printf("Generating voice\n  Target: %s\n  Language: %s\n  Encoder (options): %s (%s)\n  TTS Engine (options): %s (%s)\n  Pool directory: %s\n",
            defined($t) ? $t : "unknown",
-           $l, $e, $E, $s, $S, defined($ENV{'POOL'}) ? $ENV{'POOL'} : "<none>");
+           $l, $e, $E, $s, "$S $tts_object->{ttsoptions}", defined($ENV{'POOL'}) ? $ENV{'POOL'} : "<none>");
     generateclips($l, $t, $e, $E, $tts_object, $S, $f);
     shutdown_tts($tts_object);
     createvoice($l, $i, $f);
diff --git a/tools/xduoox3-updatebl.sh b/tools/xduoox3-updatebl.sh
new file mode 100755
index 0000000000..efb52bff8c
--- /dev/null
+++ b/tools/xduoox3-updatebl.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+unzip $1 rockbox.bin
+dd if=bootloader-x3.bin of=rockbox.bin bs=2048 seek=4 conv=nocreat conv=notrunc
+zip -o $1 rockbox.bin rockbox-info.txt
+rm rockbox.bin