From 52c463a9ca0b591ef095c85e421867149135628d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 21:24:51 +0200 Subject: news: Add ‘nl’ translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add an ‘nl’ ‘translation’. --- gnu/packages/gl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e024dd2756..fdc361d761 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -775,7 +775,7 @@ and visualizations.") (define-public gl2ps (package (name "gl2ps") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) @@ -783,15 +783,14 @@ and visualizations.") "http://geuz.org/gl2ps/src/gl2ps-" version ".tgz")) (sha256 - (base32 - "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3")))) + (base32 "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d")))) (build-system cmake-build-system) (inputs `(("libpng" ,libpng) ("mesa" ,mesa) ("zlib" ,zlib))) (arguments - `(#:tests? #f)) ;; no tests + `(#:tests? #f)) ; no tests (home-page "http://www.geuz.org/gl2ps/") (synopsis "OpenGL to PostScript printing library") (description "GL2PS is a C library providing high quality vector -- cgit v1.2.3 From e7b2ac1cd8aaa3451e29b7529317932ed9149e68 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 May 2020 14:04:48 +0200 Subject: gnu: Add libglvnd. * gnu/packages/gl.scm (libglvnd): New public variable. --- gnu/packages/gl.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index fdc361d761..23b8ed1a29 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -664,6 +664,53 @@ OpenGL graphics API.") "A library for handling OpenGL function pointer management.") (license license:x11))) +(define-public libglvnd + (package + (name "libglvnd") + (version "1.3.1") + (home-page "https://gitlab.freedesktop.org/glvnd/libglvnd") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mkzdzdxjxjl794rblq4mq33wmb8ikqmfswbqdbr8gw2kw4wlhdl")))) + (build-system meson-build-system) + (arguments + '(#:configure-flags '("-Dx11=enabled") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-glx-tests + (lambda _ + ;; This package is meant to be used alongside Mesa. + ;; To avoid a circular dependency, disable tests that + ;; require a running Xorg server. + (substitute* "tests/meson.build" + (("if with_glx") + "if false")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("xorgproto" ,xorgproto))) + (synopsis "Vendor-neutral OpenGL dispatch library") + (description + "libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL +API calls between multiple vendors. It allows multiple drivers from +different vendors to coexist on the same filesystem, and determines which +vendor to dispatch each API call to at runtime. + +Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES.") + ;; libglvnd is available under a custom X11-style license, and incorporates + ;; code with various other licenses. See README.md for details. + (license (list (license:x11-style "file://README.md") + license:x11 + license:expat)))) + (define-public soil (package (name "soil") -- cgit v1.2.3 From bbe81cdaed559e9d6897ed9a8e3e25d887b5612d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:54:01 +0200 Subject: gnu: mesa: Update to 20.0.7. * gnu/packages/gl.scm (mesa): Update to 20.0.7. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e024dd2756..4ea6515013 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -233,7 +233,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.3.4") + (version "20.0.7") (source (origin (method url-fetch) @@ -245,7 +245,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1r4giqq7q7zqbn23lbw7v5vswagxx8qj6ij2w8bsb697mvk6g90x")) + "0y517qpdg6v6dsdgzb365p03m30511sbyh8pq0mcvhvjwy7javpy")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From e634d959472cee7d53dfdc52d1d36cabc25f4ba2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:58:10 +0200 Subject: gnu: mesa: Build with LLVM 10. * gnu/packages/gl.scm (mesa)[inputs]: Change from LLVM-9 to LLVM-10. * gnu/packages/gl.scm (mesa-opencl)[native-inputs]: Change from CLANG-9 to CLANG-10. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4ea6515013..a04f750f8e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -270,7 +270,7 @@ also known as DXTn or DXTC) for Mesa.") ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") ;; Note: update the 'clang' input of mesa-opencl when bumping this. - `(("llvm" ,llvm-9))) + `(("llvm" ,llvm-10))) (_ `())) ("makedepend" ,makedepend) @@ -437,7 +437,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") `(("libclc" ,libclc) ,@(package-inputs mesa))) (native-inputs - `(("clang" ,clang-9) + `(("clang" ,clang-10) ,@(package-native-inputs mesa))))) (define-public mesa-opencl-icd -- cgit v1.2.3 From 2d2713596205129403b3864d33b1af6763d450cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 10:36:31 +0200 Subject: gnu: Mesa: Fix ineffective substitution on i686-linux. This is a follow-up to commit ee345ae62c8b899186b65b61a2376b5adb938520. * gnu/packages/gl.scm (mesa)[arguments]: Adjust substitution to use the correct file name. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a04f750f8e..de9e6090df 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -359,7 +359,7 @@ also known as DXTn or DXTC) for Mesa.") ;; report: . `((add-after 'unpack 'disable-failing-test (lambda _ - (substitute* "src/gallium/tests/unit/meson.build" + (substitute* "src/util/tests/format/meson.build" (("'u_format_test',") "")) #t))) '()) -- cgit v1.2.3 From 0df5bdf81cb3b3b8aa0694ca0a20fedd65ee4723 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 18:53:14 +0200 Subject: gnu: Mesa: Install scripts to a separate output. * gnu/packages/gl.scm (mesa)[outputs]: New field. [arguments]: Add phase 'split-outputs'. --- gnu/packages/gl.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3d94ddb23f..3d8d2687c4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -289,6 +289,7 @@ also known as DXTn or DXTC) for Mesa.") ("python" ,python-wrapper) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) + (outputs '("out" "bin")) (arguments `(#:configure-flags '(,@(match (%current-system) @@ -382,6 +383,26 @@ also known as DXTn or DXTC) for Mesa.") (("\"gbm_dri\\.so") (string-append "\"" out "/lib/dri/gbm_dri.so"))) #t))) + (add-after 'install 'split-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + ,@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + ;; Install the Vulkan overlay control script to a separate + ;; output to prevent a reference on Python, saving ~70 MiB + ;; on the closure size. + '((copy-recursively (string-append out "/bin") + (string-append bin "/bin")) + (delete-file-recursively (string-append out "/bin")))) + (_ + ;; XXX: On architectures without the Vulkan overlay layer + ;; just create an empty file because outputs can not be + ;; added conditionally. + '((mkdir-p (string-append bin "/bin")) + (call-with-output-file (string-append bin "/bin/.empty") + (const #t))))) + #t))) (add-after 'install 'symlinks-instead-of-hard-links (lambda* (#:key outputs #:allow-other-keys) ;; All the drivers and gallium targets create hard links upon -- cgit v1.2.3 From 90c4298eede94cd353fc3dd0e3099af7b5ba7283 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 19:02:22 +0200 Subject: gnu: Mesa: Remove unused input. * gnu/packages/gl.scm (mesa)[inputs]: Remove MAKEDEPEND. --- gnu/packages/gl.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3d8d2687c4..01fb3368d9 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -273,7 +273,6 @@ also known as DXTn or DXTC) for Mesa.") `(("llvm" ,llvm-10))) (_ `())) - ("makedepend" ,makedepend) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (native-inputs -- cgit v1.2.3 From 577041e60b1d1816b1bc1fa9862ad7c7ea64c33d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 19:21:42 +0200 Subject: gnu: Mesa: Remove obsolete phase. * gnu/packages/gl.scm (mesa)[arguments]: Remove 'patch-create_test_cases' phase. --- gnu/packages/gl.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 01fb3368d9..ad8f06b0dc 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -347,12 +347,6 @@ also known as DXTn or DXTC) for Mesa.") (guix build meson-build-system)) #:phases (modify-phases %standard-phases - (add-after - 'unpack 'patch-create_test_cases - (lambda _ - (substitute* "src/intel/genxml/gen_pack_header.py" - (("/usr/bin/env python2") (which "python"))) - #t)) ,@(if (string-prefix? "i686" (or (%current-target-system) (%current-system))) ;; Disable new test from Mesa 19 that fails on i686. Upstream -- cgit v1.2.3 From 5a746104e3c91400099377fcc4bd763b9e91fb96 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 19:51:01 +0200 Subject: gnu: Mesa: Fix substitutions for absolute library references. * gnu/packages/gl.scm (mesa)[arguments]: In the 'fix-dlopen-libnames' phase, adjust substitutions so that they patch the correct files. --- gnu/packages/gl.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ad8f06b0dc..788fe7c5c4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -357,16 +357,16 @@ also known as DXTn or DXTC) for Mesa.") (("'u_format_test',") "")) #t))) '()) - (add-before - 'configure 'fix-dlopen-libnames + (add-before 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Remain agnostic to .so.X.Y.Z versions while doing ;; the substitutions so we're future-safe. - (substitute* "src/glx/dri_common.c" - (("dlopen\\(\"libGL\\.so") - (string-append "dlopen(\"" out "/lib/libGL.so"))) - (substitute* "src/egl/drivers/dri2/egl_dri2.c" + (substitute* "src/glx/meson.build" + (("-DGL_LIB_NAME=\"lib@0@\\.so\\.@1@\"") + (string-append "-DGL_LIB_NAME=\"" out + "/lib/lib@0@.so.@1@\""))) + (substitute* "src/gbm/backends/dri/gbm_dri.c" (("\"libglapi\\.so") (string-append "\"" out "/lib/libglapi.so"))) (substitute* "src/gbm/main/backend.c" -- cgit v1.2.3 From cb475eaa71734351acae60e14c4d318d050da64b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 May 2020 11:24:13 +0200 Subject: gnu: mesa-headers: Do not inherit outputs from Mesa. This is a follow-up to commit 43a8d83c08d736b613a385ff0d06941bd373b642. * gnu/packages/gl.scm (mesa-headers)[outputs]: New field. --- gnu/packages/gl.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 788fe7c5c4..e3c3ed850d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -471,6 +471,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") (propagated-inputs '()) (inputs '()) (native-inputs '()) + (outputs '("out")) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From fdd883509301845ddb4dc90e70e58b469afb5441 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jun 2020 12:55:12 +0200 Subject: gnu: mesa: Replace with 20.0.8. * gnu/packages/gl.scm (mesa-20.0.8): New variable. (mesa)[replacement]: New field. --- gnu/packages/gl.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 8a17f7dd65..828612eee1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -234,6 +234,13 @@ also known as DXTn or DXTC) for Mesa.") (package (name "mesa") (version "20.0.7") + + ;; Mesa 20.0.5 through 20.0.7 has problems with some graphic drivers, so + ;; we need this newer version. + ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/2882 + ;; https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4861 + (replacement mesa-20.0.8) + (source (origin (method url-fetch) @@ -439,6 +446,21 @@ device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +;; Replacement package to fix . +(define mesa-20.0.8 + (package + (inherit mesa) + (version "20.0.8") + (source (origin + (inherit (package-source mesa)) + (uri (list (string-append "https://mesa.freedesktop.org/archive/" + "mesa-" version ".tar.xz") + (string-append "ftp://ftp.freedesktop.org/pub/mesa/" + "mesa-" version ".tar.xz"))) + (sha256 + (base32 + "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c")))))) + (define-public mesa-opencl (package (inherit mesa) -- cgit v1.2.3 From 8ea91d05b0fd16a8dd42a53efee9b16991d581b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jun 2020 12:57:15 +0200 Subject: gnu: mesa: Ensure replacements are inherited in special variants. * gnu/packages/gl.scm (mesa-opencl, mesa-opencl-icd, mesa-headers): Use PACKAGE/INHERIT instead of regular inheritance. --- gnu/packages/gl.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 828612eee1..41fc8ae697 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -462,8 +462,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c")))))) (define-public mesa-opencl - (package - (inherit mesa) + (package/inherit mesa (name "mesa-opencl") (arguments (substitute-keyword-arguments (package-arguments mesa) @@ -477,8 +476,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") ,@(package-native-inputs mesa))))) (define-public mesa-opencl-icd - (package - (inherit mesa-opencl) + (package/inherit mesa-opencl (name "mesa-opencl-icd") (arguments (substitute-keyword-arguments (package-arguments mesa) @@ -487,8 +485,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") ,(delete "-Dgallium-opencl=standalone" flags))))))) (define-public mesa-headers - (package - (inherit mesa) + (package/inherit mesa (name "mesa-headers") (propagated-inputs '()) (inputs '()) -- cgit v1.2.3