From 61047769d91f76708fd5abb6c6d3cc4c7bd91442 Mon Sep 17 00:00:00 2001
From: Seungmin Kim <8457324+ehfd@users.noreply.github.com>
Date: Fri, 4 Oct 2024 00:10:43 +0900
Subject: [PATCH] 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>
---
 .ci_support/linux_64_.yaml      |  2 +-
 .ci_support/linux_aarch64_.yaml |  2 +-
 .ci_support/linux_ppc64le_.yaml |  2 +-
 .scripts/build_steps.sh         |  2 ++
 build-locally.py                |  5 ++++-
 recipe/build.sh                 |  2 +-
 recipe/meta.yaml                | 11 ++++-------
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
index bf8d8d1..8ef62cf 100644
--- 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
index 5f304d0..2395eeb 100644
--- 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
index abe6443..2a529bd 100644
--- 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
index 6c805a9..af0b9ac 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
 
 source run_conda_forge_build_setup
 
+
+
 # make the build number clobber
 make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
 
diff --git a/build-locally.py b/build-locally.py
index d78427b..6788aea 100755
--- a/build-locally.py
+++ b/build-locally.py
@@ -1,8 +1,11 @@
-#!/usr/bin/env python3
+#!/bin/sh
+"""exec" "python3" "$0" "$@" #"""  # fmt: off # fmt: on
 #
 # This file has been generated by conda-smithy in order to build the recipe
 # locally.
 #
+# The line above this comment is a bash / sh / zsh guard
+# to stop people from running it with the wrong interpreter
 import glob
 import os
 import platform
diff --git a/recipe/build.sh b/recipe/build.sh
index 72a6bea..be8a3ee 100644
--- 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
index a1869e1..4ed9819 100644
--- 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