diff --git a/addon.xml b/addon.xml index 7faed30..b905175 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/changelog.txt b/changelog.txt index 4fac63d..a94d432 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ 1.0.9: -Added 1.0.9 for Android, Mac, iOS, Unix ARM & mipsel +Added 1.0.9 for Android, Mac, iOS, Unix ARM & mipsel (UCS2, UCS4) Added 1.0.9 for Windows, Unix x86 & amd64 1.0.8: diff --git a/python_libtorrent/linux_mips/1.0.9/__init__.py b/python_libtorrent/linux_mipsel_ucs2/1.0.9/__init__.py similarity index 100% rename from python_libtorrent/linux_mips/1.0.9/__init__.py rename to python_libtorrent/linux_mipsel_ucs2/1.0.9/__init__.py diff --git a/python_libtorrent/linux_mipsel_ucs2/1.0.9/libtorrent.so.size.txt b/python_libtorrent/linux_mipsel_ucs2/1.0.9/libtorrent.so.size.txt new file mode 100644 index 0000000..314f7bd --- /dev/null +++ b/python_libtorrent/linux_mipsel_ucs2/1.0.9/libtorrent.so.size.txt @@ -0,0 +1 @@ +4596396 \ No newline at end of file diff --git a/python_libtorrent/linux_mipsel_ucs2/1.0.9/libtorrent.so.zip b/python_libtorrent/linux_mipsel_ucs2/1.0.9/libtorrent.so.zip new file mode 100644 index 0000000..e1b3a5f Binary files /dev/null and b/python_libtorrent/linux_mipsel_ucs2/1.0.9/libtorrent.so.zip differ diff --git a/python_libtorrent/linux_mips/__init__.py b/python_libtorrent/linux_mipsel_ucs2/__init__.py similarity index 100% rename from python_libtorrent/linux_mips/__init__.py rename to python_libtorrent/linux_mipsel_ucs2/__init__.py diff --git a/python_libtorrent/linux_mipsel_ucs4/1.0.9/__init__.py b/python_libtorrent/linux_mipsel_ucs4/1.0.9/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_mipsel_ucs4/1.0.9/__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_mips/1.0.9/libtorrent.so.size.txt b/python_libtorrent/linux_mipsel_ucs4/1.0.9/libtorrent.so.size.txt similarity index 100% rename from python_libtorrent/linux_mips/1.0.9/libtorrent.so.size.txt rename to python_libtorrent/linux_mipsel_ucs4/1.0.9/libtorrent.so.size.txt diff --git a/python_libtorrent/linux_mips/1.0.9/libtorrent.so.zip b/python_libtorrent/linux_mipsel_ucs4/1.0.9/libtorrent.so.zip similarity index 99% rename from python_libtorrent/linux_mips/1.0.9/libtorrent.so.zip rename to python_libtorrent/linux_mipsel_ucs4/1.0.9/libtorrent.so.zip index 6b84986..bf94aef 100644 Binary files a/python_libtorrent/linux_mips/1.0.9/libtorrent.so.zip and b/python_libtorrent/linux_mipsel_ucs4/1.0.9/libtorrent.so.zip differ diff --git a/python_libtorrent/linux_mipsel_ucs4/__init__.py b/python_libtorrent/linux_mipsel_ucs4/__init__.py new file mode 100644 index 0000000..e0aed70 --- /dev/null +++ b/python_libtorrent/linux_mipsel_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 b344442..b67df58 100644 --- a/python_libtorrent/platform_pulsar.py +++ b/python_libtorrent/platform_pulsar.py @@ -48,7 +48,8 @@ def log(msg): def get_libname(platform): libname=[] if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', - 'linux_armv7', 'linux_x86_64', 'ios_arm', 'linux_mips']: + 'linux_armv7', 'linux_x86_64', 'ios_arm', + 'linux_mipsel_ucs2', 'linux_mipsel_ucs4']: libname=['libtorrent.so'] elif platform['system'] == 'windows': libname=['libtorrent.pyd'] @@ -100,7 +101,10 @@ def get_platform(): ret["arch"] = "arm" elif system==10: ret["os"] = "linux" - ret["arch"] = "mips" + ret["arch"] = "mipsel_ucs2" + elif system==11: + ret["os"] = "linux" + ret["arch"] = "mipsel_ucs4" else: ret = { @@ -121,7 +125,10 @@ def get_platform(): else: ret["arch"] = "arm" elif "mips" in uname: - ret["arch"] = "mips" + if sys.maxunicode > 65536: + ret["arch"] = 'mipsel_ucs4' + else: + ret["arch"] = 'mipsel_ucs2' elif xbmc.getCondVisibility("system.platform.windows"): ret["os"] = "windows" elif xbmc.getCondVisibility("system.platform.osx"): diff --git a/python_libtorrent/python_libtorrent/__init__.py b/python_libtorrent/python_libtorrent/__init__.py index 9458f6b..4bb72e9 100644 --- a/python_libtorrent/python_libtorrent/__init__.py +++ b/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_mips']: + 'linux_x86_64', 'linux_mipsel_ucs2', 'linux_mipsel_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 b344442..b67df58 100644 --- a/python_libtorrent/python_libtorrent/platform_pulsar.py +++ b/python_libtorrent/python_libtorrent/platform_pulsar.py @@ -48,7 +48,8 @@ def log(msg): def get_libname(platform): libname=[] if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', - 'linux_armv7', 'linux_x86_64', 'ios_arm', 'linux_mips']: + 'linux_armv7', 'linux_x86_64', 'ios_arm', + 'linux_mipsel_ucs2', 'linux_mipsel_ucs4']: libname=['libtorrent.so'] elif platform['system'] == 'windows': libname=['libtorrent.pyd'] @@ -100,7 +101,10 @@ def get_platform(): ret["arch"] = "arm" elif system==10: ret["os"] = "linux" - ret["arch"] = "mips" + ret["arch"] = "mipsel_ucs2" + elif system==11: + ret["os"] = "linux" + ret["arch"] = "mipsel_ucs4" else: ret = { @@ -121,7 +125,10 @@ def get_platform(): else: ret["arch"] = "arm" elif "mips" in uname: - ret["arch"] = "mips" + if sys.maxunicode > 65536: + ret["arch"] = 'mipsel_ucs4' + else: + ret["arch"] = 'mipsel_ucs2' elif xbmc.getCondVisibility("system.platform.windows"): ret["os"] = "windows" elif xbmc.getCondVisibility("system.platform.osx"): diff --git a/resources/language/english/strings.xml b/resources/language/english/strings.xml index f9968df..5362f2b 100644 --- a/resources/language/english/strings.xml +++ b/resources/language/english/strings.xml @@ -19,7 +19,8 @@ OS X Apple TV2 iOS - Linux MIPS + Linux MIPSEL (UCS2) + Linux MIPSEL (UCS4) 0.16.19 1.0.6