commit 0930c2c486862e4333c5ce28ffdc9719666001ec
parent 7cc5ee79948c50dfb750fc3b37c35bb124757653
Author: MikoĊaj Lenczewski <mblenczewski@gmail.com>
Date: Wed, 1 May 2024 07:38:37 +0000
Remove bad nvk-mesa ebuild
Diffstat:
7 files changed, 0 insertions(+), 917 deletions(-)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
@@ -1,5 +0,0 @@
-DIST paste-1.0.14.tar.gz 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
-DIST proc-macro2-1.0.78.tar.gz 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
-DIST quote-1.0.35.tar.gz 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
-DIST syn-2.0.48.tar.gz 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
-DIST unicode-ident-1.0.12.tar.gz 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
diff --git a/media-libs/mesa/files/23.3.1-d3d12-Fix-AV1-video-encode-32-bits-build.patch b/media-libs/mesa/files/23.3.1-d3d12-Fix-AV1-video-encode-32-bits-build.patch
@@ -1,277 +0,0 @@
-https://bugs.gentoo.org/920288
-https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26777
-
-From 070563c4b61dfe56cde0508e0adf9d585c220a49 Mon Sep 17 00:00:00 2001
-From: Sil Vilerino <sivileri@microsoft.com>
-Date: Wed, 6 Dec 2023 20:09:44 -0500
-Subject: [PATCH] d3d12: Fix AV1 video encode 32 bits build
-
-Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26573>
-(cherry picked from commit 096e17b57832e96e36fc27f70e7a0e5ccbb0ac8a)
----
- .../drivers/d3d12/d3d12_video_enc_av1.cpp | 58 +++++++++----------
- ...12_video_encoder_bitstream_builder_av1.cpp | 10 ++--
- ...2_video_encoder_references_manager_av1.cpp | 2 +-
- 3 files changed, 35 insertions(+), 35 deletions(-)
-
-diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc_av1.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc_av1.cpp
-index 2c1964aa274..a5e2a2e3d39 100644
---- a/src/gallium/drivers/d3d12/d3d12_video_enc_av1.cpp
-+++ b/src/gallium/drivers/d3d12/d3d12_video_enc_av1.cpp
-@@ -2189,7 +2189,7 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
- writtenTemporalDelimBytes // Bytes Written AFTER placingPositionStart arg above
- );
- assert(pD3D12Enc->m_BitstreamHeadersBuffer.size() == writtenTemporalDelimBytes);
-- debug_printf("Written OBU_TEMPORAL_DELIMITER bytes: %" PRIu64 "\n", writtenTemporalDelimBytes);
-+ debug_printf("Written OBU_TEMPORAL_DELIMITER bytes: %" PRIu64 "\n", static_cast<uint64_t>(writtenTemporalDelimBytes));
- }
-
- size_t writtenSequenceBytes = 0;
-@@ -2208,7 +2208,7 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
- writtenSequenceBytes // Bytes Written AFTER placingPositionStart arg above
- );
- assert(pD3D12Enc->m_BitstreamHeadersBuffer.size() == (writtenSequenceBytes + writtenTemporalDelimBytes));
-- debug_printf("Written OBU_SEQUENCE_HEADER bytes: %" PRIu64 "\n", writtenSequenceBytes);
-+ debug_printf("Written OBU_SEQUENCE_HEADER bytes: %" PRIu64 "\n", static_cast<uint64_t>(writtenSequenceBytes));
- }
-
- // Only supported bitstream format is with obu_size for now.
-@@ -2254,14 +2254,14 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
- writtenFrameBytes // Bytes Written AFTER placingPositionStart arg above
- );
-
-- debug_printf("Written OBU_FRAME bytes: %" PRIu64 "\n", writtenFrameBytes);
-+ debug_printf("Written OBU_FRAME bytes: %" PRIu64 "\n", static_cast<uint64_t>(writtenFrameBytes));
-
- assert(pD3D12Enc->m_BitstreamHeadersBuffer.size() ==
- (writtenSequenceBytes + writtenTemporalDelimBytes + writtenFrameBytes));
-
- debug_printf("Uploading %" PRIu64
- " bytes from OBU sequence and/or picture headers to comp_bit_destination %p at offset 0\n",
-- pD3D12Enc->m_BitstreamHeadersBuffer.size(),
-+ static_cast<uint64_t>(pD3D12Enc->m_BitstreamHeadersBuffer.size()),
- associatedMetadata.comp_bit_destination);
-
- // Upload headers to the finalized compressed bitstream buffer
-@@ -2330,13 +2330,13 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
- writtenFrameBytes // Bytes Written AFTER placingPositionStart arg above
- );
-
-- debug_printf("Written OBU_FRAME_HEADER bytes: %" PRIu64 "\n", writtenFrameBytes);
-+ debug_printf("Written OBU_FRAME_HEADER bytes: %" PRIu64 "\n", static_cast<uint64_t>(writtenFrameBytes));
-
- assert(pD3D12Enc->m_BitstreamHeadersBuffer.size() ==
- (writtenSequenceBytes + writtenTemporalDelimBytes + writtenFrameBytes));
-
- debug_printf("Uploading %" PRIu64 " bytes from OBU headers to comp_bit_destination %p at offset 0\n",
-- pD3D12Enc->m_BitstreamHeadersBuffer.size(),
-+ static_cast<uint64_t>(pD3D12Enc->m_BitstreamHeadersBuffer.size()),
- associatedMetadata.comp_bit_destination);
-
- // Upload headers to the finalized compressed bitstream buffer
-@@ -2361,7 +2361,7 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
- debug_printf("Uploading tile group %d to comp_bit_destination %p at offset %" PRIu64 "\n",
- tg_idx,
- associatedMetadata.comp_bit_destination,
-- comp_bitstream_offset);
-+ static_cast<uint64_t>(comp_bitstream_offset));
-
- size_t tile_group_obu_size = 0;
- size_t decode_tile_elements_size = 0;
-@@ -2387,9 +2387,9 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
-
- debug_printf("Written %" PRIu64 " bytes for OBU_TILE_GROUP open_bitstream_unit() prefix with obu_header() and "
- "obu_size to staging_bitstream_buffer %p at offset %" PRIu64 "\n",
-- writtenTileObuPrefixBytes,
-+ static_cast<uint64_t>(writtenTileObuPrefixBytes),
- associatedMetadata.m_StagingBitstreamConstruction.data(),
-- staging_bitstream_buffer_offset);
-+ static_cast<uint64_t>(staging_bitstream_buffer_offset));
-
- writtenTileBytes += writtenTileObuPrefixBytes;
-
-@@ -2404,10 +2404,10 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
-
- debug_printf("Uploading %" PRIu64 " bytes for OBU_TILE_GROUP open_bitstream_unit() prefix with obu_header() "
- "and obu_size: %" PRIu64 " to comp_bit_destination %p at offset %" PRIu64 "\n",
-- writtenTileObuPrefixBytes,
-- tile_group_obu_size,
-+ static_cast<uint64_t>(writtenTileObuPrefixBytes),
-+ static_cast<uint64_t>(tile_group_obu_size),
- associatedMetadata.comp_bit_destination,
-- comp_bitstream_offset);
-+ static_cast<uint64_t>(comp_bitstream_offset));
-
- staging_bitstream_buffer_offset += writtenTileObuPrefixBytes;
-
-@@ -2517,7 +2517,7 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
- // Add current pending frame being processed in the loop
- extra_show_existing_frame_payload_bytes += writtenTemporalDelimBytes;
-
-- debug_printf("Written OBU_TEMPORAL_DELIMITER bytes: %" PRIu64 "\n", writtenTemporalDelimBytes);
-+ debug_printf("Written OBU_TEMPORAL_DELIMITER bytes: %" PRIu64 "\n", static_cast<uint64_t>(writtenTemporalDelimBytes));
-
- size_t writtenShowExistingFrameBytes = 0;
- av1_pic_header_t showExistingPicHdr = {};
-@@ -2561,7 +2561,7 @@ d3d12_video_encoder_build_post_encode_codec_bitstream_av1(struct d3d12_video_enc
- "in current frame ref_frame_idx[%" PRIu32 "]) bytes: %" PRIu64 "\n",
- *pendingFrameIt /*PictureIndex*/,
- showExistingPicHdr.frame_to_show_map_idx,
-- writtenShowExistingFrameBytes);
-+ static_cast<uint64_t>(writtenShowExistingFrameBytes));
-
- // Remove it from the list of pending frames
- pendingFrameIt =
-@@ -2628,7 +2628,7 @@ upload_tile_group_obu(struct d3d12_video_encoder *pD3D12Enc,
- tileGroup.tg_start,
- tileGroup.tg_end,
- comp_bit_destination,
-- comp_bit_destination_offset);
-+ static_cast<uint64_t>(comp_bit_destination_offset));
-
- debug_printf("[Tile group start %d to end %d] Using staging_bitstream_buffer %p at offset %" PRIu64
- " to write the tile_obu_group() prefix syntax: tile_start_and_end_present_flag, tg_start, tg_end and "
-@@ -2636,7 +2636,7 @@ upload_tile_group_obu(struct d3d12_video_encoder *pD3D12Enc,
- tileGroup.tg_start,
- tileGroup.tg_end,
- staging_bitstream_buffer.data(),
-- staging_bitstream_buffer_offset);
-+ static_cast<uint64_t>(staging_bitstream_buffer_offset));
-
- // Reserve space upfront in the scratch storage
- // Do not modify anything before staging_bitstream_buffer_offset
-@@ -2673,9 +2673,9 @@ upload_tile_group_obu(struct d3d12_video_encoder *pD3D12Enc,
- " for tile_obu_group() prefix syntax: tile_start_and_end_present_flag, tg_start, tg_end\n",
- tileGroup.tg_start,
- tileGroup.tg_end,
-- bitstream_tile_group_obu_bytes,
-+ static_cast<uint64_t>(bitstream_tile_group_obu_bytes),
- staging_bitstream_buffer.data(),
-- staging_bitstream_buffer_offset);
-+ static_cast<uint64_t>(staging_bitstream_buffer_offset));
-
-
- // Save this to compare the final written destination byte size against the expected tile_group_obu_size
-@@ -2699,11 +2699,11 @@ upload_tile_group_obu(struct d3d12_video_encoder *pD3D12Enc,
- " to comp_bit_destination %p at offset %" PRIu64 "\n",
- tileGroup.tg_start,
- tileGroup.tg_end,
-- bitstream_tile_group_obu_bytes,
-+ static_cast<uint64_t>(bitstream_tile_group_obu_bytes),
- staging_bitstream_buffer.data(),
-- staging_bitstream_buffer_offset,
-+ static_cast<uint64_t>(staging_bitstream_buffer_offset),
- comp_bit_destination,
-- comp_bit_destination_offset);
-+ static_cast<uint64_t>(comp_bit_destination_offset));
-
- comp_bit_destination_offset += bitstream_tile_group_obu_bytes;
- written_bytes_to_staging_bitstream_buffer += bitstream_tile_group_obu_bytes;
-@@ -2729,9 +2729,9 @@ upload_tile_group_obu(struct d3d12_video_encoder *pD3D12Enc,
- tileGroup.tg_start,
- tileGroup.tg_end,
- TileIdx,
-- TileSizeBytes,
-+ static_cast<uint64_t>(TileSizeBytes),
- staging_bitstream_buffer.data(),
-- (written_bytes_to_staging_bitstream_buffer + staging_bitstream_buffer_offset));
-+ static_cast<uint64_t>(written_bytes_to_staging_bitstream_buffer + staging_bitstream_buffer_offset));
-
- // Upload current tile_size_minus_1
- // Note: The buffer_subdata is queued in pD3D12Enc->base.context but doesn't execute immediately
-@@ -2751,11 +2751,11 @@ upload_tile_group_obu(struct d3d12_video_encoder *pD3D12Enc,
- tileGroup.tg_start,
- tileGroup.tg_end,
- TileIdx,
-- TileSizeBytes,
-+ static_cast<uint64_t>(TileSizeBytes),
- staging_bitstream_buffer.data(),
-- (written_bytes_to_staging_bitstream_buffer + staging_bitstream_buffer_offset),
-+ static_cast<uint64_t>(written_bytes_to_staging_bitstream_buffer + staging_bitstream_buffer_offset),
- comp_bit_destination,
-- comp_bit_destination_offset);
-+ static_cast<uint64_t>(comp_bit_destination_offset));
-
- comp_bit_destination_offset += TileSizeBytes;
- written_bytes_to_staging_bitstream_buffer += TileSizeBytes;
-@@ -2788,11 +2788,11 @@ upload_tile_group_obu(struct d3d12_video_encoder *pD3D12Enc,
- tileGroup.tg_start,
- tileGroup.tg_end,
- TileIdx,
-- tile_size,
-+ static_cast<uint64_t>(tile_size),
- src_driver_bitstream,
-- src_buf_tile_position,
-+ static_cast<uint64_t>(src_buf_tile_position),
- comp_bit_destination,
-- comp_bit_destination_offset);
-+ static_cast<uint64_t>(comp_bit_destination_offset));
-
- comp_bit_destination_offset += tile_size;
- }
-diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_av1.cpp b/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_av1.cpp
-index 25550a2b4fb..96b7e32eb8e 100644
---- a/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_av1.cpp
-+++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_bitstream_builder_av1.cpp
-@@ -153,7 +153,7 @@ d3d12_video_bitstream_builder_av1::write_temporal_delimiter_obu(std::vector<uint
- write_obu_header(&bitstream_full_obu, OBU_TEMPORAL_DELIMITER, obu_extension_flag, temporal_id, spatial_id);
-
- // Write the data size
-- const size_t obu_size_in_bytes = 0;
-+ const uint64_t obu_size_in_bytes = 0;
- debug_printf("obu_size: %" PRIu64 " (temporal_delimiter_obu() has empty payload as per AV1 codec spec)\n",
- obu_size_in_bytes);
- pack_obu_header_size(&bitstream_full_obu, obu_size_in_bytes);
-@@ -197,7 +197,7 @@ d3d12_video_bitstream_builder_av1::write_sequence_header(const av1_seq_header_t
- write_obu_header(&bitstream_full_obu, OBU_SEQUENCE_HEADER, obu_extension_flag, temporal_id, spatial_id);
-
- // Write the data size
-- const size_t obu_size_in_bytes = static_cast<size_t>(bitstream_seq.get_byte_count());
-+ const uint64_t obu_size_in_bytes = bitstream_seq.get_byte_count();
- debug_printf("obu_size: %" PRIu64 "\n", obu_size_in_bytes);
- pack_obu_header_size(&bitstream_full_obu, obu_size_in_bytes);
-
-@@ -802,7 +802,7 @@ d3d12_video_bitstream_builder_av1::write_frame_header(const av1_seq_header_t *pS
- debug_printf("frame_header_obu() bytes (without OBU_FRAME nor OBU_FRAME_HEADER alignment padding): %" PRId32 "\n",
- bitstream_pic.get_byte_count()); // May be bit unaligned at this point (see padding below)
- debug_printf("extra_obu_size_bytes (ie. tile_group_obu_size if writing OBU_FRAME ): %" PRIu64 "\n",
-- extra_obu_size_bytes);
-+ static_cast<uint64_t>(extra_obu_size_bytes));
-
- // Write the obu_header
- constexpr uint32_t obu_extension_flag = 0;
-@@ -825,7 +825,7 @@ d3d12_video_bitstream_builder_av1::write_frame_header(const av1_seq_header_t *pS
- bitstream_pic.flush();
-
- // Write the obu_size element
-- const size_t obu_size_in_bytes = bitstream_pic.get_byte_count() + extra_obu_size_bytes;
-+ const uint64_t obu_size_in_bytes = bitstream_pic.get_byte_count() + extra_obu_size_bytes;
- debug_printf("obu_size: %" PRIu64 "\n", obu_size_in_bytes);
- pack_obu_header_size(&bitstream_full_obu, obu_size_in_bytes);
-
-@@ -913,7 +913,7 @@ d3d12_video_bitstream_builder_av1::write_obu_tile_group_header(size_t tile_group
-
- // Write the obu_size element
- pack_obu_header_size(&bitstream_full_obu, tile_group_obu_size);
-- debug_printf("obu_size: %" PRIu64 "\n", tile_group_obu_size);
-+ debug_printf("obu_size: %" PRIu64 "\n", static_cast<uint64_t>(tile_group_obu_size));
-
- bitstream_full_obu.flush();
-
-diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_av1.cpp b/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_av1.cpp
-index 49892338984..2f4bcf0e1eb 100644
---- a/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_av1.cpp
-+++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_av1.cpp
-@@ -213,7 +213,7 @@ d3d12_video_encoder_references_manager_av1::print_virtual_dpb_entries()
- "Number of DPB virtual entries is %" PRIu64 " entries for frame with OrderHint "
- "%d (PictureIndex %d) are: \n%s \n",
- m_PhysicalAllocationsStorage.get_number_of_pics_in_dpb(),
-- m_CurrentFrameReferencesData.pVirtualDPBEntries.size(),
-+ static_cast<uint64_t>(m_CurrentFrameReferencesData.pVirtualDPBEntries.size()),
- m_CurrentFramePicParams.OrderHint,
- m_CurrentFramePicParams.PictureIndex,
- dpbContents.c_str());
---
-2.41.0
-
diff --git a/media-libs/mesa/files/23.3.3-big-endian.patch b/media-libs/mesa/files/23.3.3-big-endian.patch
@@ -1,84 +0,0 @@
-From 5997cf7587ce56aedac9114c0db9b250f1b54461 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 9 Jan 2024 23:45:27 -0500
-Subject: [PATCH 1/2] nir: Fix cast
-
-We were wrongly telling `nir_const_value_as_uint()` that `iter` had
-`bit_size` bits, but in one case it is explicitly i64. This works on
-little endian platforms, but caused the nir_loop_unroll_test.fadd{,_rev}
-tests to fail on big endian platforms.
-
-Bug: https://bugs.gentoo.org/921297
-Fixes: 268ad47c111 ("nir/loop_analyze: Handle bit sizes correctly in calculate_iterations")
-Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
-Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26964>
----
- src/compiler/nir/nir_loop_analyze.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/compiler/nir/nir_loop_analyze.c b/src/compiler/nir/nir_loop_analyze.c
-index b55da00b962..2b2ebfdd60f 100644
---- a/src/compiler/nir/nir_loop_analyze.c
-+++ b/src/compiler/nir/nir_loop_analyze.c
-@@ -827,6 +827,7 @@ get_iteration(nir_op cond_op, nir_const_value initial, nir_const_value step,
- unsigned execution_mode)
- {
- nir_const_value span, iter;
-+ unsigned iter_bit_size = bit_size;
-
- switch (invert_comparison_if_needed(cond_op, invert_cond)) {
- case nir_op_ine:
-@@ -880,13 +881,14 @@ get_iteration(nir_op cond_op, nir_const_value initial, nir_const_value step,
- iter = eval_const_binop(nir_op_fdiv, bit_size, span,
- step, execution_mode);
- iter = eval_const_unop(nir_op_f2i64, bit_size, iter, execution_mode);
-+ iter_bit_size = 64;
- break;
-
- default:
- return -1;
- }
-
-- uint64_t iter_u64 = nir_const_value_as_uint(iter, bit_size);
-+ uint64_t iter_u64 = nir_const_value_as_uint(iter, iter_bit_size);
- return iter_u64 > INT_MAX ? -1 : (int)iter_u64;
- }
-
---
-2.41.0
-
-From 4ed0957ce75878f8a2ce769e933c5ea3a1aa2510 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 9 Jan 2024 23:47:56 -0500
-Subject: [PATCH 2/2] nir/tests: Reenable tests that failed on big-endian
-
-These tests were disabled due to the bug fixed in the previous commit.
-
-Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
-Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26964>
----
- src/compiler/nir/tests/loop_unroll_tests.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/compiler/nir/tests/loop_unroll_tests.cpp b/src/compiler/nir/tests/loop_unroll_tests.cpp
-index f9ffb1f7a1c..af9b8f87549 100644
---- a/src/compiler/nir/tests/loop_unroll_tests.cpp
-+++ b/src/compiler/nir/tests/loop_unroll_tests.cpp
-@@ -144,12 +144,10 @@ UNROLL_TEST_INSERT(iadd, int, 0, 24, 4,
- ige, iadd, false, TRUE, 6, 0)
- UNROLL_TEST_INSERT(iadd_rev, int, 0, 24, 4,
- ilt, iadd, true, TRUE, 7, 0)
--#ifndef __s390x__
- UNROLL_TEST_INSERT(fadd, float, 0.0, 24.0, 4.0,
- fge, fadd, false, TRUE, 6, 0)
- UNROLL_TEST_INSERT(fadd_rev, float, 0.0, 24.0, 4.0,
- flt, fadd, true, TRUE, 7, 0)
--#endif
- UNROLL_TEST_INSERT(imul, int, 1, 81, 3,
- ige, imul, false, TRUE, 4, 0)
- UNROLL_TEST_INSERT(imul_rev, int, 1, 81, 3,
---
-2.41.0
-
diff --git a/media-libs/mesa/files/23.3.3-symbols-check-Add-_GLOBAL_OFFSET_TABLE_.patch b/media-libs/mesa/files/23.3.3-symbols-check-Add-_GLOBAL_OFFSET_TABLE_.patch
@@ -1,31 +0,0 @@
-From 0ab7ea56b2558d30400a7462a05014e758c9c9c1 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 10 Jan 2024 10:56:17 -0500
-Subject: [PATCH] symbols-check: Add _GLOBAL_OFFSET_TABLE_
-
-This is exported on hppa/parisc.
-
-See also: https://gitlab.freedesktop.org/glvnd/libglvnd/-/merge_requests/291
-
-Cc: mesa-stable
-Bug: https://bugs.gentoo.org/908079
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26978>
----
- bin/symbols-check.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bin/symbols-check.py b/bin/symbols-check.py
-index 7daf603c5f9..2e014731728 100644
---- a/bin/symbols-check.py
-+++ b/bin/symbols-check.py
-@@ -7,6 +7,7 @@ import subprocess
-
- # This list contains symbols that _might_ be exported for some platforms
- PLATFORM_SYMBOLS = [
-+ '_GLOBAL_OFFSET_TABLE_',
- '__bss_end__',
- '__bss_start__',
- '__bss_start',
---
-2.41.0
-
diff --git a/media-libs/mesa/files/clang_config_tool.patch b/media-libs/mesa/files/clang_config_tool.patch
@@ -1,13 +0,0 @@
-Workaround the CMake dependency lookup returning a different LLVM to llvm-config.
-
-Bug: https://bugs.gentoo.org/907965
---- a/meson.build
-+++ b/meson.build
-@@ -1691,6 +1691,7 @@ if _llvm.allowed()
- static : not _shared_llvm,
- fallback : ['llvm', 'dep_llvm'],
- include_type : 'system',
-+ method: 'config-tool',
- )
- with_llvm = dep_llvm.found()
- endif
diff --git a/media-libs/mesa/files/clang_resource_dir.patch b/media-libs/mesa/files/clang_resource_dir.patch
@@ -1,24 +0,0 @@
-https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19232#note_1776640
-https://gitlab.freedesktop.org/mesa/mesa/-/issues/7717#note_1832122
-
-diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp
-index 80bc84831e4..34d156bf227 100644
---- a/src/compiler/clc/clc_helpers.cpp
-+++ b/src/compiler/clc/clc_helpers.cpp
-@@ -39,6 +39,7 @@
- #include <llvm-c/Target.h>
- #include <LLVMSPIRVLib/LLVMSPIRVLib.h>
-
-+#include <clang/Config/config.h>
- #include <clang/Driver/Driver.h>
- #include <clang/CodeGen/CodeGenAction.h>
- #include <clang/Lex/PreprocessorOptions.h>
-@@ -866,7 +867,7 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx,
- // because we might have linked clang statically.
- auto libclang_path = fs::path(LLVM_LIB_DIR) / "libclang.so";
- auto clang_res_path =
-- fs::path(clang::driver::Driver::GetResourcesPath(libclang_path.string())) / "include";
-+ fs::path(clang::driver::Driver::GetResourcesPath(libclang_path.string(), CLANG_RESOURCE_DIR)) / "include";
-
- c->getHeaderSearchOpts().UseBuiltinIncludes = true;
- c->getHeaderSearchOpts().UseStandardSystemIncludes = true;
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
@@ -1,483 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..17} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-SYN_V=2.0.48
-#SYN_V=2.0.39
-PROC_MACRO2_V=1.0.78
-#PROC_MACRO2_V=1.0.70
-QUOTE_V=1.0.35
-#QUOTE_V=1.0.33
-UNICODE_IDENT_V=1.0.12
-PASTE_V=1.0.14
-
-NAK_URI="
- https://crates.io/api/v1/crates/syn/${SYN_V}/download -> syn-${SYN_V}.tar.gz
- https://crates.io/api/v1/crates/proc-macro2/${PROC_MACRO2_V}/download -> proc-macro2-${PROC_MACRO2_V}.tar.gz
- https://crates.io/api/v1/crates/quote/${QUOTE_V}/download -> quote-${QUOTE_V}.tar.gz
- https://crates.io/api/v1/crates/unicode-ident/${UNICODE_IDENT_V}/download -> unicode-ident-${UNICODE_IDENT_V}.tar.gz
- https://crates.io/api/v1/crates/paste/${PASTE_V}/download -> paste-${PASTE_V}.tar.gz"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
- SRC_URI="$NAK_URI"
- inherit git-r3
-else
- SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
- lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
- test unwind vaapi valgrind vdpau vulkan
- vulkan-overlay wayland +X xa zink +zstd"
-
-REQUIRED_USE="
- d3d9? (
- || (
- video_cards_intel
- video_cards_r300
- video_cards_r600
- video_cards_radeonsi
- video_cards_nouveau
- video_cards_vmware
- )
- )
- llvm? ( ${LLVM_REQUIRED_USE} )
- vulkan-overlay? ( vulkan )
- video_cards_lavapipe? ( llvm vulkan )
- video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) )
- vdpau? ( X )
- xa? ( X )
- X? ( gles1? ( opengl ) gles2? ( opengl ) )
- zink? ( vulkan || ( opengl gles1 gles2 ) )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
-RDEPEND="
- >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
- >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
- unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
- llvm? (
- $(llvm_gen_dep "
- sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
- opencl? (
- dev-util/spirv-llvm-translator:\${LLVM_SLOT}
- sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
- )
- ")
- video_cards_radeonsi? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_r600? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_radeon? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- )
- lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
- opencl? (
- >=virtual/opencl-3
- dev-libs/libclc[spirv(-)]
- >=dev-util/spirv-tools-1.3.231.0
- virtual/libelf:0=
- )
- vaapi? (
- >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
- )
- zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- video_cards_d3d12? ( >=dev-util/directx-headers-1.611.0[${MULTILIB_USEDEP}] )
- valgrind? ( dev-debug/valgrind )
- wayland? ( >=dev-libs/wayland-protocols-1.30 )
- X? (
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-base/xorg-proto
- )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- opencl? (
- >=virtual/rust-1.62.0
- >=dev-util/bindgen-0.58.0
- >=dev-build/meson-1.3.1
- )
- app-alternatives/yacc
- app-alternatives/lex
- virtual/pkgconfig
- $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
- video_cards_intel? (
- ~dev-util/intel_clc-${PV}
- dev-libs/libclc[spirv(-)]
- $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
- )
- vulkan? (
- dev-util/glslang
- video_cards_nouveau? (
- >=dev-util/bindgen-0.58.0
- >=dev-util/cbindgen-0.26.0
- >=virtual/rust-1.73
- )
- )
- wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- usr/lib/libglapi.so.0.0.0
- usr/lib/libOSMesa.so.8.0.0
- usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-pkg_pretend() {
- if use vulkan; then
- if ! use video_cards_d3d12 &&
- ! use video_cards_freedreno &&
- ! use video_cards_intel &&
- ! use video_cards_radeonsi &&
- ! use video_cards_v3d &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, nouveau, or v3d"
- fi
- fi
-
- if use vaapi; then
- if ! use video_cards_d3d12 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
- fi
- fi
-
- if use vdpau; then
- if ! use video_cards_d3d12 &&
- ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
- fi
- fi
-
- if use xa; then
- if ! use video_cards_freedreno &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
- fi
- fi
-
- if ! use llvm; then
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
- fi
-
- if use osmesa && ! use llvm; then
- ewarn "OSMesa will be slow without enabling USE=llvm"
- fi
-}
-
-python_check_deps() {
- python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
- if use llvm && use vulkan && use video_cards_intel && use amd64; then
- python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
- fi
-}
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- if use video_cards_intel ||
- use video_cards_radeonsi; then
- if kernel_is -ge 5 11 3; then
- CONFIG_CHECK="~KCMP"
- elif kernel_is -ge 5 11; then
- CONFIG_CHECK="~CHECKPOINT_RESTORE"
- elif kernel_is -ge 5 10 20; then
- CONFIG_CHECK="~KCMP"
- else
- CONFIG_CHECK="~CHECKPOINT_RESTORE"
- fi
- linux-info_pkg_setup
- fi
-
- use llvm && llvm-r1_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- if [[ -n ${A} ]]; then
- einfo ${A}
- unpack ${A}
- fi
- if use video_cards_nouveau; then
- # TODO: What is the correct approach here? subprojects download pull too many packages
- #cd ${P}
- #meson subprojects download
- #cd -
- for pkg in syn-${SYN_V} quote-${QUOTE_V} unicode-ident-${UNICODE_IDENT_V} proc-macro2-${PROC_MACRO2_V} paste-${PASTE_V}; do
- sub=mesa-${PV}/subprojects
- mv ${pkg} ${sub}
- cp ${sub}/packagefiles/${pkg%-*}/meson.build ${sub}/${pkg}
- sed -i -e "s/directory = \S\+/directory = ${pkg}/" ${sub}/${pkg%-*}.wrap
- done
- fi
-}
-
-src_prepare() {
- default
- sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
- bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
- local emesonargs=()
-
- local platforms
- use X && platforms+="x11"
- use wayland && platforms+=",wayland"
- emesonargs+=(-Dplatforms=${platforms#,})
-
- if use video_cards_intel ||
- use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_use d3d9 gallium-nine))
- else
- emesonargs+=(-Dgallium-nine=false)
- fi
-
- if use video_cards_d3d12 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature vaapi gallium-va))
- use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
- else
- emesonargs+=(-Dgallium-va=disabled)
- fi
-
- if use video_cards_d3d12; then
- emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
- fi
-
- if use video_cards_d3d12 ||
- use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_feature vdpau gallium-vdpau))
- else
- emesonargs+=(-Dgallium-vdpau=disabled)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_feature xa gallium-xa))
- else
- emesonargs+=(-Dgallium-xa=disabled)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_lima ||
- use video_cards_panfrost ||
- use video_cards_v3d ||
- use video_cards_vc4 ||
- use video_cards_vivante; then
- gallium_enable -- kmsro
- fi
-
- gallium_enable -- swrast
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_intel crocus i915 iris
- gallium_enable video_cards_lima lima
- gallium_enable video_cards_d3d12 d3d12
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_panfrost panfrost
- gallium_enable video_cards_v3d v3d
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_virgl virgl
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable zink zink
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- if use llvm && use opencl; then
- PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
- # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
- emesonargs+=(
- $(meson_native_true gallium-rusticl)
- -Drust_std=2021
- )
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_lavapipe swrast
- vulkan_enable video_cards_freedreno freedreno
- vulkan_enable video_cards_intel intel intel_hasvk
- vulkan_enable video_cards_d3d12 microsoft-experimental
- vulkan_enable video_cards_radeonsi amd
- vulkan_enable video_cards_v3d broadcom
- if use video_cards_nouveau; then
- vulkan_enable video_cards_nouveau nouveau
- if ! multilib_is_native_abi; then
- einfo "Applying Gentoo hack for nvk - 1/2"
- echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
- emesonargs+=(
- --native-file "${T}"/rust_fix.ini
- )
- einfo "Applying Gentoo hack for nvk - 2/2"
- fi
- fi
- fi
-
- driver_list() {
- local drivers="$(sort -u <<< "${1// /$'\n'}")"
- echo "${drivers//$'\n'/,}"
- }
-
- local vulkan_layers
- use vulkan && vulkan_layers+="device-select"
- use vulkan-overlay && vulkan_layers+=",overlay"
- emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
- if use opengl || use gles1 || use gles2; then
- emesonargs+=(
- -Degl=enabled
- -Dgbm=enabled
- -Dglvnd=true
- )
- else
- emesonargs+=(
- -Degl=disabled
- -Dgbm=disabled
- -Dglvnd=false
- )
- fi
-
- if use opengl && use X; then
- emesonargs+=(-Dglx=dri)
- else
- emesonargs+=(-Dglx=disabled)
- fi
-
- emesonargs+=(
- $(meson_use test build-tests)
- -Dshared-glapi=enabled
- -Ddri3=enabled
- -Dexpat=enabled
- $(meson_use opengl)
- $(meson_feature gles1)
- $(meson_feature gles2)
- $(meson_feature llvm)
- $(meson_feature lm-sensors lmsensors)
- $(meson_use osmesa)
- $(meson_use selinux)
- $(meson_feature unwind libunwind)
- $(meson_native_use_feature video_cards_intel intel-rt)
- $(meson_feature zstd)
- $(meson_use cpu_flags_x86_sse2 sse2)
- -Dintel-clc=$(usex video_cards_intel system auto)
- -Dvalgrind=$(usex valgrind auto disabled)
- -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- -Dbuildtype=$(usex debug debug plain)
- -Db_ndebug=$(usex debug false true)
- )
- meson_src_configure
- if ! multilib_is_native_abi && use video_cards_nouveau; then
- einfo "Applying Gentoo hack for nvk - 2/2"
- sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja
- fi
-}
-
-multilib_src_test() {
- meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- GALLIUM_DRIVERS+=("$@")
- fi
-}
-
-vulkan_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- VULKAN_DRIVERS+=("$@")
- fi
-}
