Merge branch 'develop' into packages/turbovnc

spack · teaguesterling · Jun 9, 2024 · Jun 9, 2024 · Jun 13, 2024 · Jun 13, 2024
commit c8a0b1cbd690f4537500b82f08eb2994aaf6af0f
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
@@ -22,6 +22,8 @@ packages:
       bigreqsproto: [xorgproto, bigreqsproto]
       blas: [openblas, amdblis]
       compositeproto: [xorgproto, compositeproto]
+      c: [gcc]
+      cxx: [gcc]
       D: [ldc]
       daal: [intel-oneapi-daal]
       damageproto: [xorgproto, damageproto]
@@ -34,6 +36,7 @@ packages:
       flame: [libflame, amdlibflame]
       fixesproto: [xorgproto, fixesproto]
       fontcacheproto: [xorgproto, fontcacheproto]
+      fortran: [gcc]
       fortran-rt: [gcc-runtime, intel-oneapi-runtime]
       fuse: [libfuse]
       gl: [glx, osmesa]

diff --git a/var/spack/repos/builtin/packages/xorgproto/package.py b/var/spack/repos/builtin/packages/xorgproto/package.py
@@ -5,18 +5,19 @@
 from spack.package import *
 
 
-class Xorgproto(MesonPackage):
+class Xorgproto(MesonPackage, XorgPackage):
     """X Window System unified protocol definitions replacing standalone protos"""
 
     homepage = "https://gitlab.freedesktop.org/xorg/proto/xorgproto"
-    url = "https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/archive/xorgproto-2024.1/xorgproto-xorgproto-2024.1.tar.bz2"
+    xorg_mirror_path = "proto/xorgproto-2024.1.tar.gz"
 
     maintainers("teaguesterling")
 
     license("OTHER", checked_by="teaguesterling")
 
-    version("2024.1", sha256="3959b2d17d86dd9d165dc24d26f372ca64f27127cd381739366ba8383a6cd51a")
+    version("2024.1", sha256="4f6b9b4faf91e5df8265b71843a91fc73dc895be6210c84117a996545df296ce")
 
+    depends_on("meson@0.56:", type="build")
     depends_on("util-macros", type="build")
 
     provides("bigreqsproto")
@@ -36,4 +37,4 @@ class Xorgproto(MesonPackage):
     provides("videoproto")
     provides("xineramaproto")
     provides("xf86driproto")
-    provides("xcmiscproto")
+    provides("xcmiscproto")