unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#73747] [PATCH 0/2] gnu: Add python-pyglet.
@ 2024-10-11 15:25 Sharlatan Hellseher
  2024-10-11 17:40 ` [bug#73747] [PATCH 1/2] gnu: Add packages/python-graphics module Sharlatan Hellseher
  2024-10-11 17:50 ` [bug#73747] [PATCH 2/2] gnu: Add python-pyglet Sharlatan Hellseher
  0 siblings, 2 replies; 3+ messages in thread
From: Sharlatan Hellseher @ 2024-10-11 15:25 UTC (permalink / raw)
  To: 73747
  Cc: Daniel Meißner, Adam Kandur, Sharlatan Hellseher, Adam Faiz,
	Liliana Marie Prikler, Morgan Smith, jgart, Lars-Dominik Braun,
	Marius Bakke, Munyoki Kilyungi, Sharlatan Hellseher,
	Tanguy Le Carrour, jgart

Hi Guix!

While checking python-science module for enabling optional packages for
python-trimesh:

-  python-pycollada   ; not packed yet, optional
-  python-pyglet      ; not packed yet, optional

I've packed python-pycollada as a part of Astro update for this month, it
would required to complete long packaging chain.

After check issues for python-pyglet I've found a few attempts to pack it
already in:

- 48467 [PATCH] gnu: Add python-pyglet.
;;; Copyright © 2021 Adam Kandur <kefironpremise@gmail.com>
- 50505 [PATCH 00/12] gnu: Add python-manim
;;; Copyright © 2021 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
- 52116 [PATCH 0/2] gnu: Add printrun.
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
- 67131 [PATCH 0/7] gnu: Add tuxemon.
;;; Copyright © 2023 Adam Faiz <adam.faiz@disroot.org>

This patch series introduces a new module - python-graphics (following naming
style taken from rust-team), and the latest python-pyglet with all bindings
implemented. Some tests are disabled, but most of them passed and module loads
successfly.

In the future I'd like to move some related packages from chunky python-xyz
into python-graphics.

Thanks,
Oleg

Sharlatan Hellseher (2):
  gnu: Add packages/python-graphics module.
  gnu: Add python-pyglet.

 gnu/local.mk                     |   1 +
 gnu/packages/python-graphics.scm | 178 +++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 gnu/packages/python-graphics.scm


base-commit: 053accdde356eaf84751b16d3aaf1425f410a70b
-- 
2.46.0





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [bug#73747] [PATCH 1/2] gnu: Add packages/python-graphics module.
  2024-10-11 15:25 [bug#73747] [PATCH 0/2] gnu: Add python-pyglet Sharlatan Hellseher
@ 2024-10-11 17:40 ` Sharlatan Hellseher
  2024-10-11 17:50 ` [bug#73747] [PATCH 2/2] gnu: Add python-pyglet Sharlatan Hellseher
  1 sibling, 0 replies; 3+ messages in thread
From: Sharlatan Hellseher @ 2024-10-11 17:40 UTC (permalink / raw)
  To: 73747
  Cc: Sharlatan Hellseher, Lars-Dominik Braun, Marius Bakke,
	Munyoki Kilyungi, Sharlatan Hellseher, Tanguy Le Carrour, jgart

* gnu/packages/python-graphics.scm: New file.
* gnu/local.mk: Add gnu/packages/python-graphics.scm to the scope.

Change-Id: I1d077c838ff1c3c014c3d699b539eaf8befd5084
---
 gnu/local.mk                     |  1 +
 gnu/packages/python-graphics.scm | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 gnu/packages/python-graphics.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index afff609501..b47d4dc917 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -561,6 +561,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/python-check.scm			\
   %D%/packages/python-compression.scm		\
   %D%/packages/python-crypto.scm		\
+  %D%/packages/python-graphics.scm			\
   %D%/packages/python-science.scm		\
   %D%/packages/python-web.scm			\
   %D%/packages/python-xyz.scm			\
diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm
new file mode 100644
index 0000000000..ef981bd8d7
--- /dev/null
+++ b/gnu/packages/python-graphics.scm
@@ -0,0 +1,28 @@
+;;; GNU Guix --- Functional package management for GNU
+
+(define-module (gnu packages python-graphics)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix build-system python) #:select (pypi-uri))
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-xyz))
+
+;;; Commentary:
+;;;
+;;; Python modules which are meant to be used in GUI creation or mainly are
+;;; bindings to low level libraries such as Glue, Mesa, OpenGL, Xorg etc.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+\f
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above in alphabetical order.
+;;;
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#73747] [PATCH 2/2] gnu: Add python-pyglet.
  2024-10-11 15:25 [bug#73747] [PATCH 0/2] gnu: Add python-pyglet Sharlatan Hellseher
  2024-10-11 17:40 ` [bug#73747] [PATCH 1/2] gnu: Add packages/python-graphics module Sharlatan Hellseher
@ 2024-10-11 17:50 ` Sharlatan Hellseher
  1 sibling, 0 replies; 3+ messages in thread
From: Sharlatan Hellseher @ 2024-10-11 17:50 UTC (permalink / raw)
  To: 73747
  Cc: Daniel Meißner, Morgan Smith, Adam Kandur,
	Sharlatan Hellseher, Adam Faiz, Lars-Dominik Braun, Marius Bakke,
	Munyoki Kilyungi, Sharlatan Hellseher, Tanguy Le Carrour, jgart

This project was mentioned in #48467, #50505, #52116 and #67131. It's a
refreshed version with most of the bindings implemented.

* gnu/packages/python-graphics.scm (python-pyglet): New variable.

Change-Id: I78718376bc2945184c32cb013309fbba2b2749d0
Co-Authored-By: Adam Kandur <kefironpremise@gmail.com>
Co-Authored-By: Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
Co-Authored-By: Morgan Smith <Morgan.J.Smith@outlook.com>
Co-Authored-By: Adam Faiz <adam.faiz@disroot.org>
---
 gnu/packages/python-graphics.scm | 152 ++++++++++++++++++++++++++++++-
 1 file changed, 151 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm
index ef981bd8d7..d0b4a1df74 100644
--- a/gnu/packages/python-graphics.scm
+++ b/gnu/packages/python-graphics.scm
@@ -1,4 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Adam Kandur <kefironpremise@gmail.com>
+;;; Copyright © 2021 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
+;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
+;;; Copyright © 2023 Adam Faiz <adam.faiz@disroot.org>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
 
 (define-module (gnu packages python-graphics)
   #:use-module ((guix licenses) #:prefix license:)
@@ -8,9 +13,18 @@ (define-module (gnu packages python-graphics)
   #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (gnu packages)
+  #:use-module (gnu packages audio)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-xyz))
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages xorg))
 
 ;;; Commentary:
 ;;;
@@ -21,6 +35,142 @@ (define-module (gnu packages python-graphics)
 ;;;
 ;;; Code:
 \f
+(define-public python-pyglet
+  (package
+    (name "python-pyglet")
+    (version "2.0.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pyglet" version))
+       (sha256
+        (base32 "1p4rizj81vfqxal288m3afbrgk0il3w7k5kmhai2sah8f26j7ybw"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "tests"
+              "--ignore=tests/interactive"
+              ;; All tests errored
+              "--ignore=tests/integration/media/test_openal.py"
+              "--ignore=tests/integration/text/test_empty_document.py"
+              ;; Tests failed
+              "-k" (string-append "not test2"
+                                  " and not test5"
+                                  " and not testPad"
+                                  " and not testPad"
+                                  " and not testRange"
+                                  " and not testRect"
+                                  " and not testRect"
+                                  " and not testSet"
+                                  " and not testSquare"
+                                  " and not testSquare"
+                                  " and not testTuple"
+                                  " and not testTupleRange"
+                                  " and not test_context_noshare_texture"
+                                  " and not test_context_share_texture"
+                                  " and not test_method"
+                                  " and not test_openal_listener"
+                                  " and not test_parse_all_controller_mappings"
+                                  " and not test_player_play"
+                                  " and not test_player_play_multiple"
+                                  " and not test_stream_write_needed"
+                                  " and not test_window_caption"
+                                  " and not test_window_caption_from_argv"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-lib-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* (list "pyglet/font/fontconfig.py"
+                                 "pyglet/font/freetype_lib.py"
+                                 "pyglet/gl/lib_glx.py"
+                                 "pyglet/input/linux/evdev.py"
+                                 "pyglet/libs/egl/egl.py"
+                                 "pyglet/libs/egl/lib.py"
+                                 "pyglet/libs/x11/xf86vmode.py"
+                                 "pyglet/libs/x11/xinerama.py"
+                                 "pyglet/libs/x11/xlib.py"
+                                 "pyglet/libs/x11/xsync.py"
+                                 "pyglet/media/drivers/openal/lib_openal.py"
+                                 "pyglet/media/drivers/pulse/lib_pulseaudio.py")
+                (("'EGL'")
+                 (format #f "'~a/~a'" #$(this-package-input "mesa")
+                         "lib/libEGL.so"))
+                (("\"fontconfig\"")
+                 (format #f "'~a/~a'" #$(this-package-input "fontconfig-minimal")
+                         "lib/libfontconfig.so"))
+                (("\"freetype\"")
+                 (format #f "'~a/~a'" #$(this-package-input "freetype")
+                         "lib/libfreetype.so"))
+                (("'GL'")
+                 (format #f "'~a/~a'" #$(this-package-input "mesa")
+                         "lib/libGL.so"))
+                (("'GLU'")
+                 (format #f "'~a/~a'" #$(this-package-input "glu")
+                         "lib/libGLU.so"))
+                (("'X11'")
+                 (format #f "'~a/~a'" #$(this-package-input "libx11")
+                         "lib/libX11.so"))
+                (("'Xext'")
+                 (format #f "'~a/~a'" #$(this-package-input "libxext")
+                         "lib/libXext.so"))
+                (("'Xinerama'")
+                 (format #f "'~a/~a'" #$(this-package-input "libxinerama")
+                         "lib/libXinerama.so"))
+                (("'Xxf86vm'")
+                 (format #f "'~a/~a'" #$(this-package-input "libxxf86vm")
+                         "lib/libXxf86vm.so"))
+                (("'c'")
+                 (format #f "'~a/~a'" #$(this-package-input "glibc")
+                         "lib/libc.so"))
+                (("'gdk-x11-2.0'")
+                 (format #f "'~a/~a'" #$(this-package-input "gtk+")
+                         "lib/gdk-pixbuf-2.0.so"))
+                (("'gdk_pixbuf-2.0'")
+                 (format #f "'~a/~a'" #$(this-package-input "gdk-pixbuf")
+                         "lib/libgdk_pixbuf-2.0.so"))
+                (("'openal'")
+                 (format #f "'~a/~a'" #$(this-package-input "openal")
+                         "lib/libopenal.so"))
+                (("'pulse'")
+                 (format #f "'~a/~a'" #$(this-package-input "pulseaudio")
+                         "lib/libpulse.so")))))
+          (add-before 'check 'prepare-test-environment
+            (lambda _
+              ;; The test suite requires a running X server.
+              (system "Xvfb :1 &")
+              (setenv "DISPLAY" ":1")
+              (setenv "HOME" "/tmp")
+              (setenv "PYGLET_HEADLESS" "True"))))))
+    (native-inputs
+     (list python-flit-core
+           python-pytest
+           unzip
+           xorg-server-for-tests))
+    (inputs
+     (list ffmpeg
+           fontconfig
+           freeglut
+           freetype
+           gdk-pixbuf
+           glibc
+           glu
+           gtk+
+           libx11
+           libxext
+           libxinerama
+           libxxf86vm
+           mesa
+           openal
+           pulseaudio))
+    (home-page "https://github.com/pyglet/pyglet")
+    (synopsis "Windowing and multimedia library")
+    (description
+     "Pyglet is a Python library for developing games and other visually-rich
+applications.  It supports windowing, user interface event handling,
+Joysticks, OpenGL graphics, loading images and videos, playing sounds and
+music." )
+    (license license:bsd-3)))
 
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-10-11 18:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-11 15:25 [bug#73747] [PATCH 0/2] gnu: Add python-pyglet Sharlatan Hellseher
2024-10-11 17:40 ` [bug#73747] [PATCH 1/2] gnu: Add packages/python-graphics module Sharlatan Hellseher
2024-10-11 17:50 ` [bug#73747] [PATCH 2/2] gnu: Add python-pyglet Sharlatan Hellseher

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).