lol

mesa: 23.1.7 -> 23.3.1, bump patches

authored by colemickens.tngl.sh and committed by

K900 abd1d7f9 83a6ce5c

+26 -35
+4 -4
pkgs/development/libraries/mesa/default.nix
··· 43 43 ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ 44 44 # QEMU virtualized GPU (aka VirGL) 45 45 # Requires ATOMIC_INT_LOCK_FREE == 2. 46 - "virtio-experimental" 46 + "virtio" 47 47 ] 48 48 ++ lib.optionals stdenv.isAarch64 [ 49 49 "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) ··· 84 84 */ 85 85 86 86 let 87 - version = "23.1.9"; 88 - hash = "sha256-KVuifCgUbtCSFOjOea+hZZ7fnRQt7MPJH4BFUtZPdRA="; 87 + version = "23.3.1"; 88 + hash = "sha256-bkgSbXD9s/IP/rJGygwuQf/cg18GY6A9RSa4v120HeY="; 89 89 90 90 # Release calendar: https://www.mesa3d.org/release-calendar.html 91 91 # Release frequency: https://www.mesa3d.org/releasing.html#schedule ··· 99 99 # FIXME: these should really go into some sort of versioned LLVM package set 100 100 rust-bindgen' = buildPackages.rust-bindgen.override { 101 101 rust-bindgen-unwrapped = buildPackages.rust-bindgen.unwrapped.override { 102 - clang = buildPackages.llvmPackages_15.clang; 102 + clang = buildPackages.llvmPackages_16.clang; 103 103 }; 104 104 }; 105 105 spirv-llvm-translator' = spirv-llvm-translator.override {
+9 -18
pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
··· 1 - Author: David McFarland <corngood@gmail.com> 2 - Date: Mon Aug 6 15:52:11 2018 -0300 3 - 4 - [PATCH] disk_cache: include dri driver path in cache key 5 - 6 - This fixes invalid cache hits on NixOS where all shared library 7 - timestamps in /nix/store are zero. 8 - 9 1 diff --git a/meson_options.txt b/meson_options.txt 10 - index b8f753e2e1a..70d9071c8be 100644 2 + index 591ed957c85..6cb550593e3 100644 11 3 --- a/meson_options.txt 12 4 +++ b/meson_options.txt 13 - @@ -452,7 +452,14 @@ option( 14 - value : true, 5 + @@ -519,6 +519,13 @@ option( 15 6 description : 'Enable direct rendering in GLX and EGL for DRI', 16 7 ) 17 8 ··· 26 17 type : 'string', 27 18 value : '', 28 19 diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c 29 - index 8dbe0938d11..498fe42de70 100644 20 + index 1d23b92af7e..fbb4b04f3cf 100644 30 21 --- a/src/util/disk_cache.c 31 22 +++ b/src/util/disk_cache.c 32 - @@ -194,8 +194,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, 23 + @@ -218,8 +218,10 @@ disk_cache_type_create(const char *gpu_name, 33 24 34 25 /* Create driver id keys */ 35 26 size_t id_size = strlen(driver_id) + 1; ··· 40 31 cache->driver_keys_blob_size += gpu_name_size; 41 32 42 33 /* We sometimes store entire structs that contains a pointers in the cache, 43 - @@ -216,6 +218,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, 34 + @@ -240,6 +242,7 @@ disk_cache_type_create(const char *gpu_name, 44 35 uint8_t *drv_key_blob = cache->driver_keys_blob; 45 36 DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) 46 37 DRV_KEY_CPY(drv_key_blob, driver_id, id_size) ··· 49 40 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) 50 41 DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) 51 42 diff --git a/src/util/meson.build b/src/util/meson.build 52 - index cd44e49bfb4..f17115515a5 100644 43 + index eb88f235c47..eae5c54cc10 100644 53 44 --- a/src/util/meson.build 54 45 +++ b/src/util/meson.build 55 - @@ -268,7 +268,12 @@ _libmesa_util = static_library( 56 - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], 46 + @@ -286,7 +286,12 @@ _libmesa_util = static_library( 47 + include_directories : [inc_util, include_directories('format')], 57 48 dependencies : deps_for_libmesa_util, 58 - link_with: [libmesa_format, libmesa_util_sse41], 49 + link_with: [libmesa_util_sse41], 59 50 - c_args : [c_msvc_compat_args], 60 51 + c_args : [ 61 52 + c_msvc_compat_args,
+13 -13
pkgs/development/libraries/mesa/opencl.patch
··· 1 1 diff --git a/meson.build b/meson.build 2 - index 172c64a7c70..05961e56926 100644 2 + index fbb0b29322d..b4825056449 100644 3 3 --- a/meson.build 4 4 +++ b/meson.build 5 - @@ -1900,7 +1900,7 @@ endif 5 + @@ -1805,7 +1805,7 @@ endif 6 6 7 7 dep_clang = null_dep 8 8 if with_clc ··· 12 12 dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) 13 13 14 14 diff --git a/meson_options.txt b/meson_options.txt 15 - index 6f307018815..ab84eb1006c 100644 15 + index e885ba61a8a..591ed957c85 100644 16 16 --- a/meson_options.txt 17 17 +++ b/meson_options.txt 18 - @@ -18,6 +18,12 @@ 19 - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 20 - # SOFTWARE. 18 + @@ -23,6 +23,12 @@ option( 19 + description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY', 20 + ) 21 21 22 22 +option( 23 23 + 'clang-libdir', ··· 26 26 + description : 'Locations to search for clang libraries.' 27 27 +) 28 28 option( 29 - 'platforms', 30 - type : 'array', 29 + 'android-stub', 30 + type : 'boolean', 31 31 diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build 32 - index db3586bd7fb..4d914206d21 100644 32 + index 7c14135898e..74dc6850603 100644 33 33 --- a/src/gallium/targets/opencl/meson.build 34 34 +++ b/src/gallium/targets/opencl/meson.build 35 35 @@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') ··· 48 48 output : 'mesa.icd', 49 49 - install : true, 50 50 + install : false, 51 + install_tag : 'runtime', 51 52 install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), 52 53 ) 53 - 54 54 diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build 55 - index a968dee52db..69475cf3133 100644 55 + index b2963fe6dfa..99d6d801b94 100644 56 56 --- a/src/gallium/targets/rusticl/meson.build 57 57 +++ b/src/gallium/targets/rusticl/meson.build 58 - @@ -58,7 +58,7 @@ configure_file( 58 + @@ -76,7 +76,7 @@ configure_file( 59 59 configuration : _config, 60 60 input : 'rusticl.icd.in', 61 61 output : 'rusticl.icd', 62 62 - install : true, 63 63 + install : false, 64 + install_tag : 'runtime', 64 65 install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), 65 66 ) 66 -