From 75f446ca76b4df04404e1870bd7d48c1b5aaa9d4 Mon Sep 17 00:00:00 2001 From: HadetTheUndying Date: Wed, 16 Dec 2020 20:55:08 -0600 Subject: [PATCH 1/2] mesa: update to 20.3.1. - removed drm and surfaceless from platforms since they're determined automatically now. - fix driver search path to use /usr/lib${wordsize}; see https://github.com/void-linux/void-packages/pull/27269 - remove "(transitional dummy package)" from description for subpacakges that didn't depend only on mesa-dri. Closes: #27214 [via git-merge-pr] --- srcpkgs/mesa/template | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 5bc5a611f38..b698951c7d8 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,19 +1,20 @@ # 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 - -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14" + -Dlmsensors=true -Dplatforms=x11,wayland + -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14 + -Ddri-drivers-path=/usr/lib${XBPS_TARGET_WORDSIZE}/dri" 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 +24,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 +168,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 "{}" \ @@ -337,7 +331,7 @@ mesa-vulkan-overlay-layer_package() { mesa-ati-dri_package() { build_style=meta lib32mode=full - short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)" + short_desc="Mesa DRI drivers for ATI GPUs" depends="mesa-dri mesa-vulkan-radeon" if [ "$_have_hwdec" ]; then depends+=" mesa-vaapi mesa-vdpau mesa-XvMC" @@ -361,7 +355,7 @@ mesa-freedreno-dri_package() { mesa-intel-dri_package() { build_style=meta lib32mode=full - short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)" + short_desc="Mesa DRI drivers for Intel GPUs" depends="mesa-dri mesa-vulkan-intel" } @@ -382,7 +376,7 @@ mesa-lima-dri_package() { mesa-nouveau-dri_package() { build_style=meta lib32mode=full - short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)" + short_desc="Mesa DRI drivers for NVIDIA GPUs" depends="mesa-dri" if [ "$_have_hwdec" ]; then depends+=" mesa-vaapi mesa-vdpau mesa-XvMC" From 21d24cad773c1b92a1babf16c3e5f624143593ac 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/2] 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