jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-24 11:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'thingos/dev' into dev

Browse Source
This commit is contained in:
Calin Crisan 2019-05-17 10:28:19 +03:00
commit 9f9b683b8a
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/python-apispec/0001-fix-setup-encoding.patch
View File

@ -1,12 +0,0 @@
diff -uNr apispec-0.39.0-orig/setup.py apispec-0.39.0-patched/setup.py
--- apispec-0.39.0-orig/setup.py 2018-06-29 05:50:26.000000000 +0300
+++ apispec-0.39.0-patched/setup.py 2019-01-24 23:36:41.947206745 +0200
@@ -13,7 +13,7 @@
Raises RuntimeError if not found.
"""
version = ''
- with open(fname, 'r') as fp:
+ with open(fname, 'r', encoding='utf-8') as fp:
reg = re.compile(r'__version__ = [\'"]([^\'"]*)[\'"]')
for line in fp:
m = reg.match(line)

3
package/python-pycurl/python-pycurl.mk
View File

@ -8,7 +8,8 @@ PYTHON_PYCURL_VERSION = 7.43.0.2
PYTHON_PYCURL_SOURCE = pycurl-$(PYTHON_PYCURL_VERSION).tar.gz
PYTHON_PYCURL_SITE = https://files.pythonhosted.org/packages/e8/e4/0dbb8735407189f00b33d84122b9be52c790c7c3b25286826f4e1bdb7bde
PYTHON_PYCURL_SETUP_TYPE = distutils
PYTHON_PYCURL_BUILD_OPTS = --curl-config=$(STAGING_DIR)/usr/bin/curl-config --with-ssl
PYTHON_PYCURL_BUILD_OPTS = --curl-config=$(STAGING_DIR)/usr/bin/curl-config --with-openssl
PYTHON_PYCURL_INSTALL_TARGET_OPTS = --curl-config=$(STAGING_DIR)/usr/bin/curl-config --with-openssl
PYTHON_PYCURL_ENV = PATH=$(PATH):$(STAGING_DIR)/usr/bin
$(eval $(python-package))