[arch-commits] Commit in lib32-mesa/trunk (PKGBUILD crossfile.ini)
Jan Steffens
heftig at archlinux.org
Sat May 30 14:57:39 UTC 2020
Date: Saturday, May 30, 2020 @ 14:57:39
Author: heftig
Revision: 637431
20.1.0-4: bring closer to testing/mesa
Modified:
lib32-mesa/trunk/PKGBUILD
Deleted:
lib32-mesa/trunk/crossfile.ini
---------------+
PKGBUILD | 101 ++++++++++++++++++++++++++++++++++++++------------------
crossfile.ini | 2 -
2 files changed, 69 insertions(+), 34 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-30 14:38:00 UTC (rev 637430)
+++ PKGBUILD 2020-05-30 14:57:39 UTC (rev 637431)
@@ -1,36 +1,45 @@
# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
# Contributor: Jan de Groot <jgc at archlinux.org>
# Contributor: Andreas Radke <andyrtr at archlinux.org>
pkgbase=lib32-mesa
-pkgname=('lib32-opencl-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
+pkgname=('lib32-vulkan-mesa-layers' 'lib32-opencl-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
+pkgdesc="An open-source implementation of the OpenGL specification (32-bit)"
pkgver=20.1.0
-pkgrel=1
+pkgrel=4
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'xorgproto' 'lib32-libdrm'
- 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-libvdpau'
- 'lib32-libva' 'lib32-wayland' 'wayland-protocols' 'lib32-libglvnd' 'lib32-lm_sensors' 'lib32-libxrandr'
- 'clang' 'lib32-clang' 'libclc' 'lib32-zstd' 'meson')
-url="http://mesa3d.sourceforge.net"
+ 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libvdpau'
+ 'lib32-libva' 'lib32-wayland' 'wayland-protocols' 'lib32-zstd' 'lib32-libelf'
+ 'lib32-llvm' 'libclc' 'clang' 'lib32-clang' 'lib32-libglvnd' 'lib32-libunwind'
+ 'lib32-lm_sensors' 'lib32-libxrandr' 'glslang' 'meson')
+url="https://www.mesa3d.org/"
license=('custom')
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
- LICENSE
- crossfile.ini)
+ LICENSE)
sha512sums=('f49230d18febe1bfd7c6282ab95fc244530f5cef56df0f804d8bece8a70bafcb445b8b83df96ad1b4c5af022c4e39a71f19a8f7e47b1fb09ada2b1a1317ff3be'
'SKIP'
- 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
- 'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe')
+ 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
- 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>"
+ 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>
'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez Romero <jasuarez at igalia.com>
'71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan at pnwbakers.com>
'CC31EF29D32A6637889530F2481D0E9D964E5593') # Eric Engestrom <eric at engestrom.ch>
+prepare() {
+ cd mesa-$pkgver
+}
+
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+ cat >crossfile.ini <<END
+[binaries]
+llvm-config = '/usr/bin/llvm-config32'
+END
arch-meson mesa-$pkgver build \
--native-file crossfile.ini \
@@ -39,8 +48,10 @@
-D b_ndebug=true \
-D platforms=x11,wayland,drm,surfaceless \
-D dri-drivers=i915,i965,r100,r200,nouveau \
- -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris \
+ -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris \
-D vulkan-drivers=amd,intel \
+ -D vulkan-overlay-layer=true \
+ -D vulkan-device-select-layer=true \
-D swr-arches=avx,avx2 \
-D dri3=true \
-D egl=true \
@@ -57,7 +68,7 @@
-D gles2=true \
-D glvnd=true \
-D glx=dri \
- -D libunwind=false \
+ -D libunwind=true \
-D llvm=true \
-D lmsensors=true \
-D osmesa=gallium \
@@ -68,11 +79,11 @@
meson configure build
ninja -C build xmlpool-pot xmlpool-update-po xmlpool-gmo
- ninja -C build
+ meson compile -C build
# fake installation to be seperated into packages
# outside of fakeroot but mesa doesn't need to chown/mod
- DESTDIR="${srcdir}/fakeinstall" ninja -C build install
+ DESTDIR="${srcdir}/fakeinstall" meson install -C build
}
_install() {
@@ -85,9 +96,25 @@
done
}
+package_lib32-vulkan-mesa-layers() {
+ pkgdesc="Mesa's Vulkan layers (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libxcb' 'lib32-wayland' 'vulkan-mesa-layers')
+ conflicts=('lib32-vulkan-mesa-layer')
+ replaces=('lib32-vulkan-mesa-layer')
+
+ rm -rv fakeinstall/usr/share/vulkan/explicit_layer.d
+ _install fakeinstall/usr/lib32/libVkLayer_MESA_overlay.so
+ rm -rv fakeinstall/usr/bin/mesa-overlay-control.py
+
+ rm -rv fakeinstall/usr/share/vulkan/implicit_layer.d
+ _install fakeinstall/usr/lib32/libVkLayer_MESA_device_select.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
package_lib32-opencl-mesa() {
pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)"
- depends=('lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-clang' 'lib32-zstd')
+ depends=('lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-clang' 'lib32-zstd' 'opencl-mesa')
optdepends=('opencl-headers: headers necessary for OpenCL development')
provides=('lib32-opencl-driver')
@@ -100,11 +127,13 @@
package_lib32-vulkan-intel() {
pkgdesc="Intel's Vulkan mesa driver (32-bit)"
- depends=('lib32-wayland' 'lib32-libx11' 'lib32-libdrm' 'lib32-libxshmfence' 'lib32-zstd')
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libdrm' 'lib32-zstd')
+ optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers')
provides=('lib32-vulkan-driver')
_install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
_install fakeinstall/usr/lib32/libvulkan_intel.so
+ rm -rv fakeinstall/usr/include/vulkan/vulkan_intel.h
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
@@ -111,8 +140,9 @@
package_lib32-vulkan-radeon() {
pkgdesc="Radeon's Vulkan mesa driver (32-bit)"
- depends=('lib32-wayland' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-libdrm' 'lib32-libelf'
- 'lib32-libxshmfence' 'lib32-zstd')
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libelf' 'lib32-libdrm'
+ 'lib32-zstd' 'lib32-llvm-libs')
+ optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers')
provides=('lib32-vulkan-driver')
_install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
@@ -123,8 +153,8 @@
package_lib32-libva-mesa-driver() {
pkgdesc="VA-API implementation for gallium (32-bit)"
- depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf'
- 'lib32-zstd' 'lib32-libxshmfence')
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf'
+ 'lib32-libxshmfence' 'lib32-zstd')
_install fakeinstall/usr/lib32/dri/*_drv_video.so
@@ -133,8 +163,8 @@
package_lib32-mesa-vdpau() {
pkgdesc="Mesa VDPAU drivers (32-bit)"
- depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf'
- 'lib32-zstd' 'lib32-libxshmfence')
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf'
+ 'lib32-libxshmfence' 'lib32-zstd')
_install fakeinstall/usr/lib32/vdpau
@@ -142,22 +172,33 @@
}
package_lib32-mesa() {
- pkgdesc="An open-source implementation of the OpenGL specification (32-bit)"
- depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-lm_sensors'
- 'lib32-libelf' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libglvnd' 'lib32-zstd' 'mesa')
+ depends=('lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence'
+ 'lib32-libelf' 'lib32-libunwind' 'lib32-llvm-libs' 'lib32-lm_sensors' 'lib32-libglvnd'
+ 'lib32-zstd' 'mesa')
optdepends=('opengl-man-pages: for the OpenGL API man pages'
- 'lib32-mesa-vdpau: for accelerated video playback')
+ 'lib32-mesa-vdpau: for accelerated video playback'
+ 'lib32-libva-mesa-driver: for accelerated video playback')
provides=('lib32-mesa-libgl' 'lib32-opengl-driver')
conflicts=('lib32-mesa-libgl')
replaces=('lib32-mesa-libgl')
+ rm -rv fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
+ rm -rv fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
+
# ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
_install fakeinstall/usr/lib32/dri/*_dri.so
+ #_install fakeinstall/usr/lib32/bellagio
_install fakeinstall/usr/lib32/d3d
_install fakeinstall/usr/lib32/lib{gbm,glapi}.so*
_install fakeinstall/usr/lib32/libOSMesa.so*
_install fakeinstall/usr/lib32/libxatracker.so*
+ _install fakeinstall/usr/lib32/libswrAVX*.so*
+
+ # in vulkan-headers
+ rm -rv fakeinstall/usr/include/vulkan
+
+ rm -rv fakeinstall/usr/include
_install fakeinstall/usr/lib32/pkgconfig
# libglvnd support
@@ -167,10 +208,6 @@
# indirect rendering
ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
- rm -rv fakeinstall/usr/share/drirc.d
- rm -rv fakeinstall/usr/include
- rm -rv fakeinstall/usr/share
-
# make sure there are no files left to install
find fakeinstall -depth -print0 | xargs -0 rmdir
Deleted: crossfile.ini
===================================================================
--- crossfile.ini 2020-05-30 14:38:00 UTC (rev 637430)
+++ crossfile.ini 2020-05-30 14:57:39 UTC (rev 637431)
@@ -1,2 +0,0 @@
-[binaries]
-llvm-config = '/usr/bin/llvm-config32'
More information about the arch-commits
mailing list