diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile index e6df6bd6a23a..72077332af55 100644 --- a/x11-toolkits/py-kivy/Makefile +++ b/x11-toolkits/py-kivy/Makefile @@ -1,112 +1,99 @@ PORTNAME= kivy -PORTVERSION= 2.3.0 -PORTREVISION= 3 +PORTVERSION= 2.3.1 CATEGORIES= x11-toolkits python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Kivy-${PORTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= Python NUI library for rapid application development WWW= https://kivy.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Depends on expired lang/cython0 -EXPIRATION_DATE=2026-09-15 - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filetype>0:devel/py-filetype@${PY_FLAVOR} LIB_DEPENDS= libmtdev.so:devel/libmtdev RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR} MAKE_ENV= KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes USE_OPENGL_ES2=1 \ PYTHONPATH=${WRKSRC} USES= display:test gl pytest python shebangfix uniquefiles:dirs USE_GL= egl gl glesv2 -USE_PYTHON= autoplist concurrent cython0 distutils +USE_PYTHON= autoplist concurrent cython distutils + PYDISTUTILS_BUILD_TARGET= build_ext PYDISTUTILS_BUILDARGS= --inplace PYDISTUTILS_EGGINFO= Kivy-${PORTVERSION}-py${PYTHON_VER}.egg-info SHEBANG_FILES= kivy/tools/pep8checker/pre-commit.githook OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= ENCHANT OPENCV PYGAME OPTIONS_SUB= yes OPTIONS_GROUP= VIDEO AUDIO IMAGE CAMERA SPELLING CLIPBOARD OPTIONS_MULTI= WINDOW TEXT OPTIONS_MULTI_WINDOW= PYGAME X11 SDL2 OPTIONS_MULTI_TEXT= PIL PYGAME SDL2 OPTIONS_GROUP_VIDEO= ${_OPTIONS_GROUP_VIDEO_${ARCH}} GSTREAMER _OPTIONS_GROUP_VIDEO_i386= PYGLET OPTIONS_GROUP_AUDIO= GSTREAMER PYGAME SDL2 OPTIONS_GROUP_IMAGE= PIL PYGAME SDL2 OPTIONS_GROUP_CAMERA= OPENCV GSTREAMER OPTIONS_GROUP_SPELLING= ENCHANT OPTIONS_GROUP_CLIPBOARD= PYGAME CAMERA_DESC= Camera support CLIPBOARD_DESC= Clipboard support IMAGE_DESC= Image support SPELLING_DESC= Spell checking support TEXT_DESC= Text rendering support (compulsory) WINDOW_DESC= Window support (compulsory) DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jquery>0:textproc/py-sphinxcontrib-jquery@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} DOCS_MAKE_ENV= READTHEDOCS=True ENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${PY_FLAVOR} GSTREAMER_MAKE_ENV= USE_GSTREAMER=1 GSTREAMER_MAKE_ENV_OFF= USE_GSTREAMER=0 GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>0:multimedia/py-gstreamer1@${PY_FLAVOR} GSTREAMER_USES= gettext-runtime gnome pkgconfig GSTREAMER_USE= GNOME=glib20 OPENCV_RUN_DEPENDS= opencv>0:graphics/opencv PIL_DESC= Text and window rendering support via Pillow PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} PYGAME_DESC= Window, text and image rendering support via PyGame PYGAME_RUN_DEPENDS= ${PYGAME} PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${PY_FLAVOR} SDL2_DESC= Simple Direct Media Layer v2.0 support SDL2_MAKE_ENV= USE_SDL2=1 SDL2_MAKE_ENV_OFF= USE_SDL2=0 SDL2_USE= SDL=sdl2,mixer2,image2,ttf2 SDL2_USES= pkgconfig sdl X11_MAKE_ENV= USE_X11=1 X11_MAKE_ENV_OFF= USE_X11=0 X11_USES= xorg X11_USE= XORG=xrender,x11 -post-patch: - @${REINPLACE_CMD} -e '/GLSHADERSOURCEPTR/s,const GLchar\*,& const ,' \ - ${WRKSRC}/kivy/graphics/cgl.pxd - @${REINPLACE_CMD} -e '/glShaderSource/s,const GLchar\*,& const ,' \ - ${WRKSRC}/kivy/graphics/cgl.pxd \ - ${WRKSRC}/kivy/graphics/cgl_backend/cgl_gl.pyx \ - ${WRKSRC}/kivy/include/common_subset.h - @${REINPLACE_CMD} -e '/mockShaderSource/s,const GLchar\*,& const,' \ - ${WRKSRC}/kivy/graphics/cgl_backend/cgl_mock.pyx - @${REINPLACE_CMD} -e '/dbgShaderSource/s,const GLchar\*,& const,' \ - ${WRKSRC}/kivy/graphics/cgl_backend/cgl_debug.pyx \ - post-build-DOCS-on: ${MKDIR} ${WRKSRC}/doc/build/doctrees ${WRKSRC}/doc/build/html (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} doc/autobuild.py) (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} sphinx-build-${PYTHON_VER} -b html \ -d ${WRKSRC}/doc/build/doctrees \ doc/sources ${WRKSRC}/doc/build/html) post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/kivy -name '*.so' | ${XARGS} ${STRIP_CMD} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/build/html; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include + +PATCH_ARGS+= -l diff --git a/x11-toolkits/py-kivy/distinfo b/x11-toolkits/py-kivy/distinfo index eb1239fcfa2b..6f67a7ccea83 100644 --- a/x11-toolkits/py-kivy/distinfo +++ b/x11-toolkits/py-kivy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704450722 -SHA256 (Kivy-2.3.0.tar.gz) = e8b8610c7f8ef6db908a139d369b247378f18105c96981e492eab2b4706c79d5 -SIZE (Kivy-2.3.0.tar.gz) = 23965268 +TIMESTAMP = 1735229636 +SHA256 (Kivy-2.3.1.tar.gz) = 0833949e3502cdb4abcf9c1da4384674045ad7d85644313aa1ee7573f3b4f9d9 +SIZE (Kivy-2.3.1.tar.gz) = 23967306 diff --git a/x11-toolkits/py-kivy/files/patch-git-5a1b27d b/x11-toolkits/py-kivy/files/patch-git-5a1b27d new file mode 100644 index 000000000000..a69b304b8a7a --- /dev/null +++ b/x11-toolkits/py-kivy/files/patch-git-5a1b27d @@ -0,0 +1,43 @@ +--- kivy/graphics/context_instructions.pyx.orig 2024-12-26 16:04:18 UTC ++++ kivy/graphics/context_instructions.pyx +@@ -86,7 +86,7 @@ cdef tuple rgb_to_hsv(float r, float g, float b): + + cdef tuple hsv_to_rgb(float h, float s, float v): + if s == 0.0: return v, v, v +- cdef long i = long(h * 6.0) ++ cdef long i = (h * 6.0) + cdef float f = (h * 6.0) - i + cdef float p = v * (1.0 - s) + cdef float q = v * (1.0 - s * f) +--- kivy/graphics/opengl.pyx.orig 2024-12-26 16:04:18 UTC ++++ kivy/graphics/opengl.pyx +@@ -689,7 +689,7 @@ def glDrawElements(GLenum mode, GLsizei count, GLenum + cdef void *ptr = NULL + if isinstance(indices, bytes): + ptr = ((indices)) +- elif isinstance(indices, (long, int)): ++ elif isinstance(indices, int): + ptr = (indices) + else: + raise TypeError("Argument 'indices' has incorrect type (expected bytes or int).") +@@ -1539,7 +1539,7 @@ def glVertexAttribPointer(GLuint index, GLint size, GL + cdef void *ptr = NULL + if isinstance(data, bytes): + ptr = ((data)) +- elif isinstance(data, (long, int)): ++ elif isinstance(data, int): + ptr = (data) + else: + raise TypeError("Argument 'data' has incorrect type (expected bytes or int).") +--- kivy/weakproxy.pyx.orig 2024-12-26 16:04:18 UTC ++++ kivy/weakproxy.pyx +@@ -253,9 +253,6 @@ cdef class WeakProxy(object): + def __int__(self): + return int(self.__ref__()) + +- def __long__(self): +- return long(self.__ref__()) +- + def __float__(self): + return float(self.__ref__()) +