CVS commit: pkgsrc/devel/py-kivy

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Nov 20 15:52:18 UTC 2023

Modified Files:
        pkgsrc/devel/py-kivy: Makefile PLIST

Log Message:
devel/py-kivy: Depend on SDL2 and gstreamer

These should perhaps be options, but it's unclear if that is true and
if so what the default should be.

Not tested, but builds on NetBSD 10.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-kivy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-kivy/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-kivy/Makefile
diff -u pkgsrc/devel/py-kivy/Makefile:1.5 pkgsrc/devel/py-kivy/Makefile:1.6
--- pkgsrc/devel/py-kivy/Makefile:1.5   Mon Nov 20 06:36:47 2023
+++ pkgsrc/devel/py-kivy/Makefile       Mon Nov 20 15:52:18 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2023/11/20 06:36:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2023/11/20 15:52:18 gdt Exp $
 
 DISTNAME=      Kivy-2.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=K/Kivy/}
 
@@ -10,25 +11,47 @@ HOMEPAGE=   https://kivy.org/
 COMMENT=       Library for rapid development of multitouch applications
 LICENSE=       mit
 
+USE_TOOLS+=    pkg-config
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+# upstream does not yet support modern cython
+#   \todo file bug upstream about lack of cython3 support
 TOOL_DEPENDS+= ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
-TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
-DEPENDS+=      ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
-DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 TOOL_DEPENDS+= ${PYPKGPREFIX}-kivy-garden-[0-9]*:../../devel/py-kivy-garden
-# not mentioned, but used
-DEPENDS+=      ${PYPKGPREFIX}-enchant>=1.6.5:../../textproc/py-enchant
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+
+# \todo Understand upstream's dependency rules and add/fix.
+# (Upstream's docs are very confusing as they are not listed in a
+# generic manner but only for a few specific operating systems, and
+# blur what is in their wheels for various platforms vs what
+# dependencies are needed.)
+# \todo Consider options as audio/video may be too heavy.
+
 DEPENDS+=      ${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game
 DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-benchmark-[0-9]*:../../devel/py-test-benchmark
-
-USE_LANGUAGES= c
-USE_TOOLS+=    pkg-config
+DEPENDS+=      ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+# \todo File upstream bug that dependency on enchant is undocumented.
+DEPENDS+=      ${PYPKGPREFIX}-enchant>=1.6.5:../../textproc/py-enchant
+DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-benchmark-[0-9]*:../../devel/py-test-benchmark
 
-pre-configure:
-       ${CHMOD} -R go-w ${WRKSRC}
+# Despite bad permissions in the distfile, extraction seems to result
+# in ok permissions, at least on NetBSD.  Commented out code remains
+# because this is semi-likely to be an issue in some circumstances,
+# and can be selectively re-enabled with an explanation.
+#pre-configure:
+#      ${CHMOD} -R go-w ${WRKSRC}
+
+# Include various packages needed for SDL2.
+.include "../../audio/SDL2_mixer/buildlink3.mk"
+.include "../../audio/SDL2_sound/buildlink3.mk"
+.include "../../fonts/SDL2_ttf/buildlink3.mk"
+.include "../../graphics/SDL2_image/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-kivy/PLIST
diff -u pkgsrc/devel/py-kivy/PLIST:1.2 pkgsrc/devel/py-kivy/PLIST:1.3
--- pkgsrc/devel/py-kivy/PLIST:1.2      Mon Nov 20 06:36:47 2023
+++ pkgsrc/devel/py-kivy/PLIST  Mon Nov 20 15:52:18 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/11/20 06:36:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/11/20 15:52:18 gdt Exp $
 ${PYSITELIB}/${WHEEL_INFODIR}/AUTHORS
 ${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
@@ -66,6 +66,7 @@ ${PYSITELIB}/kivy/core/audio/audio_gstpl
 ${PYSITELIB}/kivy/core/audio/audio_pygame.py
 ${PYSITELIB}/kivy/core/audio/audio_pygame.pyc
 ${PYSITELIB}/kivy/core/audio/audio_pygame.pyo
+${PYSITELIB}/kivy/core/audio/audio_sdl2.so
 ${PYSITELIB}/kivy/core/camera/__init__.py
 ${PYSITELIB}/kivy/core/camera/__init__.pyc
 ${PYSITELIB}/kivy/core/camera/__init__.pyo
@@ -87,6 +88,7 @@ ${PYSITELIB}/kivy/core/clipboard/__init_
 ${PYSITELIB}/kivy/core/clipboard/_clipboard_ext.py
 ${PYSITELIB}/kivy/core/clipboard/_clipboard_ext.pyc
 ${PYSITELIB}/kivy/core/clipboard/_clipboard_ext.pyo
+${PYSITELIB}/kivy/core/clipboard/_clipboard_sdl2.so
 ${PYSITELIB}/kivy/core/clipboard/clipboard_android.py
 ${PYSITELIB}/kivy/core/clipboard/clipboard_android.pyc
 ${PYSITELIB}/kivy/core/clipboard/clipboard_android.pyo
@@ -123,6 +125,7 @@ ${PYSITELIB}/kivy/core/gl/__init__.pyo
 ${PYSITELIB}/kivy/core/image/__init__.py
 ${PYSITELIB}/kivy/core/image/__init__.pyc
 ${PYSITELIB}/kivy/core/image/__init__.pyo
+${PYSITELIB}/kivy/core/image/_img_sdl2.so
 ${PYSITELIB}/kivy/core/image/img_dds.py
 ${PYSITELIB}/kivy/core/image/img_dds.pyc
 ${PYSITELIB}/kivy/core/image/img_dds.pyo
@@ -153,6 +156,8 @@ ${PYSITELIB}/kivy/core/spelling/spelling
 ${PYSITELIB}/kivy/core/text/__init__.py
 ${PYSITELIB}/kivy/core/text/__init__.pyc
 ${PYSITELIB}/kivy/core/text/__init__.pyo
+${PYSITELIB}/kivy/core/text/_text_pango.so
+${PYSITELIB}/kivy/core/text/_text_sdl2.so
 ${PYSITELIB}/kivy/core/text/markup.py
 ${PYSITELIB}/kivy/core/text/markup.pyc
 ${PYSITELIB}/kivy/core/text/markup.pyo
@@ -188,6 +193,7 @@ ${PYSITELIB}/kivy/core/video/video_null.
 ${PYSITELIB}/kivy/core/window/__init__.py
 ${PYSITELIB}/kivy/core/window/__init__.pyc
 ${PYSITELIB}/kivy/core/window/__init__.pyo
+${PYSITELIB}/kivy/core/window/_window_sdl2.so
 ${PYSITELIB}/kivy/core/window/window_attrs.pxi
 ${PYSITELIB}/kivy/core/window/window_egl_rpi.py
 ${PYSITELIB}/kivy/core/window/window_egl_rpi.pyc
@@ -444,6 +450,7 @@ ${PYSITELIB}/kivy/lib/ddsfile.pyo
 ${PYSITELIB}/kivy/lib/gstplayer/__init__.py
 ${PYSITELIB}/kivy/lib/gstplayer/__init__.pyc
 ${PYSITELIB}/kivy/lib/gstplayer/__init__.pyo
+${PYSITELIB}/kivy/lib/gstplayer/_gstplayer.so
 ${PYSITELIB}/kivy/lib/mtdev.py
 ${PYSITELIB}/kivy/lib/mtdev.pyc
 ${PYSITELIB}/kivy/lib/mtdev.pyo