diff --git a/dev-util/amdsmi/Manifest b/dev-util/amdsmi/Manifest index ad59f74c2a33..9468219683e3 100644 --- a/dev-util/amdsmi/Manifest +++ b/dev-util/amdsmi/Manifest @@ -1,3 +1,3 @@ DIST amdsmi-7.0.2.tar.gz 910310 BLAKE2B ea375b20019e7fdefc0c0f38444e52c0b56e8ef8a83897ce1a6c52f407521592862ca743110059b3a32043305fcde006885cb25d1a13124c41a4c5222c7e44df SHA512 4e57c53edb7dbb1337468c80071bc13439bf6257360f5b91fbec3d383bf55f22ce0327544c2a94b3a630de94906d8ed9e1f92177914fc6096eb22f55c773d4ff -DIST amdsmi-7.1.0.tar.gz 951519 BLAKE2B e7cb327cff76ab8be476b40dd3aecc8a116f067851eb38fdad1424a33d10de64bfeb3340a5626ebcb43417291ad95124f81b8114900cf2f72ef3a6a4d00a6adf SHA512 4c962a5d8fcd740b9d518545f544db5e1ff5b00dc432839f4ceceeb6e84db2d10ed2be1d9ceaf7a2be9290b3aef0e441ae10ebbe66aff1760cb19f6d52229cff +DIST amdsmi-7.1.1.tar.gz 959490 BLAKE2B 57c62c4ca2542cec50b59f522304cf6a8217ae0167466e400311ec052613241144cc9e82d0b3c82bea3cc737085ed68296e7069e6f0b9b98141f2f78c6c1a9e3 SHA512 87c149056415df94ff10b47a5c865edf185c0ad563a53fbe23545f5bf4cfbe75f3a56acbce3f53d4a79ff0f36c0e9ab1ba6650e5165f77f364aa694ca9057b2c DIST esmi_pkg_ver-4.2.tar.gz 463866 BLAKE2B 4d78fe94351623dad5a187133ad8d1be456c2477b69c0b6dc15b2d239b494c9f4011fe558e36a07f7b03b67daccf8bf03b92ea3502dc31ddc965fa9e28b3b49e SHA512 8a86eb84f86cada75232a800ce81f151bfe4b77f119a1a19189abddf8473e7b7f860594a206303277f708497e86db34af519e061e5ff3bb9d860b943c5781b09 diff --git a/dev-util/amdsmi/amdsmi-7.1.0.ebuild b/dev-util/amdsmi/amdsmi-7.1.1.ebuild similarity index 98% rename from dev-util/amdsmi/amdsmi-7.1.0.ebuild rename to dev-util/amdsmi/amdsmi-7.1.1.ebuild index 2bbf6049a075..76fd1f8c3da8 100644 --- a/dev-util/amdsmi/amdsmi-7.1.0.ebuild +++ b/dev-util/amdsmi/amdsmi-7.1.1.ebuild @@ -44,6 +44,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-7.0.2-no-git.patch "${FILESDIR}"/${PN}-7.0.2-unbundle-gtest.patch + "${FILESDIR}"/${PN}-7.1.1-libdrm-compat.patch ) CONFIG_CHECK="~HSA_AMD ~DRM_AMDGPU" diff --git a/dev-util/amdsmi/files/amdsmi-7.1.1-libdrm-compat.patch b/dev-util/amdsmi/files/amdsmi-7.1.1-libdrm-compat.patch new file mode 100644 index 000000000000..3e08e3a2e719 --- /dev/null +++ b/dev-util/amdsmi/files/amdsmi-7.1.1-libdrm-compat.patch @@ -0,0 +1,22 @@ +Fix compatibility with x11-libs/libdrm-2.4.130 + +Bug: https://bugs.gentoo.org/967246 +Upstream PR: https://github.com/ROCm/amdsmi/pull/165 +--- a/include/amd_smi/impl/amdgpu_drm.h ++++ b/include/amd_smi/impl/amdgpu_drm.h +@@ -1625,15 +1625,6 @@ struct drm_amdgpu_info_uq_metadata { + #define AMDGPU_FAMILY_GC_11_5_0 150 /* GC 11.5.0 */ + #define AMDGPU_FAMILY_GC_12_0_0 152 /* GC 12.0.0 */ + +-/* FIXME wrong namespace! */ +-struct drm_color_ctm_3x4 { +- /* +- * Conversion matrix with 3x4 dimensions in S31.32 sign-magnitude +- * (not two's complement!) format. +- */ +- __u64 matrix[12]; +-}; +- + #if defined(__cplusplus) + } + #endif