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

python-numpy: Bump version to 1.13.3

Browse Source 
This is just a bug-fix release.

Removing 0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch
as it is a part of the release.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Alexey Brodkin 2017-10-21 21:15:46 +03:00 committed by Thomas Petazzoni
parent 791ceb583b
commit acc3a2c725
3 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch
View File

@ -1,43 +0,0 @@
From 9aa5d577c58f04f9606674dd6f326aee1bf1e6e8 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Thu, 21 Sep 2017 10:10:05 -0600
Subject: [PATCH] BUG: Ensure `_npy_scaled_cexp{,f,l}` is defined when needed.
The `_npy_scaled_cexp{,f,l}` functions were previously only defined when
the npy_cexp fallback functions were needed, but they are also called by
the npy_csinh and npy_ccosh functions.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
---
numpy/core/src/npymath/npy_math_complex.c.src | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/numpy/core/src/npymath/npy_math_complex.c.src b/numpy/core/src/npymath/npy_math_complex.c.src
index a82a6737c..fb31e8e6a 100644
--- a/numpy/core/src/npymath/npy_math_complex.c.src
+++ b/numpy/core/src/npymath/npy_math_complex.c.src
@@ -184,7 +184,9 @@ npy_carg@c@(@ctype@ z)
#define SCALED_CEXP_LOWERL 11357.216553474703895L
#define SCALED_CEXP_UPPERL 22756.021937783004509L
-#ifndef HAVE_CEXP@C@
+#if !defined(HAVE_CSINH@C@) || \
+ !defined(HAVE_CCOSH@C@) || \
+ !defined(HAVE_CEXP@C@)
static
@ctype@
@@ -212,6 +214,10 @@ _npy_scaled_cexp@c@(@type@ x, @type@ y, npy_int expt)
npy_ldexp@c@(mant * mantsin, expt + exsin));
}
+#endif
+
+#ifndef HAVE_CEXP@C@
+
@ctype@
npy_cexp@c@(@ctype@ z)
{
--
2.11.0

4
package/python-numpy/python-numpy.hash
View File

@ -1,2 +1,2 @@
# Copied from https://github.com/numpy/numpy/releases/tag/v1.13.1 # Copied from https://github.com/numpy/numpy/releases/tag/v1.13.3
sha256 de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93 numpy-1.13.1.tar.gz sha256 4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df72d8094 numpy-1.13.3.tar.gz

2
package/python-numpy/python-numpy.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
PYTHON_NUMPY_VERSION = 1.13.1 PYTHON_NUMPY_VERSION = 1.13.3
PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz
PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION)
PYTHON_NUMPY_LICENSE = BSD-3-Clause PYTHON_NUMPY_LICENSE = BSD-3-Clause