diff --git a/addon.xml b/addon.xml index d2df01c..453f5d9 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/platform_pulsar.py b/platform_pulsar.py index f0793dc..4997d98 100644 --- a/platform_pulsar.py +++ b/platform_pulsar.py @@ -13,7 +13,7 @@ except: def get_libname(platform): libname=[] - if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_x86_64']: + if platform['system'] in ['darwin', 'linux_x86', 'linux_armv6', 'linux_armv7', 'linux_x86_64']: libname=['libtorrent.so'] elif platform['system'] == 'windows': libname=['libtorrent.pyd'] @@ -77,6 +77,10 @@ def get_platform(): ret["os"] = "linux" if "arm" in os.uname()[4]: ret["arch"] = "arm" + if "arm7" in os.uname()[4]: + ret["arch"] = "armv7" + elif "arm6" in os.uname()[4]: + ret["arch"] = "armv6" elif xbmc.getCondVisibility("system.platform.windows"): ret["os"] = "windows" elif xbmc.getCondVisibility("system.platform.osx"): @@ -104,8 +108,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"] == "arm": - ret["system"] = 'linux_arm' + elif ret["os"] == "linux" and "arm" in ret["arch"]: + ret["system"] = 'linux_'+ret["arch"] ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.', 'You should search for "OneEvil\'s OpenELEC libtorrent" or use Ace Stream.'] elif ret["os"] == "android": diff --git a/python_libtorrent/__init__.py b/python_libtorrent/__init__.py index 306284d..19de182 100644 --- a/python_libtorrent/__init__.py +++ b/python_libtorrent/__init__.py @@ -44,7 +44,7 @@ if platform['system'] not in ['windows']: log('os: '+str(os.uname())) try: - if platform['system'] in ['linux_x86', 'windows', 'linux_arm', 'linux_x86_64']: + if platform['system'] in ['linux_x86', 'windows', 'linux_armv6', 'linux_armv7', 'linux_x86_64']: import libtorrent elif platform['system'] in ['darwin']: import imp diff --git a/python_libtorrent/linux_arm/libtorrent.so.size.txt b/python_libtorrent/linux_arm/libtorrent.so.size.txt deleted file mode 100644 index ba9e8bb..0000000 --- a/python_libtorrent/linux_arm/libtorrent.so.size.txt +++ /dev/null @@ -1 +0,0 @@ -2334948 \ No newline at end of file diff --git a/python_libtorrent/linux_arm/libtorrent.so.zip b/python_libtorrent/linux_arm/libtorrent.so.zip deleted file mode 100644 index 8adfebc..0000000 Binary files a/python_libtorrent/linux_arm/libtorrent.so.zip and /dev/null differ diff --git a/python_libtorrent/linux_armv7/libtorrent.so.size.txt b/python_libtorrent/linux_armv7/libtorrent.so.size.txt new file mode 100644 index 0000000..375fc94 --- /dev/null +++ b/python_libtorrent/linux_armv7/libtorrent.so.size.txt @@ -0,0 +1 @@ +1892840 \ No newline at end of file diff --git a/python_libtorrent/linux_armv7/libtorrent.so.zip b/python_libtorrent/linux_armv7/libtorrent.so.zip new file mode 100644 index 0000000..61178b7 Binary files /dev/null and b/python_libtorrent/linux_armv7/libtorrent.so.zip differ