From 9c6f0392d5694c1754cffb0c5de01c1e67bac30f Mon Sep 17 00:00:00 2001 From: snehring <7978778+snehring@users.noreply.github.com> Date: Fri, 14 Mar 2025 08:50:29 -0500 Subject: [PATCH] Revert "Add package libglvnd (#49214)" (#49478) This reverts commit 682e4bf4d492e0acc0490495b0b6952918f6c548. --- etc/spack/defaults/packages.yaml | 3 +- .../builtin/packages/libglvnd/package.py | 34 ------------------- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/libglvnd/package.py diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 4726518bb04..0fcb8f08d7f 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -24,14 +24,13 @@ packages: cxx: [gcc] D: [ldc] daal: [intel-oneapi-daal] - egl: [libglvnd] elf: [elfutils] fftw-api: [fftw, amdfftw] flame: [libflame, amdlibflame] fortran: [gcc] fortran-rt: [gcc-runtime, intel-oneapi-runtime] fuse: [libfuse] - gl: [glx, osmesa, libglvnd] + gl: [glx, osmesa] glu: [mesa-glu, openglu] golang: [go, gcc] go-or-gccgo-bootstrap: [go-bootstrap, gcc] diff --git a/var/spack/repos/builtin/packages/libglvnd/package.py b/var/spack/repos/builtin/packages/libglvnd/package.py deleted file mode 100644 index 0584431865f..00000000000 --- a/var/spack/repos/builtin/packages/libglvnd/package.py +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Libglvnd(MesonPackage): - """libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls - between multiple vendors.""" - - homepage = "https://gitlab.freedesktop.org/glvnd/libglvnd" - url = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v1.7.0/libglvnd-v1.7.0.tar.gz" - - maintainers("snehring") - - license( - """MIT-feh AND MIT-Modern-Variant AND BSD-1-Clause AND BSD-3-Clause - AND GPL-3.0-or-later WITH Autoconf-exception-macro""", - checked_by="snehring", - ) - - version("1.7.0", sha256="2b6e15b06aafb4c0b6e2348124808cbd9b291c647299eaaba2e3202f51ff2f3d") - version("1.6.0", sha256="efc756ffd24b24059e1c53677a9d57b4b237b00a01c54a6f1611e1e51661d70c") - - depends_on("c", type="build") - depends_on("cxx", type="build") - - depends_on("libxext") - depends_on("libx11") - depends_on("xorgproto") - - provides("egl") - provides("gl")