From d7a99cc22ad2cb9aede1d33aced039c5b94f2d49 Mon Sep 17 00:00:00 2001 From: HadetTheUndying Date: Wed, 16 Dec 2020 20:55:08 -0600 Subject: [PATCH 1/3] mesa: update to 20.3.1. - removed drm and surfaceless from platforms since they're determined automatically now. - removed wayland build option - fix vulkan driver search path; see 87d28506e10bf6f89dbf8c1250bde0fcb3e8eba4. - remove special casing for drive location in i686. Closes: #27214 [via git-merge-pr] --- srcpkgs/mesa/template | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 5bc5a611f38..dd6cb063d9b 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,19 +1,19 @@ # Template file for 'mesa' pkgname=mesa -version=20.2.3 +version=20.3.1 revision=1 wrksrc="mesa-${version}" build_style=meson configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true -Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true - -Dlmsensors=true -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless + -Dlmsensors=true -Dplatforms=x11,wayland -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14" hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang gzip - $(vopt_if wayland 'wayland-protocols wayland-devel')" + wayland-protocols wayland-devel" makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel - $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel + wayland-devel wayland-protocols llvm libsensors-devel libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel libarchive-devel" depends="libglvnd" @@ -23,10 +23,11 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://docs.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=ae1b240e11531df528d14dc214d2dc4d2b4f2e835c6230ba0b492b171eceb82b +checksum=af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f -build_options="wayland" -build_options_default="wayland" +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + configure_args+=" -Duse-elf-tls=false" +fi # Set subpackages manually to set proper rdeps in 32bit pkgs. subpackages="libglapi libgbm libOSMesa" @@ -166,14 +167,6 @@ case "$XBPS_TARGET_MACHINE" in ppc*) configure_args+=" -Dpower8=false" ;; esac -case "$XBPS_TARGET_MACHINE" in - i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/dri";; -esac - -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - configure_args+=" -Duse-elf-tls=false" -fi - post_configure() { if [ "$CROSS_BUILD" ]; then find -iname "*.ninja" -exec sed -i "{}" \ @@ -185,14 +178,12 @@ post_configure() { } post_install() { + local arch=${XBPS_TARGET_MACHINE%-*} vlicense docs/license.rst - case "$XBPS_TARGET_MACHINE" in - i686*) - vsed -e 's#/usr/lib/#/usr/lib32/#g' \ - -i ${DESTDIR}/usr/share/vulkan/icd.d/radeon_icd.i686.json \ - -i ${DESTDIR}/usr/share/vulkan/icd.d/intel_icd.i686.json - ;; - esac + # XXX: for the 'multiarch' setup to work, these files should go + # in /usr/lib*; vulkan-loader needs to be fixed for it + vsed -e "s#/usr/lib/#/usr/lib${XBPS_TARGET_WORDSIZE}/#g" \ + -i ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json } libglapi_package() { From 2612f23eef64816ec7cde354f62a74b0425eb320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 20 Dec 2020 23:26:21 -0300 Subject: [PATCH 2/3] xorg-server: revbump for location of dri drivers. The previous commit moves dri drivers to /usr/lib${wordsize}/dri, instead of simply /usr/lib/dri. It is necessary to rebuild xorg for correctness when accessing these drivers. --- srcpkgs/xorg-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 56607094648..a6a7ca7f4d7 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=1.20.10 -revision=1 +revision=2 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb From 7baec52d8af0da625a348f8892824fcb7849a494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 18:35:11 -0300 Subject: [PATCH 3/3] libva: revbump for driver location. Correct driver location is now taken care of by 87d28506e10bf6f89dbf8c1250bde0fcb3e8eba4. --- srcpkgs/libva/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template index 1b57fdead1d..1514b24c6c2 100644 --- a/srcpkgs/libva/template +++ b/srcpkgs/libva/template @@ -1,7 +1,7 @@ # Template file for 'libva' pkgname=libva version=2.9.1 -revision=1 +revision=2 build_style=meson configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)" hostmakedepends="pkg-config wayland-devel" @@ -18,10 +18,6 @@ checksum=4e8640f65ad659332c5d24b7715703c95e820083ee11126c9cd051d418e3d9e0 build_options="wayland" build_options_default="wayland" -case "$XBPS_TARGET_MACHINE" in - i686*) configure_args+=" -Ddriverdir=/usr/lib32/dri";; -esac - post_install() { vlicense COPYING }