diff --git a/addon.xml b/addon.xml index abd88d0..1ddef00 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/changelog.txt b/changelog.txt index 9ceffba..bb1f101 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,7 @@ 1.1.0: Lastest library is default -Added 1.1.0 for Unix x86, Unix amd64, Unix ARM v6,7,8-64 +Added 1.1.0 for Unix x86, Unix amd64, Unix ARM v6,7 +Added 1.1.0 for aarch64 (UCS2, UCS4) by aisman 1.0.9: 1.0.9 is default diff --git a/python_libtorrent/linux_aarch64/1.1.0/__init__.py b/python_libtorrent/linux_aarch64_ucs2/1.1.0/__init__.py similarity index 100% rename from python_libtorrent/linux_aarch64/1.1.0/__init__.py rename to python_libtorrent/linux_aarch64_ucs2/1.1.0/__init__.py diff --git a/python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.size.txt b/python_libtorrent/linux_aarch64_ucs2/1.1.0/libtorrent.so.size.txt similarity index 100% rename from python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.size.txt rename to python_libtorrent/linux_aarch64_ucs2/1.1.0/libtorrent.so.size.txt diff --git a/python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.zip b/python_libtorrent/linux_aarch64_ucs2/1.1.0/libtorrent.so.zip similarity index 100% rename from python_libtorrent/linux_aarch64/1.1.0/libtorrent.so.zip rename to python_libtorrent/linux_aarch64_ucs2/1.1.0/libtorrent.so.zip diff --git a/python_libtorrent/linux_aarch64/__init__.py b/python_libtorrent/linux_aarch64_ucs2/__init__.py similarity index 100% rename from python_libtorrent/linux_aarch64/__init__.py rename to python_libtorrent/linux_aarch64_ucs2/__init__.py diff --git a/python_libtorrent/linux_aarch64_ucs4/1.1.0/__init__.py b/python_libtorrent/linux_aarch64_ucs4/1.1.0/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_aarch64_ucs4/1.1.0/__init__.py @@ -0,0 +1,24 @@ +#-*- coding: utf-8 -*- +''' + python-libtorrent for Kodi (script.module.libtorrent) + Copyright (C) 2015-2016 DiMartino, srg70, RussakHH, aisman + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +''' diff --git a/python_libtorrent/linux_aarch64_ucs4/1.1.0/libtorrent.so.size.txt b/python_libtorrent/linux_aarch64_ucs4/1.1.0/libtorrent.so.size.txt new file mode 100644 index 0000000..c7741ef --- /dev/null +++ b/python_libtorrent/linux_aarch64_ucs4/1.1.0/libtorrent.so.size.txt @@ -0,0 +1 @@ +2868560 \ No newline at end of file diff --git a/python_libtorrent/linux_aarch64_ucs4/1.1.0/libtorrent.so.zip b/python_libtorrent/linux_aarch64_ucs4/1.1.0/libtorrent.so.zip new file mode 100644 index 0000000..1c10fab Binary files /dev/null and b/python_libtorrent/linux_aarch64_ucs4/1.1.0/libtorrent.so.zip differ diff --git a/python_libtorrent/linux_aarch64_ucs4/__init__.py b/python_libtorrent/linux_aarch64_ucs4/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_aarch64_ucs4/__init__.py @@ -0,0 +1,24 @@ +#-*- coding: utf-8 -*- +''' + python-libtorrent for Kodi (script.module.libtorrent) + Copyright (C) 2015-2016 DiMartino, srg70, RussakHH, aisman + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +''' diff --git a/python_libtorrent/platform_pulsar.py b/python_libtorrent/platform_pulsar.py index 94bbb5c..a44c899 100644 --- a/python_libtorrent/platform_pulsar.py +++ b/python_libtorrent/platform_pulsar.py @@ -49,7 +49,7 @@ def get_libname(platform): libname=[] if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', 'linux_armv7', 'linux_x86_64', 'ios_arm', - 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', 'linux_aarch64']: + 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', 'linux_aarch64_ucs2', 'linux_aarch64_ucs4']: libname=['libtorrent.so'] elif platform['system'] == 'windows': libname=['libtorrent.pyd'] @@ -107,7 +107,10 @@ def get_platform(): ret["arch"] = "mipsel_ucs4" elif system == 12: ret["os"] = "linux" - ret["arch"] = "linux_aarch64" + ret["arch"] = "linux_aarch64_ucs2" + elif system == 13: + ret["os"] = "linux" + ret["arch"] = "linux_aarch64_ucs4" else: ret = { @@ -132,8 +135,11 @@ def get_platform(): ret["arch"] = 'mipsel_ucs4' else: ret["arch"] = 'mipsel_ucs2' - if os.uname()[4]=="aarch64": - ret["arch"] = "aarch64" + elif "aarch64" in uname: + if sys.maxunicode > 65536: + ret["arch"] = 'aarch64_ucs4' + else: + ret["arch"] = 'aarch64_ucs2' elif xbmc.getCondVisibility("system.platform.windows"): ret["os"] = "windows" elif xbmc.getCondVisibility("system.platform.osx"): @@ -161,8 +167,8 @@ 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' + elif ret["os"] == "linux" and "aarch64" in ret["arch"]: + ret["system"] = 'linux_' + ret["arch"] 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"]): diff --git a/python_libtorrent/python_libtorrent/__init__.py b/python_libtorrent/python_libtorrent/__init__.py index e9dbb4a..a99f2f5 100644 --- a/python_libtorrent/python_libtorrent/__init__.py +++ b/python_libtorrent/python_libtorrent/__init__.py @@ -89,10 +89,15 @@ if __settings__.getSetting('plugin_name')!=__plugin__: log('platform: ' + str(platform)) if platform['system'] not in ['windows']: log('os: '+str(os.uname())) + if sys.maxunicode > 65536: + log('ucs4') + else: + log('ucs2') try: if platform['system'] in ['linux_x86', 'windows', 'linux_armv6', 'linux_armv7', - 'linux_x86_64', 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', 'linux_aarch64']: + 'linux_x86_64', 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', + 'linux_aarch64_ucs2', 'linux_aarch64_ucs4']: import libtorrent elif platform['system'] in ['darwin', 'ios_arm']: import imp diff --git a/python_libtorrent/python_libtorrent/platform_pulsar.py b/python_libtorrent/python_libtorrent/platform_pulsar.py index 94bbb5c..a44c899 100644 --- a/python_libtorrent/python_libtorrent/platform_pulsar.py +++ b/python_libtorrent/python_libtorrent/platform_pulsar.py @@ -49,7 +49,7 @@ def get_libname(platform): libname=[] if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', 'linux_armv7', 'linux_x86_64', 'ios_arm', - 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', 'linux_aarch64']: + 'linux_mipsel_ucs2', 'linux_mipsel_ucs4', 'linux_aarch64_ucs2', 'linux_aarch64_ucs4']: libname=['libtorrent.so'] elif platform['system'] == 'windows': libname=['libtorrent.pyd'] @@ -107,7 +107,10 @@ def get_platform(): ret["arch"] = "mipsel_ucs4" elif system == 12: ret["os"] = "linux" - ret["arch"] = "linux_aarch64" + ret["arch"] = "linux_aarch64_ucs2" + elif system == 13: + ret["os"] = "linux" + ret["arch"] = "linux_aarch64_ucs4" else: ret = { @@ -132,8 +135,11 @@ def get_platform(): ret["arch"] = 'mipsel_ucs4' else: ret["arch"] = 'mipsel_ucs2' - if os.uname()[4]=="aarch64": - ret["arch"] = "aarch64" + elif "aarch64" in uname: + if sys.maxunicode > 65536: + ret["arch"] = 'aarch64_ucs4' + else: + ret["arch"] = 'aarch64_ucs2' elif xbmc.getCondVisibility("system.platform.windows"): ret["os"] = "windows" elif xbmc.getCondVisibility("system.platform.osx"): @@ -161,8 +167,8 @@ 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' + elif ret["os"] == "linux" and "aarch64" in ret["arch"]: + ret["system"] = 'linux_' + ret["arch"] 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"]): diff --git a/resources/language/english/strings.xml b/resources/language/english/strings.xml index 95ae617..6f70b2e 100644 --- a/resources/language/english/strings.xml +++ b/resources/language/english/strings.xml @@ -21,7 +21,8 @@ iOS Linux MIPSEL (UCS2) Linux MIPSEL (UCS4) - Linux ARM v8 64 (AARCH64) + Linux ARM v8 AARCH64 (UCS2) + Linux ARM v8 AARCH64 (UCS4) 0.16.19 1.0.6