From owner-svn-ports-branches@freebsd.org Thu Nov 24 14:26:00 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E17A0C5302C; Thu, 24 Nov 2016 14:26:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC3AC2C3; Thu, 24 Nov 2016 14:26:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAOEPx7a070186; Thu, 24 Nov 2016 14:25:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAOEPxE8070184; Thu, 24 Nov 2016 14:25:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611241425.uAOEPxE8070184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 24 Nov 2016 14:25:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427015 - in branches/2016Q4/devel/renpy6: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Nov 2016 14:26:01 -0000 Author: jbeich Date: Thu Nov 24 14:25:59 2016 New Revision: 427015 URL: https://svnweb.freebsd.org/changeset/ports/427015 Log: MFH: r427014 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 $ 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 Approved by: ports-secteam blanket Added: branches/2016Q4/devel/renpy6/files/patch-renpy_gl_gltexture.pyx - copied unchanged from r427014, head/devel/renpy6/files/patch-renpy_gl_gltexture.pyx Modified: branches/2016Q4/devel/renpy6/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/devel/renpy6/Makefile ============================================================================== --- branches/2016Q4/devel/renpy6/Makefile Thu Nov 24 14:23:39 2016 (r427014) +++ branches/2016Q4/devel/renpy6/Makefile Thu Nov 24 14:25:59 2016 (r427015) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 6.18.3 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 6 CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* Copied: branches/2016Q4/devel/renpy6/files/patch-renpy_gl_gltexture.pyx (from r427014, head/devel/renpy6/files/patch-renpy_gl_gltexture.pyx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/devel/renpy6/files/patch-renpy_gl_gltexture.pyx Thu Nov 24 14:25:59 2016 (r427015, copy of r427014, head/devel/renpy6/files/patch-renpy_gl_gltexture.pyx) @@ -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