aarch64 fix

python_libtorrent/platform_pulsar.py

@@ -125,8 +125,6 @@ def get_platform():
                     ret["arch"] = "armv7"
                 elif "armv6" in uname:
                     ret["arch"] = "armv6"
-                elif "aarch64" in os.uname()[4]:
-                    ret["arch"] = "aarch64"
                 else:
                     ret["arch"] = "arm"
             elif "mips" in uname:
@@ -134,6 +132,8 @@ def get_platform():
                     ret["arch"] = 'mipsel_ucs4'
                 else:
                     ret["arch"] = 'mipsel_ucs2'
+            if os.uname()[4]=="aarch64":
+                ret["arch"] = "aarch64"
         elif xbmc.getCondVisibility("system.platform.windows"):
             ret["os"] = "windows"
         elif xbmc.getCondVisibility("system.platform.osx"):
@@ -161,6 +161,10 @@ def get_system(ret):
         ret["system"] = 'linux_x86'
         ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.',
                           'You should install it by "sudo apt-get install python-libtorrent"']
+    elif ret["os"] == "linux" and ret["arch"] == "aarch64":
+        ret["system"] = 'linux_aarch64'
+        ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.',
+                          'You should install it by "sudo apt-get install python-libtorrent"']
     elif ret["os"] == "linux" and ("arm" or "mips" in ret["arch"]):
         ret["system"] = 'linux_'+ret["arch"]
         ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.',

python_libtorrent/python_libtorrent/__init__.py

@@ -92,7 +92,7 @@ if platform['system'] not in ['windows']:
 
 try:
     if platform['system'] in ['linux_x86', 'windows', 'linux_armv6', 'linux_armv7',
-                              'linux_x86_64', 'linux_mipsel_ucs2', 'linux_mipsel_ucs4']:
+                              'linux_x86_64', 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', 'linux_aarch64']:
         import libtorrent
     elif platform['system'] in ['darwin', 'ios_arm']:
         import imp

python_libtorrent/python_libtorrent/platform_pulsar.py

@@ -125,8 +125,6 @@ def get_platform():
                     ret["arch"] = "armv7"
                 elif "armv6" in uname:
                     ret["arch"] = "armv6"
-                elif "aarch64" in os.uname()[4]:
-                    ret["arch"] = "aarch64"
                 else:
                     ret["arch"] = "arm"
             elif "mips" in uname:
@@ -134,6 +132,8 @@ def get_platform():
                     ret["arch"] = 'mipsel_ucs4'
                 else:
                     ret["arch"] = 'mipsel_ucs2'
+            if os.uname()[4]=="aarch64":
+                ret["arch"] = "aarch64"
         elif xbmc.getCondVisibility("system.platform.windows"):
             ret["os"] = "windows"
         elif xbmc.getCondVisibility("system.platform.osx"):
@@ -161,6 +161,10 @@ def get_system(ret):
         ret["system"] = 'linux_x86'
         ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.',
                           'You should install it by "sudo apt-get install python-libtorrent"']
+    elif ret["os"] == "linux" and ret["arch"] == "aarch64":
+        ret["system"] = 'linux_aarch64'
+        ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.',
+                          'You should install it by "sudo apt-get install python-libtorrent"']
     elif ret["os"] == "linux" and ("arm" or "mips" in ret["arch"]):
         ret["system"] = 'linux_'+ret["arch"]
         ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.',

resources/language/english/strings.xml

@@ -28,7 +28,7 @@
 	<string id="1152">1.0.7</string>
 	<string id="1153">1.0.8</string>
 	<string id="1154">1.0.9</string>
-	<string id="1154">1.1.0</string>
+	<string id="1155">1.1.0</string>
 	
 	<string id="1010">TS Engine not running!</string>
 	<string id="1011">No answer</string>