all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#52116] [PATCH 0/2] gnu: Add printrun.
@ 2021-11-25 22:26 Morgan.J.Smith
  2021-11-26  0:58 ` [bug#52116] [PATCH 1/2] gnu: Add python-pyglet Morgan.J.Smith
  2022-12-23 23:08 ` [bug#52116] [PATCH v2 " Morgan.J.Smith
  0 siblings, 2 replies; 3+ messages in thread
From: Morgan.J.Smith @ 2021-11-25 22:26 UTC (permalink / raw)
  To: 52116

I've tested it and the GUI works great.  It connects to my 3D printer just fine.  I wish we had slic3r packaged but with prusa-slicer and now printrun, we do have a full 3D printing setup available

[PATCH 1/2] gnu: Add python-pyglet.
[PATCH 2/2] gnu: Add printrun.





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

* [bug#52116] [PATCH 1/2] gnu: Add python-pyglet.
  2021-11-25 22:26 [bug#52116] [PATCH 0/2] gnu: Add printrun Morgan.J.Smith
@ 2021-11-26  0:58 ` Morgan.J.Smith
  2022-12-23 23:08 ` [bug#52116] [PATCH v2 " Morgan.J.Smith
  1 sibling, 0 replies; 3+ messages in thread
From: Morgan.J.Smith @ 2021-11-26  0:58 UTC (permalink / raw)
  To: 52116; +Cc: Morgan Smith

From: Morgan Smith <Morgan.J.Smith@outlook.com>

* gnu/packages/python-xyz.scm (python-pyglet): New variable.
---
 gnu/packages/python-xyz.scm | 55 +++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d33469815a..79677cccc5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -28174,3 +28174,58 @@ (define-public bmap-tools
     ;; contrib/bmap_write.py is gpl2+
     ;; The rest is gpl2
     (license (list license:gpl2+ license:gpl2))))
+
+(define-public python-pyglet
+  (package
+    (name "python-pyglet")
+    (version "1.5.21")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pyglet" version ".zip"))
+       (sha256
+        (base32
+         "1qi8jz8dbyyz3yjz7jm94mll1libda08sk9512xgkdn4dnqdvajs"))))
+    (build-system python-build-system)
+    (inputs
+     `(("mesa" ,mesa)
+       ("glu" ,glu)
+       ("freetype" ,freetype)
+       ("fontconfig" ,fontconfig)
+       ("libx11" ,libx11)))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-pytest-cov" ,python-pytest-cov)
+       ("python-pillow" ,python-pillow)
+       ("xorg-server" ,xorg-server-for-tests)
+       ("unzip" ,unzip)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fix-paths
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* "pyglet/gl/lib_glx.py"
+               (("'GL'")
+                (string-append "'" (assoc-ref inputs "mesa") "/lib/libGL.so'"))
+               (("'GLU'")
+                (string-append "'" (assoc-ref inputs "glu") "/lib/libGLU.so'")))
+             (substitute* "pyglet/font/freetype_lib.py"
+               (("'freetype'")
+                (string-append "'" (assoc-ref inputs "freetype") "/lib/libfreetype.so'")))
+             (substitute* "pyglet/font/fontconfig.py"
+               (("'fontconfig'")
+                (string-append "'" (assoc-ref inputs "fontconfig") "/lib/libfontconfig.so'")))
+             (substitute* "pyglet/libs/x11/xlib.py"
+               (("'X11'")
+                (string-append "'" (assoc-ref inputs "libx11") "/lib/libX11.so'")))))
+         (replace 'check
+           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (system "Xvfb :1 &")
+               (setenv "DISPLAY" ":1")
+               (invoke "pytest" "tests/unit")))))))
+    (home-page "http://pyglet.readthedocs.io/en/latest/")
+    (synopsis "Cross-platform windowing and multimedia library")
+    (description "Cross-platform windowing and multimedia library")
+    (license license:bsd-3)))
-- 
2.34.0





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

* [bug#52116] [PATCH v2 1/2] gnu: Add python-pyglet.
  2021-11-25 22:26 [bug#52116] [PATCH 0/2] gnu: Add printrun Morgan.J.Smith
  2021-11-26  0:58 ` [bug#52116] [PATCH 1/2] gnu: Add python-pyglet Morgan.J.Smith
@ 2022-12-23 23:08 ` Morgan.J.Smith
  1 sibling, 0 replies; 3+ messages in thread
From: Morgan.J.Smith @ 2022-12-23 23:08 UTC (permalink / raw)
  To: 52116; +Cc: Morgan Smith

From: Morgan Smith <Morgan.J.Smith@outlook.com>

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

I updated the patches with the latest style.  python-pyglet has released a version 2 but printrun doesn't work with that.  Everything still works fine.  I would appreciate a review

 gnu/packages/python-xyz.scm | 58 +++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ee25a2d655..e609507032 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4973,6 +4973,64 @@ (define-public python-doc8
 text styles of documentation.")
     (license license:asl2.0)))
 
+(define-public python-pyglet
+  (package
+    (name "python-pyglet")
+    (version "1.5.27")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pyglet" version ".zip"))
+              (sha256
+               (base32
+                "01ghxgkaiw1m5gp498rd58vl8m5nvbyn95xna7yi0fqz8mky002d"))))
+    (build-system python-build-system)
+    (inputs (list mesa glu freetype fontconfig libx11))
+    (native-inputs (list python-pytest python-pytest-cov python-pillow
+                         xorg-server-for-tests unzip))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'fix-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "pyglet/gl/lib_glx.py"
+                (("'GL'")
+                 (string-append "'"
+                                (search-input-file inputs
+                                                   "lib/libGL.so") "'"))
+                (("'GLU'")
+                 (string-append "'"
+                                (search-input-file inputs
+                                                   "lib/libGLU.so")
+                                "'")))
+              (substitute* "pyglet/font/freetype_lib.py"
+                (("'freetype'")
+                 (string-append "'"
+                                (search-input-file inputs
+                                                   "lib/libfreetype.so") "'")))
+              (substitute* "pyglet/font/fontconfig.py"
+                (("'fontconfig'")
+                 (string-append "'"
+                                (search-input-file inputs
+                                                   "lib/libfontconfig.so") "'")))
+              (substitute* "pyglet/libs/x11/xlib.py"
+                (("'X11'")
+                 (string-append "'"
+                                (search-input-file inputs
+                                                   "lib/libX11.so")
+                                "'")))))
+          (replace 'check
+            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+              (when tests?
+                (add-installed-pythonpath inputs outputs)
+                (system "Xvfb :1 &")
+                (setenv "DISPLAY" ":1")
+                (invoke "pytest" "tests/unit")))))))
+    (home-page "http://pyglet.readthedocs.io/en/latest/")
+    (synopsis "Cross-platform windowing and multimedia library")
+    (description "Cross-platform windowing and multimedia library")
+    (license license:bsd-3)))
+
 (define-public python-pygments
   (package
     (name "python-pygments")
-- 
2.38.1





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

end of thread, other threads:[~2022-12-23 23:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-25 22:26 [bug#52116] [PATCH 0/2] gnu: Add printrun Morgan.J.Smith
2021-11-26  0:58 ` [bug#52116] [PATCH 1/2] gnu: Add python-pyglet Morgan.J.Smith
2022-12-23 23:08 ` [bug#52116] [PATCH v2 " Morgan.J.Smith

Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.