diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 79 | ||||
| -rw-r--r-- | use hasParamAttr instead of hasAttribute.patch | 13 |
3 files changed, 64 insertions, 54 deletions
@@ -1,26 +1,22 @@ pkgbase = lib32-mesa-git pkgdesc = an open-source implementation of the OpenGL specification, git version - pkgver = 21.3.0_devel.144763.3c18e69078a + pkgver = 24.0.0_devel.179925.0e481bf4632.d41d8cd pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 license = custom makedepends = python-mako makedepends = lib32-libxml2 - makedepends = lib32-libx11 makedepends = xorgproto - makedepends = lib32-gcc-libs makedepends = lib32-libvdpau - makedepends = lib32-libelf makedepends = git - makedepends = mesa-git makedepends = lib32-libglvnd makedepends = wayland-protocols - makedepends = lib32-wayland makedepends = meson makedepends = lib32-libva makedepends = lib32-libxrandr - makedepends = lib32-llvm=12.0.1 + makedepends = python-packaging + makedepends = lib32-llvm=17.0.6 depends = mesa-git depends = lib32-gcc-libs depends = lib32-libdrm @@ -34,31 +30,39 @@ pkgbase = lib32-mesa-git depends = glslang depends = lib32-vulkan-icd-loader depends = lib32-zstd - depends = lib32-llvm-libs=12.0.1 + depends = lib32-libxcb + depends = lib32-libxfixes + depends = lib32-expat + depends = lib32-libxext + depends = lib32-libx11 + depends = lib32-zlib + depends = lib32-glibc + depends = lib32-llvm-libs=17.0.6 optdepends = opengl-man-pages: for the OpenGL API man pages provides = lib32-mesa provides = lib32-vulkan-intel provides = lib32-vulkan-radeon + provides = lib32-vulkan-mesa-layers provides = lib32-libva-mesa-driver provides = lib32-mesa-vdpau + provides = lib32-mesa-libgl provides = lib32-opengl-driver provides = lib32-vulkan-driver conflicts = lib32-mesa conflicts = lib32-vulkan-intel conflicts = lib32-vulkan-radeon + conflicts = lib32-vulkan-mesa-layers conflicts = lib32-libva-mesa-driver conflicts = lib32-mesa-vdpau + conflicts = lib32-mesa-libgl source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main source = LICENSE source = llvm32.native - source = use hasParamAttr instead of hasAttribute.patch md5sums = SKIP md5sums = 5c65a0fe315dd347e09b1f2826a1df5a md5sums = 6b4a19068a323d7f90a3d3cd315ed1f9 - md5sums = 5fb1d94f0714863855e0c3d328f02ce4 sha512sums = SKIP sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2 sha512sums = c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe - sha512sums = 4d46d93401efde3be3d879dfb92e3d79453788a87c326968901b1702fd2ba7bda155950b9ce2958320bb0dd6f89b71573610c9f75f809fb5296b9d1355fd1e75 pkgname = lib32-mesa-git @@ -1,5 +1,5 @@ -# Maintainer: Lone_Wolf <lone_wolf@klaas-de-kat.nl> # Maintainer: Reza Jahanbakhshi <reza.jahanbakhshi at gmail dot com +# Contributor: Lone_Wolf <lone_wolf@klaas-de-kat.nl> # Contributor: Armin K. <krejzi at email dot com> # Contributor: Kristian Klausen <klausenbusk@hotmail.com> # Contributor: Egon Ashrafinia <e.ashrafinia@gmail.com> @@ -12,33 +12,32 @@ pkgname=lib32-mesa-git pkgdesc="an open-source implementation of the OpenGL specification, git version" -pkgver=21.3.0_devel.144763.3c18e69078a +pkgver=24.0.0_devel.179925.0e481bf4632.d41d8cd pkgrel=1 arch=('x86_64') -makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto' - 'lib32-gcc-libs' 'lib32-libvdpau' 'lib32-libelf' 'git' 'mesa-git' 'lib32-libglvnd' - 'wayland-protocols' 'lib32-wayland' 'meson' 'lib32-libva' 'lib32-libxrandr') -depends=('mesa-git' 'lib32-gcc-libs' 'lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' - 'lib32-libelf' 'lib32-libunwind' 'lib32-lm_sensors' 'glslang' 'lib32-vulkan-icd-loader' 'lib32-zstd') +makedepends=('python-mako' 'lib32-libxml2' 'xorgproto' + 'lib32-libvdpau' 'git' 'lib32-libglvnd' 'wayland-protocols' + 'meson' 'lib32-libva' 'lib32-libxrandr' 'python-packaging') +depends=('mesa-git' 'lib32-gcc-libs' 'lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' + 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-libelf' 'lib32-libunwind' + 'lib32-lm_sensors' 'glslang' 'lib32-vulkan-icd-loader' 'lib32-zstd' + 'lib32-libxcb' 'lib32-libxfixes' 'lib32-expat' 'lib32-libxext' 'lib32-libx11' + 'lib32-zlib' 'lib32-glibc' +) optdepends=('opengl-man-pages: for the OpenGL API man pages') -provides=('lib32-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-opengl-driver' 'lib32-vulkan-driver') -conflicts=('lib32-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau') +provides=('lib32-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-vulkan-mesa-layers' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa-libgl' 'lib32-opengl-driver' 'lib32-vulkan-driver') +conflicts=('lib32-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-vulkan-mesa-layers' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa-libgl') url="https://www.mesa3d.org" license=('custom') source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main' - 'LICENSE' - 'llvm32.native' - "use hasParamAttr instead of hasAttribute.patch" -) - + 'LICENSE' + 'llvm32.native') md5sums=('SKIP' '5c65a0fe315dd347e09b1f2826a1df5a' - '6b4a19068a323d7f90a3d3cd315ed1f9' - '5fb1d94f0714863855e0c3d328f02ce4') + '6b4a19068a323d7f90a3d3cd315ed1f9') sha512sums=('SKIP' '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2' - 'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe' - '4d46d93401efde3be3d879dfb92e3d79453788a87c326968901b1702fd2ba7bda155950b9ce2958320bb0dd6f89b71573610c9f75f809fb5296b9d1355fd1e75') + 'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe') # NINJAFLAGS is an env var used to pass commandline options to ninja # NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it. @@ -77,8 +76,8 @@ case $MESA_WHICH_LLVM in ;; 4) # extra/llvm - makedepends+=(lib32-llvm=12.0.1) - depends+=(lib32-llvm-libs=12.0.1) + makedepends+=(lib32-llvm=17.0.6) + depends+=(lib32-llvm-libs=17.0.6) ;; *) esac @@ -86,8 +85,20 @@ esac pkgver() { cd mesa - read -r _ver <VERSION - echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD) + local _ver + _ver=$(<VERSION) + + local _patchver + local _patchfile + for _patchfile in "${source[@]}"; do + _patchfile="${_patchfile%%::*}" + _patchfile="${_patchfile##*/}" + [[ $_patchfile = *.patch ]] || continue + _patchver="${_patchver}$(md5sum ${srcdir}/${_patchfile} | cut -c1-32)" + done + _patchver="$(echo -n $_patchver | md5sum | cut -c1-7)" + + echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD).${_patchver} } prepare() { @@ -96,27 +107,36 @@ prepare() { if [ -d _build ]; then rm -rf _build fi - patch --directory=mesa --forward --strip=1 --input="${srcdir}/use hasParamAttr instead of hasAttribute.patch" + + local _patchfile + for _patchfile in "${source[@]}"; do + _patchfile="${_patchfile%%::*}" + _patchfile="${_patchfile##*/}" + [[ $_patchfile = *.patch ]] || continue + echo "Applying patch $_patchfile..." + patch --directory=mesa --forward --strip=1 --input="${srcdir}/${_patchfile}" + done } build () { - export CC="gcc -m32" - export CXX="g++ -m32" + export CC="${CC:-gcc}" + export CXX="${CXX:-g++}" + CC="$CC -m32" + CXX="$CXX -m32" + export PKG_CONFIG=/usr/bin/i686-pc-linux-gnu-pkg-config meson setup mesa _build \ --native-file llvm32.native \ -D b_ndebug=true \ - -D b_lto=true \ -D buildtype=plain \ --wrap-mode=nofallback \ -D prefix=/usr \ -D sysconfdir=/etc \ --libdir=/usr/lib32 \ -D platforms=x11,wayland \ - -D dri-drivers=i915,i965,r200,r100,nouveau \ -D gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,iris,zink,crocus \ - -D vulkan-drivers=amd,intel,swrast,virtio-experimental \ + -D vulkan-drivers=amd,intel,swrast,virtio,intel_hasvk \ -D dri3=enabled \ -D egl=enabled \ -D gallium-extra-hud=true \ @@ -127,7 +147,6 @@ build () { -D gallium-va=enabled \ -D gallium-vdpau=enabled \ -D gallium-xa=enabled \ - -D gallium-xvmc=disabled \ -D gbm=enabled \ -D gles1=disabled \ -D gles2=enabled \ @@ -143,7 +162,7 @@ build () { -D zstd=enabled \ -D microsoft-clc=disabled - meson configure _build + meson configure --no-pager _build ninja $NINJAFLAGS -C _build } diff --git a/use hasParamAttr instead of hasAttribute.patch b/use hasParamAttr instead of hasAttribute.patch deleted file mode 100644 index b9e64f5fb0c7..000000000000 --- a/use hasParamAttr instead of hasAttribute.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/gallium/frontends/clover/llvm/codegen/common.cpp -+++ b/src/gallium/frontends/clover/llvm/codegen/common.cpp -@@ -233,8 +233,8 @@ namespace { - } - - } else { -- const bool needs_sign_ext = f.getAttributes().hasAttribute( -- arg.getArgNo() + 1, ::llvm::Attribute::SExt); -+ const bool needs_sign_ext = f.getAttributes().hasParamAttr( -+ arg.getArgNo(), ::llvm::Attribute::SExt); - - args.emplace_back(module::argument::scalar, arg_api_size, - target_size, target_align, |