commit 88e0c1a985d558a7b0cc2c78371b76a65ef58916 Author: Tim Biermann <tbier@posteo.de> Date: Fri Sep 29 20:51:55 2023 +0200 mesa-32: 23.1.8 -> 23.2.1 diff --git a/mesa-32/.footprint b/mesa-32/.footprint index 56aa4f5..a80a4c3 100644 --- a/mesa-32/.footprint +++ b/mesa-32/.footprint @@ -2,6 +2,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ drwxr-xr-x root/root usr/lib32/dri/ -rwxr-xr-x root/root usr/lib32/dri/crocus_dri.so +-rwxr-xr-x root/root usr/lib32/dri/i915_dri.so -rwxr-xr-x root/root usr/lib32/dri/iris_dri.so -rwxr-xr-x root/root usr/lib32/dri/kms_swrast_dri.so -rwxr-xr-x root/root usr/lib32/dri/nouveau_dri.so @@ -21,17 +22,12 @@ lrwxrwxrwx root/root usr/lib32/libGLX_mesa.so.0 -> libGLX_mesa.so.0.0.0 lrwxrwxrwx root/root usr/lib32/libOSMesa.so -> libOSMesa.so.8 lrwxrwxrwx root/root usr/lib32/libOSMesa.so.8 -> libOSMesa.so.8.0.0 -rwxr-xr-x root/root usr/lib32/libOSMesa.so.8.0.0 --rwxr-xr-x root/root usr/lib32/libVkLayer_INTEL_nullhw.so --rwxr-xr-x root/root usr/lib32/libVkLayer_MESA_device_select.so --rwxr-xr-x root/root usr/lib32/libVkLayer_MESA_overlay.so lrwxrwxrwx root/root usr/lib32/libgbm.so -> libgbm.so.1 lrwxrwxrwx root/root usr/lib32/libgbm.so.1 -> libgbm.so.1.0.0 -rwxr-xr-x root/root usr/lib32/libgbm.so.1.0.0 lrwxrwxrwx root/root usr/lib32/libglapi.so -> libglapi.so.0 lrwxrwxrwx root/root usr/lib32/libglapi.so.0 -> libglapi.so.0.0.0 -rwxr-xr-x root/root usr/lib32/libglapi.so.0.0.0 --rwxr-xr-x root/root usr/lib32/libvulkan_intel.so --rwxr-xr-x root/root usr/lib32/libvulkan_radeon.so lrwxrwxrwx root/root usr/lib32/libxatracker.so -> libxatracker.so.2 lrwxrwxrwx root/root usr/lib32/libxatracker.so.2 -> libxatracker.so.2.5.0 -rwxr-xr-x root/root usr/lib32/libxatracker.so.2.5.0 @@ -41,7 +37,3 @@ drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/osmesa.pc -rw-r--r-- root/root usr/lib32/pkgconfig/xatracker.pc drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/vulkan/ -drwxr-xr-x root/root usr/share/vulkan/icd.d/ --rw-r--r-- root/root usr/share/vulkan/icd.d/intel_icd.i686.json --rw-r--r-- root/root usr/share/vulkan/icd.d/radeon_icd.i686.json diff --git a/mesa-32/.signature b/mesa-32/.signature index 26aee82..bca81f3 100644 --- a/mesa-32/.signature +++ b/mesa-32/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXUUSEPzbrZN855LwiIgF7+1d+2V6FycpQjxvfazn1LSYx6W/i0JbO4hu+FTniCaAE+5sUOEi54GjRlus68MRRQE= -SHA256 (Pkgfile) = bbd238683a961336d9bc032d59206e65e22b31e6a425f1d6a7b782a49e36bc55 -SHA256 (.footprint) = fbdef40c3595224bff86ac0e25b961dabed534962e9118c0009d8a69492acc01 -SHA256 (mesa-23.1.8.tar.xz) = 45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad +RWSwxGo/zH7eXQ+leYwc5YhMP12NksvnLxCtNA0j0AURiN6rijThsSXhlcKLDIKsk5LXtAlXDSVDFukJ2Hx0tcHa5Jg4/BANDw8= +SHA256 (Pkgfile) = 79e4c0fcca507b57668c3fc630e988e7f2401e987d685fedd1f41e32f0e98d77 +SHA256 (.footprint) = 10f639a17c2a2817d574133e81f436bf2712969b055d6049a0e07f275bbe8363 +SHA256 (mesa-23.2.1.tar.xz) = 64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc SHA256 (x86-linux-gnu) = 448877bbe3efe8bdfe6282c8e730fe8a8b6bf3c07f659e71b7292aceca22d8bd SHA256 (x86-linux-gnu-ccache) = 7b435803071fa5d72668eeae1a15c4e4dfca7847349de6f4ede0282b85faaac8 diff --git a/mesa-32/Pkgfile b/mesa-32/Pkgfile index b473782..e8837b1 100644 --- a/mesa-32/Pkgfile +++ b/mesa-32/Pkgfile @@ -2,27 +2,27 @@ # URL: https://www.mesa3d.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu # Depends on: elfutils-32 expat-32 libdrm-32 libglvnd-32 llvm-32 mesa xorg-libxdamage-32 xorg-libxrandr-32 xorg-libxshmfence-32 xorg-libxvmc-32 xorg-libxxf86vm-32 -# Optional: libva libvdpau-32 wayland-protocols +# Optional: glslang libva-32 libvdpau-32 wayland-protocols name=mesa-32 -version=23.1.8 -release=2 +version=23.2.1 +release=1 source=(https://archive.mesa3d.org/mesa-$version.tar.xz x86-linux-gnu x86-linux-gnu-ccache) build() { export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig:/usr/share/pkgconfig' - prt-get isinst vulkan-loader-32 && PKGMK_MESA_GALLIUM+='zink,' + prt-get isinst ccache && local _cross_file='x86-linux-gnu-ccache' || local _cross_file='x86-linux-gnu' + prt-get isinst glslang && PKGMK_MESA+=' -D vulkan-drivers=auto -D vulkan-layers=device-select,intel-nullhw,overlay' || PKGMK_MESA+=' -D vulkan-drivers=' + prt-get isinst libva-32 && PKGMK_MESA+=' -D gallium-va=enabled' || PKGMK_MESA+=' -D gallium-va=disabled' prt-get isinst libvdpau-32 && PKGMK_MESA+=' -D gallium-vdpau=enabled' || PKGMK_MESA+=' -D gallium-vdpau=disabled' + prt-get isinst vulkan-loader-32 && PKGMK_MESA_GALLIUM+='zink,' prt-get isinst wayland-protocols && PKGMK_MESA_PLATFORMS+='wayland' ## for future references #prt-get isinst xorg-libxdamage-32 xorg-libxrandr-32 xorg-libxshmfence-32 xorg-libxvmc-32 xorg-libxxf86vm-32 && PKGMK_MESA_PLATFORMS+=',x11' PKGMK_MESA_PLATFORMS+=',x11' - sed '/Scalar.h/d;/Utils.h/d' \ - -i mesa-$version/src/gallium/auxiliary/gallivm/lp_bld_init.c - meson setup mesa-$version build $PKGMK_MESA \ --cross-file=$SRC/$_cross_file \ --prefix=/usr \ @@ -31,6 +31,7 @@ build() { --buildtype=plain \ --wrap-mode nodownload \ -D b_lto=false \ + -D b_pie=true \ -D dri3=enabled \ -D egl=enabled \ -D llvm=enabled \ @@ -40,13 +41,10 @@ build() { -D gles2=enabled \ -D glx=dri \ -D osmesa=true \ - -D osmesa=true \ -D gallium-xa=enabled \ - -D gallium-drivers=${PKGMK_MESA_GALLIUM}crocus,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl \ + -D gallium-drivers=${PKGMK_MESA_GALLIUM}crocus,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,i915 \ -D platforms=${PKGMK_MESA_PLATFORMS#,} \ -D shared-glapi=enabled \ - -D vulkan-drivers=amd,intel \ - -D vulkan-layers=device-select,intel-nullhw,overlay \ -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \ -D glvnd=true