Skip to content

Commit 15b34a3

Browse files
committed
3.2.0
1. Add a small trick for fixing the requirement issue. 2. Fix some bugs in the init scripts.
1 parent 4bf8d4e commit 15b34a3

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

scripts/init_linux.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ def add_dependencies(self, *names):
7070
'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
7171
'{0}-linux'.format(__verion__),
7272
get_release_name(__verion__, PY_VERSION),
73-
path=target_path, mode='auto', verbose=True, token=''
73+
path=basedir, mode='auto', verbose=True, token=''
7474
)
7575
if not os.path.isdir(os.path.join(basedir, 'lib')):
7676
webtools.download_tarball(
7777
'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
7878
'deps-3.2.0', 'so-linux-ffmpeg_5_0.tar.xz',
79-
path=target_path, mode='auto', verbose=True, token=''
79+
path=basedir, mode='auto', verbose=True, token=''
8080
)
8181

8282

@@ -85,7 +85,7 @@ def add_dependencies(self, *names):
8585
'libva-drm.so.2', 'libva.so.2', 'libdrm.so.2'
8686
)
8787
__dependencies.add_dependencies(
88-
'libva-x11.so.2', 'libvdpau.so.1', 'libXfixes.so.3',
88+
'libva-x11.so.2', 'libvdpau.so.1', 'libXfixes.so.3',
8989
'libXext.so.6', 'libX11.so.6', 'libxcb.so.1', 'libXau.so.6',
9090
'libXdmcp.so.6', 'libbsd.so.0', 'libmd.so.0',
9191
)

scripts/init_win.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* OS: Windows version
1313
'''
1414

15+
import os
1516
import sysconfig
1617
import webtools
1718

@@ -37,13 +38,13 @@ def get_release_name(mpegcoder_ver='3.x', python_ver='3.6'):
3738
webtools.download_tarball(
3839
'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
3940
__verion__, get_release_name(__verion__, PY_VERSION),
40-
path=target_path, mode='auto', verbose=True, token=''
41+
path=basedir, mode='auto', verbose=True, token=''
4142
)
4243
if not os.path.isfile(os.path.join(basedir, 'avcodec-59.dll')):
4344
webtools.download_tarball(
4445
'cainmagi', 'FFmpeg-Encoder-Decoder-for-Python',
4546
'deps-3.2.0', 'dll-win-ffmpeg_5_0.tar.xz',
46-
path=target_path, mode='auto', verbose=True, token=''
47+
path=basedir, mode='auto', verbose=True, token=''
4748
)
4849

4950

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@
1616
import os
1717
import sys
1818
import site
19+
import pip
1920
import sysconfig
2021
import shutil
2122
import atexit
22-
import webtools
23+
24+
# Add a small trick for fixing the requirement issue.
25+
pip.main(['install', 'urllib3', 'setuptools'])
26+
27+
import webtools # noqa: E402
2328

2429
try:
2530
from setuptools import setup, find_packages

0 commit comments

Comments
 (0)