Date: Sat, 4 Oct 2014 22:47:24 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370010 - in branches/2014Q4/x11-toolkits/py-kivy: . files Message-ID: <201410042247.s94MlOVS023798@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Oct 4 22:47:23 2014 New Revision: 370010 URL: https://svnweb.freebsd.org/changeset/ports/370010 QAT: https://qat.redports.org/buildarchive/r370010/ Log: MFH: r369949 Fix x11-toolkits/py-kivy due to cython update. Cython changes its temporary variable handling and now fails on the file: kivy/graphics/sahder/pyx This has already been fixed upstream so just backport that fix. Also, update the USE_PYTHON et al variables. PR: 194065 Reported by: John Marino (marino@FreeBSD.org) Obtained from: https://github.com/kivy/kivy/commit/b2bc566 Added: branches/2014Q4/x11-toolkits/py-kivy/files/patch-kivy__grahics__shader.pyx - copied unchanged from r369949, head/x11-toolkits/py-kivy/files/patch-kivy__grahics__shader.pyx Modified: branches/2014Q4/x11-toolkits/py-kivy/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/x11-toolkits/py-kivy/Makefile ============================================================================== --- branches/2014Q4/x11-toolkits/py-kivy/Makefile Sat Oct 4 22:45:24 2014 (r370009) +++ branches/2014Q4/x11-toolkits/py-kivy/Makefile Sat Oct 4 22:47:23 2014 (r370010) @@ -20,14 +20,12 @@ MAKE_JOBS_UNSAFE= yes # does not (reall USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME} GH_COMMIT= d602d4b -USES= shebangfix +USES= python:2.7+ shebangfix USE_GL= gl -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_BUILD_TARGET= build_ext PYDISTUTILS_BUILDARGS= --inplace PYDISTUTILS_EGGINFO= Kivy-${PORTVERSION}-py${PYTHON_VER}.egg-info -USE_PYTHON= 2.7+ +USE_PYTHON= autoplist distutils SHEBANG_FILES= kivy/lib/osc/OSC.py OPTIONS_DEFINE= DOCS PDF TEST Copied: branches/2014Q4/x11-toolkits/py-kivy/files/patch-kivy__grahics__shader.pyx (from r369949, head/x11-toolkits/py-kivy/files/patch-kivy__grahics__shader.pyx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-toolkits/py-kivy/files/patch-kivy__grahics__shader.pyx Sat Oct 4 22:47:23 2014 (r370010, copy of r369949, head/x11-toolkits/py-kivy/files/patch-kivy__grahics__shader.pyx) @@ -0,0 +1,22 @@ +diff --git a/kivy/graphics/shader.pyx b/kivy/graphics/shader.pyx +index eab0f42..39c449a 100644 +--- kivy/graphics/shader.pyx ++++ kivy/graphics/shader.pyx +@@ -421,6 +421,7 @@ cdef class Shader: + cdef void bind_vertex_format(self, VertexFormat vertex_format): + cdef unsigned int i + cdef vertex_attr_t *attr ++ cdef bytes name + + # if the current vertex format used in the shader is the current one, do + # nothing. +@@ -445,7 +446,8 @@ cdef class Shader: + attr = &vertex_format.vattr[i] + if attr.per_vertex == 0: + continue +- attr.index = glGetAttribLocation(self.program, <char *><bytes>attr.name) ++ name = <bytes>attr.name ++ attr.index = glGetAttribLocation(self.program, <char *>name) + glEnableVertexAttribArray(attr.index) + + # save for the next run.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410042247.s94MlOVS023798>