Made a few changes revolving around Mesa deps.

Mesa's new deps are now in BLFS, track their versions instead. Libclc was outdated, fixed a type in its xml file. Moved spirv-llvm-* from shareddeps/gfxapi/vk -> shareddeps/drivers.
This commit is contained in:
Zeckmathederg 2024-06-12 12:00:37 -06:00
parent 75bc12405a
commit fd7a66d604
6 changed files with 26 additions and 45 deletions

View File

@ -99,8 +99,12 @@ pciutils
hwdata
rust-version
cbindgen
rust-bindgen
mako
libdrm
spirv-llvm-translator
libclc
ply
mesa
xbitmaps
luit
@ -148,10 +152,6 @@ x7driver-wacom
GLFS_PACKAGES="
libglvnd
nvidia
rust-bindgen
spirv-llvm-translator
libclc
ply
seatd
steam
binutils
@ -169,7 +169,7 @@ check_blfs_simple_packages() {
grep -v dbus-glib | grep -v xdg-dbus | \
grep -v dbus-python | grep -v dbusmock | \
grep -v libdbusmenu | grep -v plasma | \
grep -v mingw-w64 | grep -v spirv-llvm
grep -v mingw-w64 | grep -v md5
if [[ "$?" = 0 ]]; then
echo " "
fi
@ -185,7 +185,7 @@ check_blfs_complex_packages() {
grep -v dbus-glib | grep -v xdg-dbus | \
grep -v dbus-python | grep -v dbusmock | \
grep -v libdbusmenu | grep -v plasma | \
grep -v mingw-w64 | grep -v spirv-llvm
grep -v mingw-w64 | grep -v spirv
if [[ "$?" = 0 ]]; then
echo " "
fi
@ -238,34 +238,6 @@ check_glfs_packages() {
rm glfsvarch-version.log
echo " "
fi
elif [[ $package == "spirv-llvm-translator" ]]; then
diff -Naur <(grep spirv-llvm-trans $GLFS_DIR/packages.ent | \
awk -F'"' '{print $2}') \
<(curl --silent "https://gitlab.archlinux.org/archlinux/packaging/packages/$package/-/raw/main/PKGBUILD" | \
grep "pkgver=" | sed 's/pkgver=//') | \
grep -v fd | grep -v '^@' > glfsvarch-version.log
if [[ "$?" != 0 ]]; then
rm glfsvarch-version.log
else
echo "$package:"
cat glfsvarch-version.log
rm glfsvarch-version.log
echo " "
fi
elif [[ $package == "ply" ]]; then
diff -Naur <(grep $package $GLFS_DIR/packages.ent | \
awk -F'"' '{print $2}') \
<(curl --silent "https://gitlab.archlinux.org/archlinux/packaging/packages/python-$package/-/raw/main/PKGBUILD" | \
grep "pkgver=" | sed 's/pkgver=//') | \
grep -v fd | grep -v '^@' > glfsvarch-version.log
if [[ "$?" != 0 ]]; then
rm glfsvarch-version.log
else
echo "$package:"
cat glfsvarch-version.log
rm glfsvarch-version.log
echo " "
fi
else
diff -Naur <(grep $package $GLFS_DIR/packages.ent | \
grep -v wine-major | \

View File

@ -39,6 +39,15 @@
</listitem>
-->
<listitem>
<para>June 12th, 2024</para>
<itemizedlist>
<listitem>
<para>[Zeckmathederg] - Made a few changes revolving around Mesa deps.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>June 10th, 2024</para>
<itemizedlist>

View File

@ -85,8 +85,8 @@
<!ENTITY rust-bindgen-version "0.69.4">
<!ENTITY mako-version "1.3.5">
<!ENTITY libdrm-version "2.4.121">
<!ENTITY spirv-llvm-trans-version "18.1.1">
<!ENTITY libclc-version "17.0.6">
<!ENTITY spirv-llvm-translator-version "18.1.1">
<!ENTITY libclc-version "18.1.7">
<!ENTITY ply-version "3.11">
<!ENTITY mesa-major-minor "24.1">
<!ENTITY mesa-version "&mesa-major-minor;.1">

View File

@ -21,7 +21,7 @@
<title>Introduction to libclc</title>
<para>
The <application>libclc</application> contains library requirements
The <application>libclc</application> package contains library requirements
of the OpenCL C programming language (provides header files but no
libraries itself).
</para>

View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % general-entities SYSTEM "../../../general.ent">
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!ENTITY spirv-llvm-translator-download-http "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v&spirv-llvm-trans-version;/v&spirv-llvm-trans-version;.tar.gz">
<!ENTITY spirv-llvm-translator-download-http "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v&spirv-llvm-translator-version;/v&spirv-llvm-translator-version;.tar.gz">
<!ENTITY spirv-llvm-translator-download-ftp " ">
]>
<sect1 id="spirv-llvm-translator" xreflabel="SPIRV-LLVM-Translator-&spirv-llvm-trans-version;">
<sect1 id="spirv-llvm-translator" xreflabel="SPIRV-LLVM-Translator-&spirv-llvm-translator-version;">
<?dbhtml filename="spirv-llvm-translator.html"?>
<title>SPIRV-LLVM-Translator-&spirv-llvm-trans-version;</title>
<title>SPIRV-LLVM-Translator-&spirv-llvm-translator-version;</title>
<indexterm zone="spirv-llvm-translator">
<primary sortas="a-spirv-llvm-translator">SPIRV-LLVM-Translator</primary>
@ -57,10 +57,10 @@
<note>
<para>
This tarball is <filename>v&spirv-llvm-trans-version;.tar.gz</filename>.
<filename>v&spirv-llvm-trans-version;.tar.gz</filename> will
This tarball is <filename>v&spirv-llvm-translator-version;.tar.gz</filename>.
<filename>v&spirv-llvm-translator-version;.tar.gz</filename> will
extract to the directory <filename class="directory">
SPIRV-LLVM-Translator-&spirv-llvm-trans-version;</filename>.
SPIRV-LLVM-Translator-&spirv-llvm-translator-version;</filename>.
</para>
</note>

View File

@ -96,7 +96,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="drivers/libva.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="drivers/libvdpau.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="drivers/libvdpau-va-gl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gfxapi/vk/spirv-llvm-translator.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="drivers/spirv-llvm-translator.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="drivers/libclc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="drivers/ply.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="drivers/mesa.xml"/>