Attachment 185905 Details for Bug 221926 – graphics/py-scikit-image: fix build on FreeBSD 12

[patch] graphics/py-scikit-image: fix build on FreeBSD 12

patch-py-scikit-image.diff (text/plain), 3.27 KB, created by Eric Camachat on 2017-08-30 01:29:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Camachat

Created: 2017-08-30 01:29:22 UTC

Size: 3.27 KB

patch

obsolete

>Index: graphics/py-scikit-image/files/patch-skimage_measure__ccomp.pxd
>===================================================================
>--- graphics/py-scikit-image/files/patch-skimage_measure__ccomp.pxd	(nonexistent)
>+++ graphics/py-scikit-image/files/patch-skimage_measure__ccomp.pxd	(working copy)
>@@ -0,0 +1,13 @@
>+--- skimage/measure/_ccomp.pxd.orig	2017-08-29 18:06:10.918772000 -0700
>++++ skimage/measure/_ccomp.pxd	2017-08-29 18:12:30.845240000 -0700
>+@@ -1,8 +1,7 @@
>+ """Export fast union find in Cython"""
>+-cimport numpy as cnp
>++cimport numpy as np
>+ 
>+-DTYPE = cnp.intp
>+-ctypedef cnp.intp_t DTYPE_t
>++ctypedef np.intp_t DTYPE_t
>+ 
>+ cdef DTYPE_t find_root(DTYPE_t *forest, DTYPE_t n) nogil
>+ cdef void set_root(DTYPE_t *forest, DTYPE_t n, DTYPE_t root) nogil
>
>Property changes on: graphics/py-scikit-image/files/patch-skimage_measure__ccomp.pxd
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/py-scikit-image/files/patch-skimage_measure__ccomp.pyx
>===================================================================
>--- graphics/py-scikit-image/files/patch-skimage_measure__ccomp.pyx	(nonexistent)
>+++ graphics/py-scikit-image/files/patch-skimage_measure__ccomp.pyx	(working copy)
>@@ -0,0 +1,35 @@
>+--- skimage/measure/_ccomp.pyx.orig	2017-03-28 23:49:21.000000000 -0700
>++++ skimage/measure/_ccomp.pyx	2017-08-29 18:16:28.114552000 -0700
>+@@ -3,17 +3,18 @@
>+ #cython: nonecheck=False
>+ #cython: wraparound=False
>+ 
>+-import numpy as np
>+ from .._shared.utils import warn
>+ 
>+-cimport numpy as cnp
>++import numpy as np
>++cimport numpy as np
>+ 
>+ 
>+ DTYPE = np.intp
>++#ctypedef np.intp_t DTYPE_t
>+ BG_NODE_NULL = -999
>+ 
>+ # Short int - could be more graceful to the CPU cache
>+-ctypedef cnp.int32_t INTS_t
>++ctypedef np.int32_t INTS_t
>+ 
>+ cdef struct s_shpinfo
>+ 
>+@@ -350,8 +351,8 @@ def label_cython(input, neighbors=None, background=Non
>+     # algorithm the input if it is the case
>+     input_corrected, swaps = reshape_array(input)
>+ 
>+-    cdef cnp.ndarray[DTYPE_t, ndim=1] data
>+-    cdef cnp.ndarray[DTYPE_t, ndim=1] forest
>++    cdef np.ndarray[DTYPE_t, ndim=1] data
>++    cdef np.ndarray[DTYPE_t, ndim=1] forest
>+ 
>+     # Having data a 2D array slows down access considerably using linear
>+     # indices even when using the data_p pointer :-(
>
>Property changes on: graphics/py-scikit-image/files/patch-skimage_measure__ccomp.pyx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/py-scikit-image/pkg-descr
>===================================================================
>--- graphics/py-scikit-image/pkg-descr	(revision 448873)
>+++ graphics/py-scikit-image/pkg-descr	(working copy)
>@@ -2,3 +2,5 @@
> available free of charge and free of restriction. We pride ourselves on
> high-quality, peer-reviewed code, written by an active community of
> volunteers.
>+
>+WWW: http://scikit-image.org/

Flags:

eric: maintainer-approval+

Actions: View | Diff

Attachments on bug 221926: 185905