Migrate to xorg-xorgproto (#2)

* Migrate to xorg-xorgproto * MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.03.06.07.11 --------- Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
conda-forge · Oct 3, 2024 · 6104776 · 6104776
1 parent 408b3a6
commit 6104776
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -15,6 +15,6 @@ meson setup builddir \
     -Dtls=true \
     -Ddispatch-tls=true \
     -Dheaders=true
-meson configure builddir
+
 ninja -v -C builddir
 ninja -C builddir install
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -12,7 +12,7 @@ source:
 
 build:
   skip: true  # [not linux]
-  number: 0
+  number: 1
 
 requirements:
   build:
@@ -24,8 +24,7 @@ requirements:
   host:
     - xorg-libx11
     - xorg-libxext
-    - xorg-xextproto
-    - xorg-glproto
+    - xorg-xorgproto
 
 outputs:
   - name: libglvnd
@@ -133,12 +132,10 @@ outputs:
         - {{ pin_subpackage('libglx', exact=True) }}
         - xorg-libx11
         - xorg-libxext
-        - xorg-xextproto
-        - xorg-glproto
+        - xorg-xorgproto
       run:
         - {{ pin_subpackage('libglx', exact=True) }}
-        - xorg-xextproto
-        - xorg-glproto
+        - xorg-xorgproto
     test:
       requires:
         - pkg-config