diff --git a/mesa/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch b/mesa/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch index 11efcb8..19c21a0 100644 --- a/mesa/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch +++ b/mesa/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch @@ -23,10 +23,10 @@ Signed-off-by: Lionel Landwerlin 1 file changed, 5 insertions(+) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c -index 240630d84124..77822ec89404 100644 +index 1aa997f2ade2..2e9979c8f63e 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c -@@ -5917,6 +5917,11 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer, +@@ -5955,6 +5955,11 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer, } #endif diff --git a/mesa/0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch b/mesa/0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch index 4e30757..ef12fda 100644 --- a/mesa/0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch +++ b/mesa/0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch @@ -18,10 +18,10 @@ Signed-off-by: Lionel Landwerlin 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp -index 0f282dcd345f..165d8b33b677 100644 +index 624454676031..061eb7d603bb 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp -@@ -4421,7 +4421,7 @@ brw_fb_write_msg_control(const fs_inst *inst, +@@ -4439,7 +4439,7 @@ brw_fb_write_msg_control(const fs_inst *inst, return mctl; } @@ -31,10 +31,10 @@ index 0f282dcd345f..165d8b33b677 100644 */ void diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp -index 255ce7594811..e99c7b8ab844 100644 +index 1ff064d342ae..90cb00daeb9b 100644 --- a/src/intel/compiler/brw_lower_logical_sends.cpp +++ b/src/intel/compiler/brw_lower_logical_sends.cpp -@@ -1112,30 +1112,42 @@ lower_sampler_logical_send_gfx7(const fs_builder &bld, fs_inst *inst, opcode op, +@@ -1117,30 +1117,42 @@ lower_sampler_logical_send_gfx7(const fs_builder &bld, fs_inst *inst, opcode op, inst->src[1] = brw_imm_ud(0); } else if (surface_handle.file != BAD_FILE) { /* Bindless surface */ diff --git a/mesa/PKGBUILD b/mesa/PKGBUILD index 10f2515..553fd4f 100644 --- a/mesa/PKGBUILD +++ b/mesa/PKGBUILD @@ -7,20 +7,19 @@ pkgbase=mesa pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') -pkgdesc="An open-source implementation of the OpenGL specification w/o zstd" -pkgver=22.2.3 -pkgrel=02 +pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd" +pkgver=22.3.0 +pkgrel=03 arch=('x86_64') #options=('debug' '!lto') # uncomment this if you want the debug package built options=('!lto') - makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr' 'valgrind' 'glslang' 'vulkan-icd-loader' 'directx-headers' 'cmake' 'meson') +makedepends+=('rust' 'rust-bindgen' 'spirv-tools' 'spirv-llvm-translator') # rusticl dependencies url="https://www.mesa3d.org/" source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} -# 0001-iris-implement-inter-context-busy-tracking.patch 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch LICENSE) @@ -28,15 +27,11 @@ source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} prepare() { cd mesa-$pkgver -# # FS#73501 -# patch -Np1 -i ../0001-iris-implement-inter-context-busy-tracking.patch - # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7111 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247 # https://github.com/HansKristian-Work/vkd3d-proton/issues/1200 patch -Np1 -i ../0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch patch -Np1 -i ../0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch - } build() { @@ -60,7 +55,8 @@ build() { -D gallium-va=enabled \ -D gallium-vdpau=enabled \ -D gallium-xa=enabled \ - -D gallium-xvmc=disabled \ + -D gallium-rusticl=true \ + -D rust_std=2021 \ -D gbm=enabled \ -D gles1=disabled \ -D gles2=enabled \ @@ -112,7 +108,7 @@ package_vulkan-mesa-layers() { } package_opencl-mesa() { - pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" + pkgdesc="OpenCL support with clover and rusticl for mesa drivers" depends=('libdrm' 'libclc' 'clang' 'expat') optdepends=('opencl-headers: headers necessary for OpenCL development') provides=('opencl-driver') @@ -125,7 +121,7 @@ package_opencl-mesa() { } package_vulkan-intel() { - pkgdesc="Intel's Vulkan mesa driver" + pkgdesc="Intel's Vulkan mesa driver w/o systemd or zstd" depends=('wayland' 'libx11' 'libxshmfence' 'libdrm') optdepends=('vulkan-mesa-layers: additional vulkan layers') provides=('vulkan-driver') @@ -137,7 +133,7 @@ package_vulkan-intel() { } package_vulkan-radeon() { - pkgdesc="Radeon's Vulkan mesa driver" + pkgdesc="Radeon's Vulkan mesa driver w/o systemd" depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') optdepends=('vulkan-mesa-layers: additional vulkan layers') provides=('vulkan-driver') @@ -150,7 +146,7 @@ package_vulkan-radeon() { } package_vulkan-swrast() { - pkgdesc="Vulkan software rasteriser driver" + pkgdesc="Vulkan software rasteriser driver w/o systemd or zstd " depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'llvm-libs' 'libunwind') optdepends=('vulkan-mesa-layers: additional vulkan layers') conflicts=('vulkan-mesa') @@ -234,11 +230,15 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom -sha256sums=(ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6 # mesa-22.2.3.tar.xz - 54c6bb19406fd21781a26ee4927abea08a08390410075195795a92040be415f7 # mesa-22.2.3.tar.xz.sig - 3563afc26125e79cc1943c518b47d4f534861171808fc1fd5a1564fced36ec2c # 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch - d0c6401daff346054f1b4dd6d88e82b83a236fa235983ca54085c90948f0c1be # 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch +sha256sums=(644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 # mesa-22.3.0.tar.xz + b93a48881d9528eae80620d9e72bf436a4a51110735ed78bbace590c36ff786e # mesa-22.3.0.tar.xz.sig + 2c780f682710be86b9ff8aaab770be7edaa7bc4c3a13ba7b1ef5afcf2b5dc62b # 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch + 93c62083bda9a37ea582b96e1872878bff6efade95f724d5cf4e1964ee14d0bf # 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch 7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE - +sha512sums=('bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da' + 'SKIP' + '4ff7c359f08aedb1fb6eb2c6bb34bafa399edfa7916cd6cce7844bb38795e84c0265324e3fc7d37237d4824f029cb04da176bcf476785fd2e35a8b0ce4f8a394' + '5dd0cb8affa9cfe6e7d94f59b8e23727036fd8ab76938321f8d266315f30611584da6f6277fe2aa920130483302adab5e57e2bc08f1bd3c62ea57b3e4b007305' + 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7') diff --git a/mesa/deps b/mesa/deps index 09179b6..1edfc9b 100644 --- a/mesa/deps +++ b/mesa/deps @@ -28,4 +28,9 @@ byacc polly libmicrohttpd +rust +rust-bindgen +spirv-tools +spirv-llvm-translator + diff --git a/mesa/key b/mesa/key index 4f9bdef..7f663c2 100644 --- a/mesa/key +++ b/mesa/key @@ -1 +1 @@ -gpg -v --recv-key 4C95FAAB3EB073EC +gpg -v --recv-key 8D8E31AFC32428A6 diff --git a/mesa/time b/mesa/time index 69d7eb8..470197a 100644 --- a/mesa/time +++ b/mesa/time @@ -1,36 +1,6 @@ -22.1.2 - -real 28m46.262s -user 99m9.888s -sys 3m14.831s -22.1.3 - -real 38m28.209s -user 145m18.135s -sys 4m10.599s - - -mesa 22.1.4-01 -real 36m51.129s -user 136m24.239s -sys 3m47.587s - -mesa 22.1.5-01 -real 35m39.106s -user 134m11.846s -sys 3m50.215s - -22.2.0-02 - -real 15m2.686s -user 53m29.028s -sys 2m19.544s - - mesa 22.2.2-01 - -real 14m9.349s -user 50m19.615s -sys 2m30.148s +real 16m58.224s +user 55m1.777s +sys 2m44.461s diff --git a/meson/0001-Skip-broken-tests.patch b/meson/0001-Skip-broken-tests.patch index c0026da..49bf295 100644 --- a/meson/0001-Skip-broken-tests.patch +++ b/meson/0001-Skip-broken-tests.patch @@ -22,10 +22,10 @@ index 193ad184b637..e94ba68ac30f 100644 dep = dependency('ZLIB', version : '>=1.2', method : 'cmake') diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py -index 6c4012d1a056..59ed1a750b94 100644 +index 25b392f28e47..db8119f63719 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py -@@ -357,6 +357,7 @@ class LinuxlikeTests(BasePlatformTests): +@@ -359,6 +359,7 @@ class LinuxlikeTests(BasePlatformTests): raise SkipTest('asan not available on Cygwin') if is_openbsd(): raise SkipTest('-fsanitize=address is not supported on OpenBSD') @@ -33,7 +33,7 @@ index 6c4012d1a056..59ed1a750b94 100644 testdir = os.path.join(self.framework_test_dir, '7 gnome') self.init(testdir, extra_args=['-Db_sanitize=address', '-Db_lundef=false']) -@@ -1012,6 +1013,7 @@ class LinuxlikeTests(BasePlatformTests): +@@ -1014,6 +1015,7 @@ class LinuxlikeTests(BasePlatformTests): raise SkipTest('asan not available on Cygwin') if is_openbsd(): raise SkipTest('-fsanitize=address is not supported on OpenBSD') diff --git a/meson/PKGBUILD b/meson/PKGBUILD index 3bbe87f..4c91e18 100644 --- a/meson/PKGBUILD +++ b/meson/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=meson -pkgver=0.64.0 +pkgver=0.64.1 pkgrel=01 pkgdesc='High productivity build system' url='https://mesonbuild.com/' @@ -81,9 +81,9 @@ license=('Apache') validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen -sha256sums=(c5e27e091c2a35b9049e152a6535045ebbd057253aeb67856de6ecbb7b917bab # meson-0.64.0.tar.gz - f797c06451fc989e5298ac54ae17f77e278548627c5474f2a51c0472ffe8c43e # meson-0.64.0.tar.gz.asc - 8b204bf6789dff056c01ce8b57ac2788708d4bf1b47c760e812ffec577946d35 # 0001-Skip-broken-tests.patch +sha256sums=(3a8e030c2334f782085f81627062cc6d4a6771edf31e055ffe374f9e6b089ab9 # meson-0.64.1.tar.gz + cf4fad17a8f04afa394ed76d1a0bd98e80c653813092ed25da3e6031fa04bcfd # meson-0.64.1.tar.gz.asc + 6aefe15d08a25826ba2578d18e02a59520065e52e8475c1919f258365d92731d # 0001-Skip-broken-tests.patch ac3387ed5759cc512b1f2a4e5b3dd940274b02f943a7e5d644792ee714e6b95e # arch-meson b2aeae2787cf8f3ffb8778ee7f1a434895b1512bc0bdb33528c4cb2aeb067904) # jobo-meson diff --git a/meson/PKGBUILD-arch b/meson/PKGBUILD-arch index 60359d5..37ab567 100644 --- a/meson/PKGBUILD-arch +++ b/meson/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Anatol Pomozov pkgname=meson -pkgver=0.64.0 +pkgver=0.64.1 pkgrel=1 pkgdesc='High productivity build system' url='https://mesonbuild.com/' @@ -19,9 +19,9 @@ checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' ' source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc} 0001-Skip-broken-tests.patch arch-meson) -sha512sums=('0656515e983d98350081dc7cd726bff4a83ed1e24d414c022ea804317f2ff86052b53bbbc36e00847541f2cbe19ebe4c87bb35a174bf6321864363512a4cf6b0' +sha512sums=('4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec' 'SKIP' - '521d662c9bbf8c4618f5f3d5f37ad206d61e222b5e29a6bb0df72ad4da3e4e2d14f60b6ea5fefeba501a06729b257cfe7450cb35946bf0cd7589558529591a4a' + '51b5d0b684a03ab884c6d94925bae7edc8544168100497251c36e85502428a0fe89e5512e067b24d983695ab3b468a8a504dfbe5d66c1c17579039bf329d3857' 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c') validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen diff --git a/meson/deps b/meson/deps index edaca28..4dc839e 100644 --- a/meson/deps +++ b/meson/deps @@ -51,6 +51,6 @@ libmicrohttpd libjpeg-turbo libxslt libglvnd - - at-spi2-core + + diff --git a/wayland-protocols/PKGBUILD b/wayland-protocols/PKGBUILD index 0a5c905..29944f0 100644 --- a/wayland-protocols/PKGBUILD +++ b/wayland-protocols/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=wayland-protocols -pkgver=1.30 +pkgver=1.31 pkgrel=01 pkgdesc='Specifications of extended Wayland protocols' arch=('any') @@ -50,7 +50,7 @@ license=('MIT') validpgpkeys=('8307C0A224BABDA1BABD0EB9A6EEEC9E0136164A' # Jonas Ådahl 'A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # Daniel Stone -sha256sums=(3c1498fb65fd2b80b0376d7e87cf215e6ae957b2ccdba5da45a448718831bc60 # wayland-protocols-1.30.tar.xz - f61d78f7292460b2e6d6a049cc4b3f9d6cd84e3125759eb12c33df7d6d236ef6) # wayland-protocols-1.30.tar.xz.sig +sha256sums=(a07fa722ed87676ec020d867714bc9a2f24c464da73912f39706eeef5219e238 # wayland-protocols-1.31.tar.xz + 3dd0c23e176f7a06a94d29a282ea616b623782b000af8242c769ae02e8543807) # wayland-protocols-1.31.tar.xz.sig diff --git a/wayland-protocols/PKGBUILD-arch b/wayland-protocols/PKGBUILD-arch index 62df09c..152f0bc 100644 --- a/wayland-protocols/PKGBUILD-arch +++ b/wayland-protocols/PKGBUILD-arch @@ -1,7 +1,7 @@ # Maintainer: Sébastien Luttringer pkgname=wayland-protocols -pkgver=1.30 +pkgver=1.31 pkgrel=1 pkgdesc='Specifications of extended Wayland protocols' arch=('any') @@ -11,7 +11,7 @@ makedepends=('wayland' 'meson' 'ninja') validpgpkeys=('8307C0A224BABDA1BABD0EB9A6EEEC9E0136164A' # Jonas Ådahl 'A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # Daniel Stone source=("https://gitlab.freedesktop.org/wayland/$pkgname/-/releases/$pkgver/downloads/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('3c1498fb65fd2b80b0376d7e87cf215e6ae957b2ccdba5da45a448718831bc60' +sha256sums=('a07fa722ed87676ec020d867714bc9a2f24c464da73912f39706eeef5219e238' 'SKIP') prepare() { diff --git a/wayland-protocols/deps b/wayland-protocols/deps index 34f883b..0e286a0 100644 --- a/wayland-protocols/deps +++ b/wayland-protocols/deps @@ -3,4 +3,3 @@ meson ninja -