svn commit: r427014 - in head/devel/renpy6: . files
Jan Beich
jbeich at FreeBSD.org
Thu Nov 24 14:23:41 UTC 2016
Author: jbeich
Date: Thu Nov 24 14:23:39 2016
New Revision: 427014
URL: https://svnweb.freebsd.org/changeset/ports/427014
Log:
devel/renpy6: bring back cython fixes lost in r421472
$ katawa-shoujo
KeyError(4294967295,)
Full traceback:
File "renpy/common/00start.rpy", line 152, in script
$ ui.interact(suppress_underlay=True, suppress_overlay=True)
File "/usr/local/share/renpy/renpy/ast.py", line 785, in execute
renpy.python.py_exec_bytecode(self.code.bytecode, self.hide, store=self.store)
File "/usr/local/share/renpy/renpy/python.py", line 1382, in py_exec_bytecode
exec bytecode in globals, locals
File "renpy/common/00start.rpy", line 152, in <module>
$ ui.interact(suppress_underlay=True, suppress_overlay=True)
File "/usr/local/share/renpy/renpy/ui.py", line 247, in interact
rv = renpy.game.interface.interact(roll_forward=roll_forward, **kwargs)
File "/usr/local/share/renpy/renpy/display/core.py", line 2149, in interact
repeat, rv = self.interact_core(preloads=preloads, **kwargs)
File "/usr/local/share/renpy/renpy/display/core.py", line 2478, in interact_core
self.draw_screen(root_widget, fullscreen_video, (not fullscreen_video) or video_frame_drawn)
File "/usr/local/share/renpy/renpy/display/core.py", line 1681, in draw_screen
renpy.display.draw.draw_screen(surftree, fullscreen_video)
File "renpy/gl/gldraw.pyx", line 676, in renpy.gl.gldraw.GLDraw.draw_screen (gen/renpy.gl.gldraw.c:10499)
gltexture.cleanup()
File "renpy/gl/gltexture.pyx", line 559, in renpy.gl.gltexture.cleanup (gen/renpy.gl.gltexture.c:7100)
t.deallocate()
File "renpy/gl/gltexture.pyx", line 479, in renpy.gl.gltexture.TextureCore.deallocate (gen/renpy.gl.gltexture.c:5745)
texture_numbers.remove(self.number)
KeyError: 4294967295
Added:
head/devel/renpy6/files/patch-renpy_gl_gltexture.pyx (contents, props changed)
Modified:
head/devel/renpy6/Makefile (contents, props changed)
Modified: head/devel/renpy6/Makefile
==============================================================================
--- head/devel/renpy6/Makefile Thu Nov 24 14:18:52 2016 (r427013)
+++ head/devel/renpy6/Makefile Thu Nov 24 14:23:39 2016 (r427014)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTVERSION= 6.18.3
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= 6
CONFLICTS_INSTALL= ${PORTNAME}-[0-9]*
Added: head/devel/renpy6/files/patch-renpy_gl_gltexture.pyx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/renpy6/files/patch-renpy_gl_gltexture.pyx Thu Nov 24 14:23:39 2016 (r427014)
@@ -0,0 +1,45 @@
+https://github.com/renpy/renpy/commit/ecadc55616f3
+https://github.com/renpy/renpy/commit/e680702e87b8
+
+--- renpy/gl/gltexture.pyx.orig 2014-10-05 01:47:19 UTC
++++ renpy/gl/gltexture.pyx
+@@ -255,7 +255,7 @@ cdef class TextureCore:
+ # The number of the OpenGL texture this texture object
+ # represents.
+ self.generation = 0
+- self.number = -1
++ self.number = 0
+
+ # The format of this texture in the GPU (or 0 if not known).
+ self.format = 0
+@@ -447,7 +447,7 @@ cdef class TextureCore:
+
+ cdef unsigned int texnums[1]
+
+- if self.number != -1:
++ if self.number != 0:
+ return 0
+
+ glGenTextures(1, texnums)
+@@ -468,17 +468,19 @@ cdef class TextureCore:
+
+ global total_texture_size
+
+- if self.number == -1:
++ if self.number == 0:
+ return
+
+ cdef GLuint texnums[1]
+
+ texnums[0] = self.number
+ glDeleteTextures(1, texnums)
++ self.number = 0
+
+- texture_numbers.remove(self.number)
++ texture_numbers.discard(self.number)
+ total_texture_size -= self.width * self.height * 4
+
++
+ class Texture(TextureCore):
+ """
+ We need to be a real python class, not a C extension, to ensure that
More information about the svn-ports-all
mailing list