diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/development/libraries/mesa | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa')
3 files changed, 20 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index cf1bdaf64323..761d6594bd01 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -27,22 +27,22 @@ with stdenv.lib; let - version = "19.1.5"; - branch = head (splitString "." version); + version = "19.3.1"; + branch = versions.major version; in stdenv.mkDerivation { pname = "mesa"; inherit version; - src = fetchurl { + src = fetchurl { urls = [ "ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v"; + sha256 = "0ndfpqry08s74yw4x3ydyhim6v4ywg0b4yhaazq7zaankjv1v5fd"; }; prePatch = "patchShebangs ."; @@ -167,7 +167,7 @@ stdenv.mkDerivation { substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" # remove pkgconfig files for GL/EGL; they are provided by libGL. - rm $dev/lib/pkgconfig/{gl,egl}.pc + rm -f $dev/lib/pkgconfig/{gl,egl}.pc # Update search path used by pkg-config for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do diff --git a/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index 1e280b64ee5f..8ce3473dd32f 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 2a1e32b4105fe95413a615a44d40938920ea1a19 Mon Sep 17 00:00:00 2001 +From 6d22383149e4cdc646c68e29238f41d895a4705b Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index a723b5406cf..65a8954291f 100644 +index 626baf3..579c15b 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -330,3 +330,9 @@ option( +@@ -341,6 +341,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -25,11 +25,14 @@ index a723b5406cf..65a8954291f 100644 + value : '', + description : 'Mesa cache key.' +) + option( + 'I-love-half-baked-turnips', + type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index 0aa2646a9bb..bd784d38e21 100644 +index 0cd92ca..fc1c173 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -389,8 +389,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -395,8 +395,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -40,7 +43,7 @@ index 0aa2646a9bb..bd784d38e21 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -411,6 +413,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -417,6 +419,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -49,13 +52,13 @@ index 0aa2646a9bb..bd784d38e21 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index 397c2228129..77013563e5d 100644 +index f69ebe9..e2bd8e2 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -120,7 +120,12 @@ libmesa_util = static_library( +@@ -158,7 +158,12 @@ _libmesa_util = static_library( [files_mesa_util, format_srgb], include_directories : inc_common, - dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m], + dependencies : deps_for_libmesa_util, - c_args : [c_msvc_compat_args, c_vis_args], + c_args : [ + c_msvc_compat_args, c_vis_args, @@ -67,5 +70,5 @@ index 397c2228129..77013563e5d 100644 ) -- -2.19.2 +2.24.1 diff --git a/nixpkgs/pkgs/development/libraries/mesa/stubs.nix b/nixpkgs/pkgs/development/libraries/mesa/stubs.nix index 5cb6ac3d4d13..a53f2dc28e77 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/stubs.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/stubs.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ln -s ${libglvnd.out}/lib $out/lib mkdir -p $dev/{,lib/pkgconfig,nix-support} - echo "$out" > $dev/nix-support/propagated-build-inputs + echo "$out ${libglvnd} ${libglvnd.dev}" > $dev/nix-support/propagated-build-inputs ln -s ${mesa.dev}/include $dev/include genPkgConfig() { @@ -63,7 +63,7 @@ stdenv.mkDerivation { Description: $lib library Version: ${mesa.version} Libs: -L${libglvnd.out}/lib -l$lib - Cflags: -I${mesa.dev}/include + Cflags: -I${mesa.dev}/include -I${libglvnd.dev}/include EOF } |