Merge pull request #131 from kloptops/main

Updated xdelta3, updated port.json version.

BUILDING_STUFF.md

@@ -0,0 +1,28 @@
+# This file is for me to remember how to build xdelta/gptokeyb/gptokeyb2/sdl_resolution
+
+# TODO: document the others.
+
+# XDELTA3 Compilation
+
+## Compile liblzma statically
+```sh
+./configure --enable-static=yes --enable-shared=no
+make -j4
+sudo make install
+```
+
+## Compile xdelta3 statically with liblzma
+
+```sh
+git clone "https://github.com/jmacd/xdelta.git"
+cd xdelta
+git checkout release3_1_apl
+wget https://patch-diff.githubusercontent.com/raw/jmacd/xdelta/pull/241.diff
+git apply 241.diff
+cd xdelta3
+
+./generate_build_files.sh
+LDFLAGS=-L/usr/local/lib/ CXXFLAGS=-I/usr/local/include ./configure --with-liblzma
+make -j4
+strip xdelta3
+```

PortMaster/pylibs/harbourmaster/hardware.py

@@ -200,7 +200,7 @@ def nice_device_to_device(raw_device):
     raw_device = raw_device.split('\0', 1)[0]
 
     pattern_to_device = (
-        ('sun50iw9', 'rg35xx-h'),
+        ('sun50iw9',  'rg35xx-h'),
         ('sun50iw10', 'trimui-smart-pro'),
 
         ('Hardkernel ODROID-GO-Ultra',  'ogu'),
@@ -254,7 +254,7 @@ def new_device_info():
     if retrodeck_version != '':
         info['name'] = 'RetroDECK'
         info['version'] = retrodeck_version.join(re.findall(r'version=(.*)', retrodeck_version))
-        info['device'] = 'RetroDECK'
+        info['device'] = 'retrodeck'
 
     ## Works on muOS (obviously)
     muos_version = safe_cat('/opt/muos/config/version.txt')
@@ -264,7 +264,7 @@ def new_device_info():
 
     muos_device = safe_cat('/opt/muos/config/device.txt')
     if muos_device != '':
-        info['device'] = muos_device.lower().replace('-', ' ')
+        info['device'] = muos_device.lower().replace(' ', '-')
 
     # Works on TrimUI Smart Pro
     if Path('/usr/trimui').is_dir():

PortMaster/pylibs/harbourmaster/info.py

@@ -14,7 +14,7 @@
 ################################################################################
 ## Port Information
 PORT_INFO_ROOT_ATTRS = {
-    'version': 2,
+    'version': 3,
     'name': None,
     'items': None,
     'items_opt': None,
@@ -119,6 +119,9 @@ def port_info_load(raw_info, source_name=None, do_default=False):
                 }
             del info['md5']
 
+    if info.get('version', None) == 2:
+        info['version'] = 3
+
     # WHOOPS! :O
     if info.get('attr', {}).get('runtime', None) == "blank":
         info['attr']['runtime'] = None