Gentoo Archives: gentoo-commits

From: "Slawek Lis (slis)" <slis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/Kivy/files: cython-fixes.patch
Date: Thu, 01 Jan 2015 21:23:09
Message-Id: 20150101212306.3EA18EA9E@oystercatcher.gentoo.org
1 slis 15/01/01 21:23:06
2
3 Added: cython-fixes.patch
4 Log:
5 Fixed #534114
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x55265D89)
8
9 Revision Changes Path
10 1.1 dev-python/Kivy/files/cython-fixes.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/files/cython-fixes.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/files/cython-fixes.patch?rev=1.1&content-type=text/plain
14
15 Index: cython-fixes.patch
16 ===================================================================
17 --- kivy/lib/gstplayer/_gstplayer.pyx.orig 2014-01-29 17:45:32.000000000 +0100
18 +++ kivy/lib/gstplayer/_gstplayer.pyx 2015-01-01 21:24:55.480191418 +0100
19 @@ -207,7 +207,7 @@
20 self.eos_cb()
21
22 def load(self):
23 - cdef char *c_uri
24 + cdef bytes py_uri
25
26 # if already loaded before, clean everything.
27 if self.pipeline != NULL:
28 @@ -256,8 +256,8 @@
29
30 # configure playbin
31 g_object_set_int(self.pipeline, 'async-handling', 1)
32 - c_uri = <bytes>self.uri.encode('utf-8')
33 - g_object_set_void(self.playbin, 'uri', c_uri)
34 + py_uri = <bytes>self.uri.encode('utf-8')
35 + g_object_set_void(self.playbin, 'uri', <char *>py_uri)
36
37 # attach the callback
38 # NOTE no need to create a weakref here, as we manage to grab/release
39 --- kivy/graphics/shader.pyx.orig 2014-01-20 03:49:50.000000000 +0100
40 +++ kivy/graphics/shader.pyx 2015-01-01 21:25:01.446858150 +0100
41 @@ -421,6 +421,7 @@
42 cdef void bind_vertex_format(self, VertexFormat vertex_format):
43 cdef unsigned int i
44 cdef vertex_attr_t *attr
45 + cdef bytes name
46
47 # if the current vertex format used in the shader is the current one, do
48 # nothing.
49 @@ -445,7 +446,8 @@
50 attr = &vertex_format.vattr[i]
51 if attr.per_vertex == 0:
52 continue
53 - attr.index = glGetAttribLocation(self.program, <char *><bytes>attr.name)
54 + name = <bytes>attr.name
55 + attr.index = glGetAttribLocation(self.program, <char *>name)
56 glEnableVertexAttribArray(attr.index)
57
58 # save for the next run.