14
0

Accepting request 821571 from home:seijikun:branches:openSUSE:Factory

- Update to 3.1.5
  * This aligns python3-opengl-accelerate with python3-opengl, which
    is required by some other packages
  * no real changelog
- Drop patch commit1080.patch, included upstream
- Drop shipped pxd files, included upstream (d401885f6a)

OBS-URL: https://build.opensuse.org/request/show/821571
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-opengl-accelerate?expand=0&rev=14
This commit is contained in:
Tomáš Chvátal
2020-07-18 05:56:14 +00:00
committed by Git OBS Bridge
parent 60c7f3ccf3
commit 7cad447b1a
7 changed files with 15 additions and 63 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e687eea7e006d65f531933b49b3b3d2feaaf51279147a904247f9d189762a36f
size 533256

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12e5518b0216a478527c7ce5ddce623c3d0517adeb87226da767772e8b7f2f06
size 538350

View File

@@ -1,25 +0,0 @@
=== modified file 'accelerate/src/numpy_formathandler.pyx'
--- accelerate/src/numpy_formathandler.pyx 2018-08-12 01:47:52 +0000
+++ accelerate/src/numpy_formathandler.pyx 2018-11-05 06:18:00 +0000
@@ -52,16 +52,18 @@
np.float16,
np.float32,
np.float64,
- np.float128,
np.complex64,
np.complex128,
- np.complex256,
np.bytes_,
np.str_,
np.void,
np.datetime64,
np.timedelta64,
)
+ if hasattr(np,'float128'):
+ HANDLED_TYPES += (np.float128,)
+ if hasattr(np,'complex256'):
+ HANDLED_TYPES += (np.complex256,)
def __init__( self, ERROR_ON_COPY=None, a_to_gl=None, gl_to_a=None ):
if ERROR_ON_COPY is None:

View File

@@ -1,13 +0,0 @@
"""Cython import description for formathandler types"""
cdef class FormatHandler:
cdef public int ERROR_ON_COPY
cdef object c_from_param( self, object instance, object typeCode)
cdef object c_dataPointer( self, object instance )
cdef c_zeros( self, object dims, object typeCode )
cdef c_arraySize( self, object instance, object typeCode )
cdef c_arrayByteCount( self, object instance )
cdef c_arrayToGLType( self, object value )
cdef c_asArray( self, object instance, object typeCode)
cdef c_unitSize( self, object instance, typeCode )
cdef c_dimensions( self, object instance)

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jul 17 21:57:47 UTC 2020 - Markus Ebner <info@ebner-markus.de>
- Update to 3.1.5
* This aligns python3-opengl-accelerate with python3-opengl, which
is required by some other packages
* no real changelog
- Drop patch commit1080.patch, included upstream
- Drop shipped pxd files, included upstream (https://github.com/mcfletch/pyopengl/commit/d401885f6a1c61213058a96e050eb45ee6189b7c)
-------------------------------------------------------------------
Mon Aug 19 05:37:59 UTC 2019 - John Vandenberg <jayvdb@gmail.com>

View File

@@ -18,22 +18,15 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define tarname PyOpenGL-accelerate
%define _version 3.1.3b1
%define _version 3.1.5
Name: python-opengl-accelerate
Version: %{_version}.post1
Version: %{_version}
Release: 0
Summary: Acceleration for python-opengl
License: BSD-3-Clause
Group: Development/Libraries/Python
URL: http://pyopengl.sourceforge.net
Source0: https://files.pythonhosted.org/packages/source/P/%{tarname}/%{tarname}-%{_version}.tar.gz
# Missing pxd only needed to rebuild .c https://github.com/mcfletch/pyopengl/issues/12
Source2: https://raw.githubusercontent.com/mcfletch/pyopengl/master/accelerate/OpenGL_accelerate/formathandler.pxd
Source3: https://raw.githubusercontent.com/mcfletch/pyopengl/master/accelerate/OpenGL_accelerate/wrapper.pxd
# Newer numpy_formathandler.pyx needed to match opengl 3.1.3b2
# https://github.com/mcfletch/pyopengl/issues/28
# Patch is subset of https://bazaar.launchpad.net/~mcfletch/pyopengl/trunk/diff/1099
Patch0: commit1080.patch
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy-devel}
@@ -52,10 +45,6 @@ code.
%prep
%setup -q -n %{tarname}-%{_version}
%patch0 -p1
sed -i 's/\t/ /g' src/numpy_formathandler.pyx
cp %{SOURCE2} %{SOURCE3} OpenGL_accelerate/
# Force Cython to rebuild .c files
rm src/*.c

View File

@@ -1,9 +0,0 @@
"""Importable Cython declarations for wrapper module"""
cdef class cArgConverter:
cdef object c_call( self, tuple pyArgs, int index, object baseOperation )
cdef class pyArgConverter:
cdef object c_call( self, object incoming, object function, tuple arguments )
cdef class cArgumentConverter:
cdef object c_call( self, object incoming )
cdef class returnConverter:
cdef object c_call( self, object result, object baseOperation, tuple pyArgs, tuple cArgs )