diff options
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 23b8ed1a29..8a17f7dd65 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) @@ -270,10 +270,9 @@ 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) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (native-inputs @@ -289,6 +288,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) @@ -347,32 +347,26 @@ 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 ;; report: <https://bugs.freedesktop.org/show_bug.cgi?id=110612>. `((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))) '()) - (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@[email protected].@1@\""))) + (substitute* "src/gbm/backends/dri/gbm_dri.c" (("\"libglapi\\.so") (string-append "\"" out "/lib/libglapi.so"))) (substitute* "src/gbm/main/backend.c" @@ -382,6 +376,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 @@ -437,7 +451,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 @@ -457,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 |