gentoo resync : 25.09.2021

4 files changed, 54 insertions, 3 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ba4d7e1e28f5..264d82772693 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,9 @@
+AUX 21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch 1732 BLAKE2B c06e24858e2020fba9ce8e5c633ee36d359666cfb272235309c23e3f207b7437cedfd9b4222c85cf159ed48ff0a8972919529cdfda77b63c044ed44fb5e17ac5 SHA512 eac084ba5c2dfa05c06d6c9fc567f4ac761516206ea8727b4cb058ecff38ed77c333900c3ca73253e7303428706c7b3d2925b8605d633dac58a26659bc7af64b
 DIST mesa-21.1.7.tar.xz 15391776 BLAKE2B a9138f189ef953d5efa4e287fbbe795ef2539c113dc7e0f565d3f35dcfaa59ab08674bf37fda196ba34e5963637c3ebb133db40b558bd275e29c8387b1acfdfa SHA512 1fd677437f292c30fbf08bfef8c1088557841f426090ccba20ab2a222b08fb5c3ec48a7a0301466e03a23019d09414c700a4f5e299479cacd6972a9f3ba030c8
 DIST mesa-21.1.8.tar.xz 15410504 BLAKE2B 430a1a5f3120bb69b7eaab13438d9a09201f5b11c9d4581d7dd39f48041a1b70d7c125f36553a5c504d1164fe6e0e3d50853c209c4280787f4fa6935ab385b86 SHA512 80fcf2b1d59b49e384e9aa1ae63a3ce709833059af1ffd8eb821054c1976709134098cfc79fac1578a2f08a003223f1c96b38e2e650c5be49821c6f2fe1047af
-DIST mesa-21.2.1.tar.xz 15703468 BLAKE2B 5f92833237d2a570506e309472a6a8d1335870f151d31288cc01e41b0861694de16f7d6361c04d527e49a750758319da046ddba9876b18a5404cceaa865024a7 SHA512 d4056287ec86f7a95ce534a251a1ccbc3a3b08a2f7112152def2f054fc8a9424501d5883c463554ee95fe2dafb832613efd7145e989ee8281948233942730c2c
+DIST mesa-21.2.2.tar.xz 15755212 BLAKE2B a9c0f847d8d372fac076bd1a2a2113f34d4f5f57d5d459f88b2d1a14bd8a2a442d70c2959637ac17836d8be13941c2192bf639f42d3a7eaf7d8cdb5175268389 SHA512 0a4877b405384088c8bdac3031444cd22377d19552c41c08fb8928d6edf23d5f5a237ef1d6c5f96e3293c2e90c63f4702813226b85cb304fe5e01dd2710ba697
 EBUILD mesa-21.1.7.ebuild 14933 BLAKE2B 9f7e8cc4f522d6a7b1fbd65e2e12010a7c4132cd403674aaef2170af7247a642b1dc61ca14bf4cb1595c6f14ac94f383a602d7320836b6ee5d0d26ef17886951 SHA512 ef20ed369384d62a639045bd60faffecf7583df00fc67ba5aa88df2263d5bb47ea753b21074194f81b7ab051acb8eedbcad09c5508c662dd50ebcc0fc3a75f24
-EBUILD mesa-21.1.8.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392
-EBUILD mesa-21.2.1.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
+EBUILD mesa-21.1.8-r1.ebuild 15033 BLAKE2B cbc17e08f8e8647f83b57d8d0c27389287a17ca499acd449a25819db92aa7a86004acd0b6c05a34e104f518b3f47439082e8c2dcd37e0253521809540baee1e4 SHA512 2525f91bae3559ef3e016aa38e53c8bdff3442ac36325b90615e9ef5971fef418506df0f852fb823d4a7f41462d4c9a7730084e19ad864650b9fe5762387ea86
+EBUILD mesa-21.2.2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 EBUILD mesa-9999.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 MISC metadata.xml 1896 BLAKE2B 579a066dd2fa70f2063ff020676fc6a342bc5d04555e4026868f14816a6ff6efb85824a8d689ce4984a1d7fae17548ad8331d209d9bfdb21ef186c895656ff9d SHA512 8c958d7cdd3bfa987683c6b2cb27b6f02d6ef4ddbf7954ec05ed1e5c2a046fbeb49b059e1a6f48d727855c575bd30f04c2898451ae5a02a40370e0bfba93f117
diff --git a/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch b/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
new file mode 100644
index 000000000000..ebbb8abb1fe5
--- /dev/null
+++ b/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
@@ -0,0 +1,46 @@
+From 8de60a1654a875d0b55512a1508f541f706f9b97 Mon Sep 17 00:00:00 2001
+From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
+Date: Sat, 4 Sep 2021 03:32:21 +0200
+Subject: [PATCH] util/fossilize_db: Don't corrupt keys during entry read.
+
+We change the hash that is still used to set entry->key.
+
+Fixes: d2d642cc014 "util/fossilize_db: Only allocate entries after full read."
+Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12725>
+---
+ src/util/fossilize_db.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
+index e1709a1ff64..26024101b83 100644
+--- a/src/util/fossilize_db.c
++++ b/src/util/fossilize_db.c
+@@ -156,18 +156,18 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
+       offset += header->payload_size;
+       parsed_offset = offset;
+ 
+-      /* Truncate the entry's hash string to a 64bit hash for use with a
+-       * 64bit hash table for looking up file offsets.
+-       */
+-      hash_str[16] = '\0';
+-      uint64_t key = strtoull(hash_str, NULL, 16);
+-
+       struct foz_db_entry *entry = ralloc(foz_db->mem_ctx,
+                                           struct foz_db_entry);
+       entry->header = *header;
+       entry->file_idx = file_idx;
+       _mesa_sha1_hex_to_sha1(entry->key, hash_str);
+ 
++      /* Truncate the entry's hash string to a 64bit hash for use with a
++       * 64bit hash table for looking up file offsets.
++       */
++      hash_str[16] = '\0';
++      uint64_t key = strtoull(hash_str, NULL, 16);
++
+       entry->offset = cache_offset;
+ 
+       _mesa_hash_table_u64_insert(foz_db->index_db, key, entry);
+-- 
+2.32.0
+
diff --git a/media-libs/mesa/mesa-21.1.8.ebuild b/media-libs/mesa/mesa-21.1.8-r1.ebuild
index 2849134b7198..482b96c702ab 100644
--- a/media-libs/mesa/mesa-21.1.8.ebuild
+++ b/media-libs/mesa/mesa-21.1.8-r1.ebuild
@@ -229,6 +229,10 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
+)
+
 S="${WORKDIR}/${MY_P}"
 EGIT_CHECKOUT_DIR=${S}
 
diff --git a/media-libs/mesa/mesa-21.2.1.ebuild b/media-libs/mesa/mesa-21.2.2.ebuild
index e3fd921bbaa0..e3fd921bbaa0 100644
--- a/media-libs/mesa/mesa-21.2.1.ebuild
+++ b/media-libs/mesa/mesa-21.2.2.ebuild