From 49e955a38431430565115be7d4fb64dd7936e6d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
Date: Wed, 13 Nov 2024 11:13:45 +0100
Subject: [PATCH] Don't build python3-pyyaml

Resolves: https://issues.redhat.com/browse/RHEL-64944
---
 .gitignore |  1 -
 mesa.spec  | 32 ++------------------------------
 sources    |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index f902c0c..e450376 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ results_mesa/
 mesa-*/
 /libclc-*.tar.xz
 /spirv-llvm-translator-*.tar.gz
-/python3-pyyaml-*.tar.gz
diff --git a/mesa.spec b/mesa.spec
index 138384f..fe7fa60 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -99,18 +99,8 @@ BuildRequires:  spirv-headers-devel
 BuildRequires:  spirv-tools-devel
 BuildRequires:  zlib-devel
 
-# python3-pyyaml is not available in RHEL
-%global pyyaml_version 6.0.1
-Source5: https://github.com/yaml/pyyaml/archive/%{pyyaml_version}.tar.gz#/python3-pyyaml-%{pyyaml_version}.tar.gz
-BuildRequires:  libyaml-devel
-BuildRequires:  python3-cython
-
-# Mesa patches (< 100)
 Patch10:        gnome-shell-glthread-disable.patch
 
-# python3-pyyaml patches (>= 500 && < 600)
-Patch500:       0001-pyyaml-731.patch
-
 BuildRequires:  meson
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -199,8 +189,7 @@ BuildRequires:  python3-mako
 BuildRequires:  python3-ply
 %endif
 BuildRequires:  python3-pycparser
-# Build our own version
-# BuildRequires:  python3-pyyaml
+BuildRequires:  python3-pyyaml
 BuildRequires:  vulkan-headers
 BuildRequires:  glslang
 %if 0%{?with_vulkan_hw}
@@ -410,8 +399,7 @@ Obsoletes:      mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 The drivers with support for the Vulkan API.
 
 %prep
-%autosetup -n %{name}-%{ver} -N
-%autopatch -p1 -M 99
+%autosetup -n %{name}-%{ver} -p1
 cp %{SOURCE1} docs/
 
 # Extract libclc
@@ -420,15 +408,6 @@ tar -xvf %{SOURCE3}
 # Extract spirv-llvm-translator
 tar -xvf %{SOURCE4}
 
-# Extract python3-pyyaml
-tar -xvf %{SOURCE5}
-cd pyyaml-%{pyyaml_version}
-%autopatch -p1 -m 500 -M 599
-sed -i 's/Cython<3.0/Cython/' pyproject.toml
-chmod a-x examples/yaml-highlight/yaml_hl.py
-rm -rf ext/_yaml.c
-cd -
-
 %build
 # Build spirv-llvm-translator
 cd SPIRV-LLVM-Translator-%{spirv_llvm_trans_commit}
@@ -467,13 +446,6 @@ export CFLAGS="%{build_cflags} -D__extern_always_inline=inline"
 cd -
 sed -e "s!libexecdir=!libexecdir=\/%{buildroot}!" -i %{buildroot}%{_libdir}/pkgconfig/libclc.pc
 
-# Build python3-pyyaml
-cd pyyaml-%{pyyaml_version}
-%py3_build
-%py3_install
-cd -
-export PYTHONPATH=%{buildroot}%{_libdir}/python%{python3_version}/site-packages
-
 # ensure standard Rust compiler flags are set
 export RUSTFLAGS="%build_rustflags"
 
diff --git a/sources b/sources
index 051ecdc..de54fa7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (libclc-19.1.1.src.tar.xz) = 41ba80e2ed8f874d79c40cfbb1de89ad9e1ecc3709519e697617c14bc2583b2f8cdb8ca20bd2095b436afcc69144a6d88d4334de1e152d78ef3a19ec14c0733d
 SHA512 (mesa-24.2.6.tar.xz) = 830a40d38200ff8b2a6bd949e1ac3bf4edc887a10d9aa92285007d138079e1fafb3568f658e777e7894e95b5ce75d2bd6836b0473fa70d32270005e482b1a2da
-SHA512 (python3-pyyaml-6.0.1.tar.gz) = 1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0
 SHA512 (spirv-llvm-translator-90a9764.tar.gz) = c0be7326fa76927f9900a9d91ced0035aeee66cdab35baa9c708b27c5d5e423f4819f148d17c3b7b812d1e8991e1057d71d52c22df2de37efdd72f1c20dcf05e