linux armv7 static update by aisman

pull/1/head
DiMartinoXBMC 2015-07-30 21:35:28 +03:00
parent f2d70f3f02
commit 598dc56c09
7 changed files with 10 additions and 6 deletions

View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?> <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<addon id='script.module.libtorrent' version='0.16.19c' name='LibTorrent' provider-name='DiMartino, srg70, RussakHH'> <addon id='script.module.libtorrent' version='0.16.19d' name='LibTorrent' provider-name='DiMartino, srg70, RussakHH'>
<requires> <requires>
<import addon='xbmc.python' version='2.1.0'/> <import addon='xbmc.python' version='2.1.0'/>
</requires> </requires>

View File

@ -13,7 +13,7 @@ except:
def get_libname(platform): def get_libname(platform):
libname=[] 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'] libname=['libtorrent.so']
elif platform['system'] == 'windows': elif platform['system'] == 'windows':
libname=['libtorrent.pyd'] libname=['libtorrent.pyd']
@ -77,6 +77,10 @@ def get_platform():
ret["os"] = "linux" ret["os"] = "linux"
if "arm" in os.uname()[4]: if "arm" in os.uname()[4]:
ret["arch"] = "arm" 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"): elif xbmc.getCondVisibility("system.platform.windows"):
ret["os"] = "windows" ret["os"] = "windows"
elif xbmc.getCondVisibility("system.platform.osx"): elif xbmc.getCondVisibility("system.platform.osx"):
@ -104,8 +108,8 @@ def get_system(ret):
ret["system"] = 'linux_x86' ret["system"] = 'linux_x86'
ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.', 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"'] 'You should install it by "sudo apt-get install python-libtorrent"']
elif ret["os"] == "linux" and ret["arch"] == "arm": elif ret["os"] == "linux" and "arm" in ret["arch"]:
ret["system"] = 'linux_arm' ret["system"] = 'linux_'+ret["arch"]
ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.', 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.'] 'You should search for "OneEvil\'s OpenELEC libtorrent" or use Ace Stream.']
elif ret["os"] == "android": elif ret["os"] == "android":

View File

@ -44,7 +44,7 @@ if platform['system'] not in ['windows']:
log('os: '+str(os.uname())) log('os: '+str(os.uname()))
try: 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 import libtorrent
elif platform['system'] in ['darwin']: elif platform['system'] in ['darwin']:
import imp import imp

View File

@ -1 +0,0 @@
2334948

View File

@ -0,0 +1 @@
1892840