From a49c829a0500ab5606021c60eb1f6412566ff4ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jun 2022 18:35:18 +0200 Subject: gnu: libva: Update to 2.14.0. * gnu/packages/video.scm (libva): Update to 2.14.0. * gnu/packages/gl.scm (libva-without-mesa)[arguments]: Remove obsolete configure flag. While here, remove unnecessary splicing. --- gnu/packages/gl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c740c087dd..9f9f78b921 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -249,14 +249,14 @@ (define libva-without-mesa (package (inherit libva) (name "libva-without-mesa") - (inputs `(,@(fold alist-delete (package-inputs libva) - '("mesa" "wayland")))) + (inputs (fold alist-delete (package-inputs libva) + '("mesa" "wayland"))) (arguments (strip-keyword-arguments '(#:make-flags) (substitute-keyword-arguments (package-arguments libva) ((#:configure-flags flags) - '(list "--disable-glx" "--disable-egl")))))))) + '(list "--disable-glx")))))))) (define-public mesa (package -- cgit v1.2.3 From 32c676bbcd756f13fb6a5b978e069db54d5914a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jun 2022 19:05:13 +0200 Subject: gnu: libepoxy: Update to 1.5.10. * gnu/packages/gl.scm (libepoxy): Update to 1.5.10. [source]: Switch to GIT-FETCH. [arguments]: Remove trailing #t and defunct bootstrap phase. --- gnu/packages/gl.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9f9f78b921..3a57af44a5 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -717,21 +717,19 @@ (define-public guile3.0-opengl (define-public libepoxy (package (name "libepoxy") - (version "1.5.5") + (version "1.5.10") + (home-page "https://github.com/anholt/libepoxy") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/anholt/libepoxy/releases/download/" - version "/libepoxy-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0mh5bdgqfd8m4wj6jlvn4ac94sgfa8r6ish75ciwrhdw47dn65i6")))) + "0jw02bzdwynyrwsn5rhcacv92h9xx928j3xp436f8gdnwlyb5641")))) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases - (delete 'bootstrap) - (add-before - 'configure 'patch-paths + (add-before 'configure 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (let ((python (assoc-ref inputs "python")) (mesa (assoc-ref inputs "mesa"))) @@ -739,15 +737,13 @@ (define-public libepoxy (("/usr/bin/env python") python)) (substitute* (find-files "." "\\.[ch]$") (("libGL.so.1") (string-append mesa "/lib/libGL.so.1")) - (("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1"))) - #t)))))) + (("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1"))))))))) (build-system meson-build-system) (native-inputs (list pkg-config python)) (propagated-inputs ;; epoxy.pc: 'Requires.private: gl egl' (list mesa)) - (home-page "https://github.com/anholt/libepoxy/") (synopsis "Library for handling OpenGL function pointer management") (description "A library for handling OpenGL function pointer management.") -- cgit v1.2.3 From 2692624ecfcd5e509df9704cfd38b167a8eb5692 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jun 2022 19:10:12 +0200 Subject: gnu: libepoxy: Use new style. * gnu/packages/gl.scm (libepoxy)[arguments]: Use gexp and remove labels. While at it, remove obsolete substitution. --- gnu/packages/gl.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3a57af44a5..4ee5f85b32 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -68,6 +68,7 @@ (define-module (gnu packages gl) #:use-module (guix build-system waf) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:hide (zip))) @@ -727,17 +728,15 @@ (define-public libepoxy (base32 "0jw02bzdwynyrwsn5rhcacv92h9xx928j3xp436f8gdnwlyb5641")))) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python")) - (mesa (assoc-ref inputs "mesa"))) - (substitute* "src/gen_dispatch.py" - (("/usr/bin/env python") python)) - (substitute* (find-files "." "\\.[ch]$") - (("libGL.so.1") (string-append mesa "/lib/libGL.so.1")) - (("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1"))))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((mesa (dirname (search-input-file inputs "lib/libGL.so")))) + (substitute* (find-files "." "\\.[ch]$") + (("libGL.so.1") (string-append mesa "/libGL.so.1")) + (("libEGL.so.1") (string-append mesa "/libEGL.so.1"))))))))) (build-system meson-build-system) (native-inputs (list pkg-config python)) -- cgit v1.2.3 From a6bc7baa5430f2388ea6a134146908e830ef3a21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jun 2022 19:22:23 +0200 Subject: gnu: freeglut: Update to 3.2.2. * gnu/packages/gl.scm (freeglut): Update to 3.2.2. [source](uri): Switch to new primary download location. [source](patches): Remove. * gnu/packages/patches/freeglut-gcc-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/gl.scm | 9 ++--- gnu/packages/patches/freeglut-gcc-compat.patch | 53 -------------------------- 3 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 gnu/packages/patches/freeglut-gcc-compat.patch (limited to 'gnu/packages/gl.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 58a83c4916..4e19b64f6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1077,7 +1077,6 @@ dist_patch_DATA = \ %D%/packages/patches/fp16-system-libraries.patch \ %D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ - %D%/packages/patches/freeglut-gcc-compat.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/fxdiv-system-libraries.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4ee5f85b32..fcc110e6bf 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -105,16 +105,15 @@ (define-public glu (define-public freeglut (package (name "freeglut") - (version "3.2.1") + (version "3.2.2") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/freeglut/freeglut/" - version "/freeglut-" version ".tar.gz")) - (patches (search-patches "freeglut-gcc-compat.patch")) + "https://github.com/FreeGLUTProject/freeglut/releases" + "/download/v" version "/freeglut-" version ".tar.gz")) (sha256 (base32 - "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l")))) + "0l3s57zw51fy3mn5qfdm4z775kfhflgxppanaxmskfzh5l44m565")))) (build-system cmake-build-system) (arguments '(#:tests? #f ;no test target diff --git a/gnu/packages/patches/freeglut-gcc-compat.patch b/gnu/packages/patches/freeglut-gcc-compat.patch deleted file mode 100644 index 126bbd89f4..0000000000 --- a/gnu/packages/patches/freeglut-gcc-compat.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix build failure with GCC 10. - -Taken from upstream: -https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c - -diff --git a/src/fg_gl2.c b/src/fg_gl2.c ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,20 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed -+ * names are defined in fg_gl2.h header to reference them, for any other case, -+ * define them as function pointers here. -+ */ -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; -diff --git a/src/fg_gl2.h b/src/fg_gl2.h ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - -- cgit v1.2.3 From b40151ff4f1ad4230f64df408304ceb3b16ac2da Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jun 2022 19:34:15 +0200 Subject: gnu: glu: Update to 9.0.2. * gnu/packages/gl.scm (glu): Update to 9.0.2. [source]: Switch to GIT-FETCH. [native-inputs]: Add PKG-CONFIG, AUTOCONF, AUTOMAKE, and LIBTOOL. --- gnu/packages/gl.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index fcc110e6bf..66db679342 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -76,15 +76,22 @@ (define-module (gnu packages gl) (define-public glu (package (name "glu") - (version "9.0.1") + (version "9.0.2") (source (origin - (method url-fetch) - (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/mesa/glu") + (commit (string-append "glu-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1xqhk9bn10nbvffw3r4p4rjslwz1l7gaycc0x2pqkr2irp7q9x7n")))) + "1khxfidyglpx4yd8f3xvrj05ah823cz1ygcszhcaa4w7h9kd1lbr")))) (build-system gnu-build-system) + (native-inputs + (list pkg-config + autoconf + automake + libtool)) (propagated-inputs (list mesa)) ; according to glu.pc (home-page "http://www.opengl.org/archives/resources/faq/technical/glu.htm") -- cgit v1.2.3