diff --git a/addon.xml b/addon.xml index 71057f1..d2df01c 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/platform_pulsar.py b/platform_pulsar.py index 319dd60..f0793dc 100644 --- a/platform_pulsar.py +++ b/platform_pulsar.py @@ -13,12 +13,10 @@ except: def get_libname(platform): libname=[] - if platform['system'] in ['darwin', 'linux_x86', 'linux_arm']: + if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_x86_64']: libname=['libtorrent.so'] elif platform['system'] == 'windows': libname=['libtorrent.pyd'] - elif platform['system'] in ['linux_x86_64']: - libname=['libtorrent.so', 'libtorrent-rasterbar.so.7'] elif platform['system'] in ['android_armv7', 'android_x86']: libname=['libtorrent.so', 'liblibtorrent.so'] return libname diff --git a/python_libtorrent/__init__.py b/python_libtorrent/__init__.py index ebfa60d..306284d 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']: + if platform['system'] in ['linux_x86', 'windows', 'linux_arm', 'linux_x86_64']: import libtorrent elif platform['system'] in ['darwin']: import imp @@ -57,13 +57,6 @@ try: libtorrent = imp.load_module('libtorrent', fp, pathname, description) finally: if fp: fp.close() - elif platform['system'] in ['linux_x86_64']: - from ctypes import CDLL - dll_path=os.path.join(dest_path, 'libtorrent-rasterbar.so.7') - log('CDLL path = ' + dll_path) - liblibtorrent=CDLL(dll_path) - log('CDLL = ' + str(liblibtorrent)) - import libtorrent elif platform['system'] in ['android_armv7', 'android_x86']: import imp from ctypes import CDLL diff --git a/python_libtorrent/linux_x86/libtorrent.so.size.txt b/python_libtorrent/linux_x86/libtorrent.so.size.txt index e02b471..a346659 100644 --- a/python_libtorrent/linux_x86/libtorrent.so.size.txt +++ b/python_libtorrent/linux_x86/libtorrent.so.size.txt @@ -1 +1 @@ -6219339 \ No newline at end of file +6257605 \ No newline at end of file diff --git a/python_libtorrent/linux_x86/libtorrent.so.zip b/python_libtorrent/linux_x86/libtorrent.so.zip index cfc9cdc..e258d9b 100644 Binary files a/python_libtorrent/linux_x86/libtorrent.so.zip and b/python_libtorrent/linux_x86/libtorrent.so.zip differ diff --git a/python_libtorrent/linux_x86_64/libtorrent-rasterbar.so.7.size.txt b/python_libtorrent/linux_x86_64/libtorrent-rasterbar.so.7.size.txt deleted file mode 100644 index 079d9ff..0000000 --- a/python_libtorrent/linux_x86_64/libtorrent-rasterbar.so.7.size.txt +++ /dev/null @@ -1 +0,0 @@ -2309928 \ No newline at end of file diff --git a/python_libtorrent/linux_x86_64/libtorrent-rasterbar.so.7.zip b/python_libtorrent/linux_x86_64/libtorrent-rasterbar.so.7.zip deleted file mode 100644 index 0f36d42..0000000 Binary files a/python_libtorrent/linux_x86_64/libtorrent-rasterbar.so.7.zip and /dev/null differ diff --git a/python_libtorrent/linux_x86_64/libtorrent.so.size.txt b/python_libtorrent/linux_x86_64/libtorrent.so.size.txt index d193512..4b476b5 100644 --- a/python_libtorrent/linux_x86_64/libtorrent.so.size.txt +++ b/python_libtorrent/linux_x86_64/libtorrent.so.size.txt @@ -1 +1 @@ -1188592 \ No newline at end of file +6620181 \ No newline at end of file diff --git a/python_libtorrent/linux_x86_64/libtorrent.so.zip b/python_libtorrent/linux_x86_64/libtorrent.so.zip index ee904bd..2a46a52 100644 Binary files a/python_libtorrent/linux_x86_64/libtorrent.so.zip and b/python_libtorrent/linux_x86_64/libtorrent.so.zip differ