diff options
Diffstat (limited to 'dev-libs')
81 files changed, 1982 insertions, 290 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 27f9db258bc5..4f2b4696c924 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/hipother/Manifest b/dev-libs/hipother/Manifest index 2fd946779c9a..27e4a15a942e 100644 --- a/dev-libs/hipother/Manifest +++ b/dev-libs/hipother/Manifest @@ -1,3 +1,5 @@ DIST hipother-6.1.1.tar.gz 33496 BLAKE2B 026967cb298a888df441d543d70478836036b81dc26c8284410076daf18eb28dc42f7d4b6aaf2bfaa8b6c957ada8244afc0e7c40882c0370bc2b6a0ae94ffaf8 SHA512 ca4d5df9e3138e845be051aace8fb02d84b879439e6bc9ca1551853f80f54b554b9cad1a91c6c114160b21d3ca62fa47a88e32efe60c0f475ff8b56f7f18b5d4 +DIST hipother-6.3.0.tar.gz 37660 BLAKE2B 8af74369c769750575d55c7ab152af32f6b8ce06f65247fb1390900427c0a24282b4681dbd65e36241262423a793af48b432fc252d0fad5ac367c25f242e1865 SHA512 3bdd70e6ef34aeb51c7d973f73cf3b761016659892c57719cc85d123e8212e4510c5d799563d20cea9de441e983ed148900c6656784a0cc28d0f67c4ea91c99e EBUILD hipother-6.1.1-r1.ebuild 526 BLAKE2B 7cd2158e5ce40377f12b3fcfae7b6e643e1291ab8db0140683cf951501e8c6fc6f41209f35fcc6767606454bafe75a7078e401ec63b7d7264c5b4295d6372cf5 SHA512 da00f3a364015cc29508b51dbb7cd3533854ecd13ca300826738c50e9264a3e16131d7ccc5ad5b86f98b125a469b659fb5eb4b3bb293a2a82e92cea08a00db39 +EBUILD hipother-6.3.0.ebuild 526 BLAKE2B 7cd2158e5ce40377f12b3fcfae7b6e643e1291ab8db0140683cf951501e8c6fc6f41209f35fcc6767606454bafe75a7078e401ec63b7d7264c5b4295d6372cf5 SHA512 da00f3a364015cc29508b51dbb7cd3533854ecd13ca300826738c50e9264a3e16131d7ccc5ad5b86f98b125a469b659fb5eb4b3bb293a2a82e92cea08a00db39 MISC metadata.xml 415 BLAKE2B 20cf4a7c600ec912dbc5e93a8908f17cb463c3ab4d661023ff6b771f6d97308b075b5bd52e4bdf9d4ed7fb6c1d570c59decc410dba3310ce78f623c5938f5174 SHA512 6020bf53a35b25587f80d0aa10f4d2c047c13726171b570efd56e282387adfd84443fd5e565603fa96e0c64a965151a4afcdeb19c3903b4ec3949739a4c887e7 diff --git a/dev-libs/hipother/hipother-6.3.0.ebuild b/dev-libs/hipother/hipother-6.3.0.ebuild new file mode 100644 index 000000000000..8160512df6a2 --- /dev/null +++ b/dev-libs/hipother/hipother-6.3.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="ROCclr runtime implementation for non-AMD HIP platforms, like NVIDIA" +HOMEPAGE="https://github.com/ROCm/hipother" +SRC_URI="https://github.com/ROCm/hipother/archive/refs/tags/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/hipother-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RDEPEND=" + !<dev-util/hip-6 +" + +src_install() { + insinto /usr/include + doins -r hipnv/include/hip +} diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest index 866c00ae8f36..30cb4a472bfa 100644 --- a/dev-libs/imath/Manifest +++ b/dev-libs/imath/Manifest @@ -1,6 +1,7 @@ AUX imath-3.1.11-fix_cmake_module_export.patch 879 BLAKE2B 95ad45eb5011fd24517e510146475c6fd2dac6523143895f6898104f55ba8f178e7531ad5b156069a08ae516644908eacec51ba5d00675a2e3b95900acd270ca SHA512 c1a38c070ae714fc4fcc33f949b4e5dd371221bbad40210b92ae768cb8819cd5142ff8ce4540d808845e38b6f00418108393e2391b46d6aced65042b595fe8e3 AUX imath-3.1.11-use-correct-boost_python_version.patch 522 BLAKE2B 4522dd6d3911b0593d7300e01108f35cc05759e8a59f6ab7f438234632bcd5d12894e9fc4235e3fa970a4b365e9f7db4cd09e49520dd8b4a4c6b5adbb7186c0d SHA512 dd2d1ff0c7d4fe2236621ea80bcf12697c5398af40b59f1a2631f7a78ffbd2df91337d3f31ad6e50b5631b31c26b23f43b346429e440bb56d465ba84167c4da1 DIST imath-3.1.11.tar.gz 596585 BLAKE2B d5fc8d7607070bc96619e74eb67c60048695023c1baa715e3ab5de84a49bf1f7381cc19e3a047b75f8520e20a9976c58503b2063feb2add7b6dfcc7c73e13ad7 SHA512 0bc86bea3a2aca89d02b501b4fba3c13ca861e914cec558e820fe9e4c43ab14cac34e31ff278b8c35b5fe76f7bea32f2c8105c0d33eb92224eb23d42d7a402e9 +DIST imath-3.1.12.tar.gz 604232 BLAKE2B f11cd2ac2e8ba9df36b2401083088e5603980b45ca36b7b89348a5b87af99cb89de39154e9d37a0d0ef505a06d270f087f96dbc6bca3d4349e03840f34915bb3 SHA512 32628dfcacb610310b81ffe017a66215cf5fb84c2e0a6ac8c94a68c048be3d2b97eb57965dd253770184d5824cce1e5440b8eefb2834666b273b3193ff108343 EBUILD imath-3.1.11-r1.ebuild 2035 BLAKE2B 033a7f8b77107591add2fd659fa6277668b750bb35e9923a26f887fb515ce267663b59829b530aadf162bd225a560ab2bece11efdfc5925065ca14bb8f8e8cd0 SHA512 ce374ba19fd50d74e836101e8a957a4b8d7ce1530516c50ecf11d11ce8bc0382813e78862d2fd9b18f4c3a6e7f9713b87c092582bc7224aaaeb02f451932477c -EBUILD imath-3.1.11.ebuild 1893 BLAKE2B 3b18f7907dace4eeeee2995250ee51ff55cee60fa849b7bd043b504af2fbdd937973ecc7d8c19901eefd070cf811b340ef4ab1a5b39a85b7d274d6122b912435 SHA512 173f7853ec138aaf811a86944d757c353cd9005e15a7bd1e55351d4278b5d3735e2f8733fd3a96bf0ea8fea74e671e592d978c65472df0b2fa6a806a4a454f13 +EBUILD imath-3.1.12.ebuild 2038 BLAKE2B 09ea5ef7e15a685a453cce8e9a3e322a4d24302a43eac42ba2727c147eb80d7c7e218512acb64c4907f7934cc34c1eb7aa792a4f49ca23d4652ad20eedcf7277 SHA512 625d909187b0d3dee441c265c24b9e682b775f1b769707f05ccbaf2290d3c498feed406be5e788113b0b4dc57bf65d0ea434ee8e75a6fced30b7438dfa8551f0 MISC metadata.xml 821 BLAKE2B dba5ad76f16ed8f83cfde2ce90eab3a0aec0a86e1f34d55e4728b212febb007c45b4af90ee27bce4ae7a144e26dd3f90c43b0e84a8929883a8e03d6d2f24ed00 SHA512 af62fc3e361ff228c9a50211c0be2c05d100b4fb1fb279fa42b8aa97d8f23f305f67ba20c3fc1c6abfe46a8605993e1e285760b62008c266342792963f9f4602 diff --git a/dev-libs/imath/imath-3.1.11.ebuild b/dev-libs/imath/imath-3.1.12.ebuild index 79345be46be9..3a1960478263 100644 --- a/dev-libs/imath/imath-3.1.11.ebuild +++ b/dev-libs/imath/imath-3.1.12.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="BSD" SLOT="3/29" -KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc large-stack python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -47,14 +47,19 @@ BDEPEND=" DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md ) +PATCHES=( + "${FILESDIR}/${PN}-3.1.11-fix_cmake_module_export.patch" + "${FILESDIR}/${PN}-3.1.11-use-correct-boost_python_version.patch" +) + pkg_setup() { use python && python-single-r1_pkg_setup } src_configure() { local mycmakeargs=( - -DBUILD_WEBSITE=$(usex doc) - -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) + -DBUILD_WEBSITE="$(usex doc)" + -DIMATH_ENABLE_LARGE_STACK="$(usex large-stack)" # the following options are at their default value -DIMATH_HALF_USE_LOOKUP_TABLE=ON -DIMATH_INSTALL_PKG_CONFIG=ON diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest index aea9e3a221e6..725284c3fc30 100644 --- a/dev-libs/iniparser/Manifest +++ b/dev-libs/iniparser/Manifest @@ -4,8 +4,8 @@ AUX iniparser-4.0-out-of-bounds-read.patch 330 BLAKE2B b60d6a3a514d5e5704e2a97c6 AUX iniparser-4.1-CVE-null-getstring.patch 1667 BLAKE2B b6fa1285106d77167a519cd5ce378c7aabf506da64b9a72b37776c63014e5fd96df9ec426b7ce59293c7162e7086151cb9f56d7dc37b02914e6758a06f67ae05 SHA512 72152482e45792bf3a93302f700dbfb799265b07ad767986b06886cf4b3b353c76ef8cce454548ec5fbbdd7c0a21d66b67604df0753e2270a928d9410263be75 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968 -DIST iniparser-4.2.2.tar.bz2 32649 BLAKE2B e4ab230ca1cde6a0322e05aa483e3112e324903c65e1f22640e17a7696ac30a4eef66c1bb449ea730b9a0caf55091b425fafb9d1514fbf7bbd21d7ef4503147e SHA512 a9b0d4b80a4d4faeff4ec5ae9f0de8f0d4e1d6244dddfca7c3ef9bb188fcb0c3bb288478632145232fe52073cd0714abc0ad12a1cca4e3936fc40a3fba357601 +DIST iniparser-v4.2.5.tar.bz2 34574 BLAKE2B 47eeffa4f441d491c153717df5b713e56181e090509b4496e9768b7f4654970b9cc6f261f9c821afbd2769b194a5742f82d20fc46471c92577bcde5ad350f989 SHA512 db7ebab3336bf9854efc9a70784762b1917da616d4c1f5e6c2409b238dd967967c196df85f444c1d21732dc47d195ca044a93ae2b0d8d556fe150e7dd1b78d64 EBUILD iniparser-3.1-r3.ebuild 1072 BLAKE2B 076bfca31d21e39c0a1d04f8acf4719f4330aaecfce3d518f57ff5f0009d6aee4542f1357a2ae408720a691969bdcf193bd2ec762cec9ec17c00bdd5665d595e SHA512 c7c10d21b87c1d5818827f4d91152edc2a963311aa202bfde6001de6f6b95c48386373a01d7b413bf12d66a41402d665a79abdf029c62614a4a26efbe84c22a9 -EBUILD iniparser-4.1-r1.ebuild 1552 BLAKE2B ed547be536464de94d9e5daefe23e2fc0002ea008619a45b35596ac9e20ae5cb717c1f0edab19e62cbdb15227f18d4d320907f143b757bbf3bcff109d963ae86 SHA512 4fe78bba33ddb8b996c803370bfdec8bf1596577d8f538d381a8d64358dc22779a4541f939caf9b8af47a5de6c8c2682badd8ded68f29cb00d147dd8982edd40 -EBUILD iniparser-4.2.2.ebuild 735 BLAKE2B 5ae2b900b3dac248a9b7491c03b06152e326952ee6d68bc881804663f1ff8247dfea60a26812ab2e745622348c3e7ddc79488441557e2ada25dc9d73e8538ee0 SHA512 9cfdce56969ea267e0ae28eb3fd750b8d1bf1efb2c8fe823164fcc3e6806e68c4782eec264f941e36aa32e63137b0e1e4bc46604cbef648a3ccffbd1de54b0ea -MISC metadata.xml 328 BLAKE2B 5834eb26492d90029b89305c0b67ee37ee5fd22d278db82ffb7aa9eae288e3b58288fedb58a098e4af630691a28d2fe526b3616b925d99348fbfe552b8367ecd SHA512 d58da8c837e20e942b315aca53c8d1192a65c3edc8ce0d0afdf731d0ef0ded83d6b56efd592e282afe9f0fe5b03d6bbc3e973b1bf155f7b4f6bc24e95c0082d3 +EBUILD iniparser-4.1-r2.ebuild 1112 BLAKE2B c18f4e7fbceaa5302cebc294f18e9b27767aca43b92c882723a8705c1d61083a36d81a54139a019e832f04db9738bb729d2eed18ce89c02521514bf79f3c3d88 SHA512 ee5952a2519576a15632e5aaa5afcbe0b943a0d5166d473fcb03fb10efdf57ce2a6333d10d60220fa8708064de0d3fdd36be2df73cbeb5de34797427980d353b +EBUILD iniparser-4.2.5.ebuild 847 BLAKE2B ef5fced6471c17887cb182b3f31061f5f6bcd3a23880e0f64996f9560d73f27779a2370b249493898b699fd0826a1579394a4beed605d5fc27dd331d65383be9 SHA512 fdd3af5a6bfdeb36c28f981cedd25d0f8ac3c55a1319d57b1144a401df2166ea66ee51b366ff0c35071ec4246f48ddae6104788aeae0047d267b82acc9bdcb2d +MISC metadata.xml 330 BLAKE2B 6ae3eaf3992b63f57e0c2a5cb863502e5a2a91f0945f05e344852f58c8b7eefd1657444e7ba32f11a06cc782f168666f90d45bda6c490a1704ddeaace373e315 SHA512 05108493932293e676d7079061f6484831db6d904d700be9350846641b8f9cc684e06fa3c4e7bb101ef9ca3180497643b72295024b50e4e8d5393bbd0d5d12b8 diff --git a/dev-libs/iniparser/iniparser-4.1-r1.ebuild b/dev-libs/iniparser/iniparser-4.1-r1.ebuild deleted file mode 100644 index c47f61626075..000000000000 --- a/dev-libs/iniparser/iniparser-4.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A free stand-alone ini file parsing library" -HOMEPAGE="https://github.com/ndevilla/iniparser" -SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc examples" - -BDEPEND="doc? ( app-text/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-CVE-null-getstring.patch # upstream, bug #907928 -) - -_newlib_so_with_symlinks() { - local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" - - newlib.so ${source} ${base}.so.${current}.${revision}.${age} - local i - for i in ".${current}" '' ; do - dosym ${base}.so.${current}.${revision}.${age} /usr/$(get_libdir)/${base}.so${i} - done -} - -src_prepare() { - default - rm -r html || die -} - -src_configure() { - append-lfs-flags -} - -_emake() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \ - SO_TARGET=lib${PN}${SLOT}.so.1 \ - ADDITIONAL_CFLAGS= \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake -C test -} - -src_install() { - _newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0 - - insinto /usr/include/${PN}${SLOT} - doins src/*.h - - if use doc; then - emake -C doc - HTML_DOCS=( html/. ) - fi - - if use examples; then - docinto examples - dodoc -r example/. - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} diff --git a/dev-libs/iniparser/iniparser-4.1-r2.ebuild b/dev-libs/iniparser/iniparser-4.1-r2.ebuild new file mode 100644 index 000000000000..d48fac06d4e7 --- /dev/null +++ b/dev-libs/iniparser/iniparser-4.1-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Free stand-alone ini file parsing library" +HOMEPAGE="https://github.com/ndevilla/iniparser/" +SRC_URI=" + https://github.com/ndevilla/iniparser/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="MIT" +SLOT="0/1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples" + +BDEPEND="doc? ( app-text/doxygen )" + +PATCHES=( + "${FILESDIR}"/${P}-CVE-null-getstring.patch +) + +src_prepare() { + default + + rm -r html || die +} + +src_compile() { + append-lfs-flags + tc-export AR CC + + emake V=1 ADDITIONAL_CFLAGS= + use doc && emake -C doc +} + +src_test() { + emake V=1 -C test +} + +src_install() { + dolib.so lib${PN}.so.1 + dosym -r /usr/$(get_libdir)/lib${PN}.so{.1,} + + doheader src/*.h + + if use examples; then + docinto examples + dodoc -r example/. + docompress -x /usr/share/doc/${PF}/examples + fi + + use doc && local HTML_DOCS=( html/. ) + einstalldocs +} diff --git a/dev-libs/iniparser/iniparser-4.2.2.ebuild b/dev-libs/iniparser/iniparser-4.2.2.ebuild deleted file mode 100644 index 338c713a9dd4..000000000000 --- a/dev-libs/iniparser/iniparser-4.2.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A free stand-alone ini file parsing library" -HOMEPAGE="https://gitlab.com/iniparser/iniparser" -SRC_URI="https://gitlab.com/iniparser/iniparser/-/archive/v${PV}/iniparser-v${PV}.tar.bz2 -> ${P}.tar.bz2" - -S="${WORKDIR}/${PN}-v${PV}" -LICENSE="MIT" -SLOT="4" -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc examples" - -BDEPEND="doc? ( app-text/doxygen )" - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCS=$(usex doc) - -DBUILD_EXAMPLES=$(usex examples) - ) - - cmake_src_configure -} diff --git a/dev-libs/iniparser/iniparser-4.2.5.ebuild b/dev-libs/iniparser/iniparser-4.2.5.ebuild new file mode 100644 index 000000000000..019cee487407 --- /dev/null +++ b/dev-libs/iniparser/iniparser-4.2.5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Free stand-alone ini file parsing library" +HOMEPAGE="https://gitlab.com/iniparser/iniparser/" +SRC_URI="https://gitlab.com/iniparser/iniparser/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" +S=${WORKDIR}/${PN}-v${PV} + +LICENSE="MIT" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples" + +BDEPEND="doc? ( app-text/doxygen )" + +src_configure() { + local mycmakeargs=( + -DBUILD_DOCS=$(usex doc) + -DBUILD_STATIC_LIBS=no + ) + + cmake_src_configure +} + +src_install() { + local DOCS=( AUTHORS README.md FAQ* ) + cmake_src_install + + if use examples; then + docinto examples + dodoc -r example/. + fi +} diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml index 1c90e38bac72..7f7e9f7f07a5 100644 --- a/dev-libs/iniparser/metadata.xml +++ b/dev-libs/iniparser/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>samba@gentoo.org</email> - <name>Samba Team</name> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> <upstream> <remote-id type="gitlab">iniparser/iniparser</remote-id> diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest index 066efe40277b..ea6610f5abcf 100644 --- a/dev-libs/ivykis/Manifest +++ b/dev-libs/ivykis/Manifest @@ -2,6 +2,6 @@ DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6 DIST ivykis-0.43.1.tar.gz 669621 BLAKE2B 12ef9aa55f2e07540b265eb2f19eba6436abb5c0dc333b10db3a3918b6cd4cc851191c12782b92f1c2c50b9d761bb2124417823dc19b557f6d3392cea86d4fe2 SHA512 d8c16dfa4b9da419b09fc45315aa930163c55bee1f0e1e630994332783527eec4929a60e75a1866408c666a6f4e2451bbd187d524f2e50179899f71e3bff916c DIST ivykis-0.43.2.tar.gz 669628 BLAKE2B e19a2c1df3751f83858337b72529b72344d74f675fc65012c5c77b5a9dbcb91d58fea43138dd21c3e09aa94ad971404f50986d8064ec968770eda2c517d55e02 SHA512 58aefe38e32f301c38568613439a5177470bdc5b6240ec3de93c35752b34ff4d839d036ee48764e8e1cdc53d8a1138cc69947b8857349601316081c0aee66caa EBUILD ivykis-0.42.4.ebuild 672 BLAKE2B 585dc80a992ffd4494252f463bbc46deaef783975bd591753a4aecb46a4c7529e1d2c331d5b26004e9707c42492d503f246084ed2f9c9b96194be22f9a4be22a SHA512 fc712b05118dd5e41dde9066bdfc5f5a1e40706b21680efa4490744632531ee7dfac0e7b27e7a4486b40ca5766a7d751ecbb632ae9953cf01b9cfee613508d54 -EBUILD ivykis-0.43.1.ebuild 673 BLAKE2B d21caed5d58d714f56c504b64bfda8f0f94e5add8a2d1a78d1dfce4085e60b3cf211e6544768738ad4e878d6d6f4553919d93e84e1ca93ef529f61a45f0d5c31 SHA512 3f16760da7204aa0ed1b30483bf46cdb109df0a54c5f7ff7e0bbcb398ed2eccd7f375370e907240c222c0f784d7927ca0721a8825abb3f6759765380d30c2dd2 +EBUILD ivykis-0.43.1.ebuild 672 BLAKE2B 72d361a6650812c72643d2aef3f9973dc52ce6055d14d5a560e1dddcc377bcb558aed64cc57ffd2be96c01d49ed16411d5059fc1853dc92ac61e554b850d76dc SHA512 520d4257cd4edda0773ac3e4fbd617b0c1d128c4c102becfba7047a603ef5db8d8ad2229e60712a66b49af68858e6658d730cc53f496cdf42f277fc81ddfce8e EBUILD ivykis-0.43.2.ebuild 680 BLAKE2B 28d5602d061309202376ee90925517bc27637900adafc3f8175810fb08996b1b7784351d5a3f990d6d286475b24c3d46fa2e7b662e7e913701155c6ba317eaab SHA512 b88020f230bf2c76e905bdd5ad31ff16a5e6104433a192e3503b05c07563bce7c1aac47d83c8bbc872d75980b7abcec97d2d0c73cf8ad37d7e7242feb86d25ca MISC metadata.xml 493 BLAKE2B f3a4be026ff907ab931e8c505b4ec77dc8fe96c9d2dee371ba2cfedf01fcf53dc8b0b85424a97b2920a12acf61f3b1994a9e63f047dbc80f7e46c7d1b8aa0c5b SHA512 cf92824a6e84255663ae6921b9e35641e2e7506972c7e0512cf41e599e62b700c411f3774ceb86a205a600596d80168193a4761473acccb33ce84bbc1ca3ee3f diff --git a/dev-libs/ivykis/ivykis-0.43.1.ebuild b/dev-libs/ivykis/ivykis-0.43.1.ebuild index d1ba67d173ca..2c8a7d9d5b12 100644 --- a/dev-libs/ivykis/ivykis-0.43.1.ebuild +++ b/dev-libs/ivykis/ivykis-0.43.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="static-libs" src_prepare() { diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest index 3ab803ffe8ba..da89aa6d5c4f 100644 --- a/dev-libs/libbpf/Manifest +++ b/dev-libs/libbpf/Manifest @@ -8,6 +8,6 @@ EBUILD libbpf-0.8.1.ebuild 1147 BLAKE2B c0c10714096db810d25692acad787234592c5bba EBUILD libbpf-1.3.0.ebuild 1238 BLAKE2B 6926e0e5225dbd7309c2a798ccc1363dd44b0241ea53a386a85866ba6e5f1d349a677de4f6aab03baff1da5bc8d7a652e4da435041f12a403d98a58cccb1a9e4 SHA512 9fb7caf6e30f9ba9883e23fb5eb046132a8daa539672929e3512bb01363ede70a03ff3707f148ec420360774ba6f92230422a1e5e351568c6675c2f75ef4a787 EBUILD libbpf-1.3.2.ebuild 1251 BLAKE2B fcbc494ffb33028e683620340d5ccbfc95d3fc42808fb00efebc004803c837d229fd64457049ba7c727de9713861c3b7c18828010e720771ded5067e9dadd3e1 SHA512 113e2ad470ef92e461e7a3b7c9a2627858b68bae74211e2bb5c521a80c47873da6d287b3e6bf4a4e8d6c3b6485044b2f9e61b1a51ec4e4831aea1c7640b67630 EBUILD libbpf-1.4.5.ebuild 1245 BLAKE2B fe06e9562cd6074fab001cd94d80be3659d2c4417cccb532110975804b0f54efa3780dee048d3db16b28f73924acd9f3c4d267511e63274ad03b3af527a01fbd SHA512 71496109f10c43b4083d8e13d547fa049319d4c4b59941696b3ac7fc9b43c71217fc15014b5964b9eacd36330c9c38986fd2a608028656411f687b56abd4e9e7 -EBUILD libbpf-1.5.0.ebuild 1251 BLAKE2B fcbc494ffb33028e683620340d5ccbfc95d3fc42808fb00efebc004803c837d229fd64457049ba7c727de9713861c3b7c18828010e720771ded5067e9dadd3e1 SHA512 113e2ad470ef92e461e7a3b7c9a2627858b68bae74211e2bb5c521a80c47873da6d287b3e6bf4a4e8d6c3b6485044b2f9e61b1a51ec4e4831aea1c7640b67630 +EBUILD libbpf-1.5.0.ebuild 1250 BLAKE2B d0604773008dde90d14f6a202b4cece3a80f4389837cb5a99f0b75a3ada3de5ff86d496a59b57d48bee7adbb41234b394d67754518ceb1bc9adeef7f3255fce0 SHA512 eb24ed0f2f72a77ec0e077945fb04a282ab4915e50ead1bd1894b4d9de19fa43ee6a217cfdb47e91bae4f419cc16fc0abf4c86e0eab9ecc34c12116c1999a370 EBUILD libbpf-9999.ebuild 1245 BLAKE2B 1706a684e48f10e12cf3cfa6d8f809e8197cf8464c6d266425c2d7b501cb8130aab346eb5b006dfc5399a4e03d287b5557c5770f73e94d0cabc608ebba04d437 SHA512 fe39c6714dd55685b00d3db971d29f2bea386f0ac398cc9b503c2f04e5740fef4b3100a2003c4726fc2c0064a25d4e5fbed1f05a5154bcc739cd6cb65defefae MISC metadata.xml 306 BLAKE2B 6af2288a09cffb8801efe6841d11dae5e8f3659dd75be45f746bab3f48686458916dab796fd9d535e1a6fa0ca78567e8227e29ef06cc22c4a9d0b1cbebd30ab0 SHA512 c027c14965069ece90130984bab710dc19f199a184e834666449f4bc0874de3b5f5d878f3a1fe6f817a85eef2bc45914e640f0140878b7454a32738a7f500032 diff --git a/dev-libs/libbpf/libbpf-1.5.0.ebuild b/dev-libs/libbpf/libbpf-1.5.0.ebuild index 9ff1eb278ac1..85766b0dcb76 100644 --- a/dev-libs/libbpf/libbpf-1.5.0.ebuild +++ b/dev-libs/libbpf/libbpf-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2024 Gentoo Authors +# Copyright 2019-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi S="${WORKDIR}/${P}/src" diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest index 723d902ce4e2..2df99432ba5e 100644 --- a/dev-libs/libfmt/Manifest +++ b/dev-libs/libfmt/Manifest @@ -5,8 +5,8 @@ DIST libfmt-11.1.1.tar.gz 701999 BLAKE2B 1641265c8e54955ad0d005f935a87dccd2ce098 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be EBUILD libfmt-10.1.1-r1.ebuild 756 BLAKE2B 7b9b751d1d24459b2762c9f6ea8b6a2abab08649911e64ea074572cd9644d2eb258436b495566e77b1568c1c9c30f884fb3c09745d1a473f50ec5f4549d79f49 SHA512 75e81ec568882933f0ebc7aea59f25c5331b0ade5f89d926b1e96231d233ed12c5bb0c7e4ed51d5d93863b5f7ddbdd0b5d82285feea70d6c9e9554c80af3d923 EBUILD libfmt-10.2.1-r2.ebuild 787 BLAKE2B 2af8fae57e10abe207cb1dd31f80d995ff54cf89147220d327a0df3cd8d801eef479e767b9711b2a819e666995e2c932fea1af2d50168e62b3fd2e1f24130bdd SHA512 70bc875129a415f915103903181b57150cac24de0f268afba1f418b2c9d1c754f660db29ba43b0c0044292439d1777892f161f9c28cb97b552e2e5a42936dc17 -EBUILD libfmt-11.0.2.ebuild 783 BLAKE2B 6b898c78e2cc9adf548fb937888847c8d4ca4108e68656d21220581b0660e1cb9b848bb12abb7cb172a80620c134a190d18d8a56c9d76f0a639350036db7f5b7 SHA512 72d59fc3fa8a8fe5f5bbbee5578e4f5bf3b1f6df86ce6f1486bfc2c05664a88a5327480dded05112b0d38edc0c5786d515309ede5631cb95747eb517c545b0b4 -EBUILD libfmt-11.1.1.ebuild 787 BLAKE2B 2af8fae57e10abe207cb1dd31f80d995ff54cf89147220d327a0df3cd8d801eef479e767b9711b2a819e666995e2c932fea1af2d50168e62b3fd2e1f24130bdd SHA512 70bc875129a415f915103903181b57150cac24de0f268afba1f418b2c9d1c754f660db29ba43b0c0044292439d1777892f161f9c28cb97b552e2e5a42936dc17 +EBUILD libfmt-11.0.2.ebuild 782 BLAKE2B ddaaabfa59085a3f29c3a8a1957e9066cdf27cf7033ebef1d38c3e854059b31005c350687d7e63a59e21af086d96995b93918997f96fb70de088774255f8f02b SHA512 3f0f05c48859b539bea3461fca24017a9a4d271a6fd0a46692fef7b55f47a34da2fc73a200a5781e613d9b9d716ac1af9858d9471a27ac0ab62e14405fc5534f +EBUILD libfmt-11.1.1.ebuild 806 BLAKE2B 5e933f2a4e9384449a67e7a25a7b28274046e12190e26fccf1b2eeee0724450bf5a9a9beea7e8bfaff4c275a9e7b6a658e62e1f5df3527d057599a653620f77f SHA512 e9f983d6a5f0cc7563e8bd366dae6abe094ee41b6c8fcdafda8e8dcfd93d209f0068d28025248753a5a11cb4af29aa7f754b2db6e4e555631866ccdb0ca76797 EBUILD libfmt-9.1.0-r1.ebuild 750 BLAKE2B 3d15e8e04f952fbe6cb1ace2e81d297089035e06a6897993a2035d5b47bc0b003730964d8fe02ce2044ca13536a1174dd41a333a6eab9f541dd2d187bc17c63b SHA512 018f72730e4ba3be606a08b8cdc502b6b05f6c5e312ba8119f97c3f1627dbd2eb1af4e923a875bdcb04528bb7bd806ec54b42312c1693841175a7e5a26ecc143 EBUILD libfmt-9.1.0-r2.ebuild 774 BLAKE2B 6c448a68faae1164ead818dec1355c01b7ed7b5fac3984409acf9e9961af9ecc74a8a79651cabeeddb1dc5318dae99965e8c3f94d6883f8773fb21cfd0ba7a92 SHA512 a0e77a6c32de7f7ebfa8c88ca234cdc83c20d9612af7a16ea5b1752fb065bad91c7d5e867ed2a46794444f86384fdda82d43fb18e831f36d9e9cc16171d1760c EBUILD libfmt-9999.ebuild 787 BLAKE2B 2af8fae57e10abe207cb1dd31f80d995ff54cf89147220d327a0df3cd8d801eef479e767b9711b2a819e666995e2c932fea1af2d50168e62b3fd2e1f24130bdd SHA512 70bc875129a415f915103903181b57150cac24de0f268afba1f418b2c9d1c754f660db29ba43b0c0044292439d1777892f161f9c28cb97b552e2e5a42936dc17 diff --git a/dev-libs/libfmt/libfmt-11.0.2.ebuild b/dev-libs/libfmt/libfmt-11.0.2.ebuild index 23eca76d4363..e889642820b6 100644 --- a/dev-libs/libfmt/libfmt-11.0.2.ebuild +++ b/dev-libs/libfmt/libfmt-11.0.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm ~arm64 hppa ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}/fmt-${PV}" fi diff --git a/dev-libs/libfmt/libfmt-11.1.1.ebuild b/dev-libs/libfmt/libfmt-11.1.1.ebuild index da45c0e71554..08b4876431fd 100644 --- a/dev-libs/libfmt/libfmt-11.1.1.ebuild +++ b/dev-libs/libfmt/libfmt-11.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" S="${WORKDIR}/fmt-${PV}" fi diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest index 1882ffd51ce0..009ec288f6a5 100644 --- a/dev-libs/libgit2/Manifest +++ b/dev-libs/libgit2/Manifest @@ -4,6 +4,6 @@ DIST libgit2-1.8.4.tar.gz 7610171 BLAKE2B 5a6fd422bba7f65b220b0c98bb851f79ec7d61 DIST libgit2-1.9.0.tar.gz 7660744 BLAKE2B c81beab379bd78a66d28a48600527979a6c51d33f946df1f996f52ac274cadc88f7afb8c90683f584300941a214bc69389412fb6c9be3b48d22c708b41ca0e1d SHA512 38547ace676b933a3146c2a00405fc6815063a7af923b9f2c09c536ec717be77d19c513b383939054913ce617d7917c100a5cbd3378d101fcdb5eacd1d14f687 EBUILD libgit2-1.7.2.ebuild 1649 BLAKE2B 0eae55b662f2f6bf26d51032e67da956b43aa32411ed9ef6fda13bff21f259218625df41482fb52057382280e8f70e4ef93b225db00319b27f0d825ad96cde1d SHA512 8badba9710a974eada587d36a16939e0027bcb6d05435ae1d5fa4336c0955e0c721e39ac0bc40b5e798237535f1446c1c13f272f81ec5b973696a3a3f85efd2a EBUILD libgit2-1.8.1.ebuild 1575 BLAKE2B ee289fb92268a9fa7267626df4651552cbb8d0487610aa292cbba5de8afcb54a16f6b68ff4ea2a8c4dc070fea29691359d54fc45e5243bc5c24f1584ddaff420 SHA512 dc7fe7e6dd8844acc2846f4adf55642949fe62c2c7897239a4764ad2284c60bdb14a10c1d87ab1aff615e064755297aa61b1e18ba9c6014a7a784353fd2c8f71 -EBUILD libgit2-1.8.4.ebuild 1558 BLAKE2B 7c7c6a70f718d8efe4a8b7530f0ec11af2a63a7362eef5cee6f7cbafaf97e89befe7f03a264f2c679a5ae8898a78c23fdfc47ea1dbfe46b683b522c120293bb9 SHA512 2bb3dd65e459898fccb604cb5e25594a889c3c0383ce3b9ee22440fbe3956d5db55f13d1b1cdaa6a5e38b56588886135460ea0a07ceb93e32760285dd3e07871 -EBUILD libgit2-1.9.0.ebuild 1570 BLAKE2B 70a5b29e6737976731c225874eda0425b1962c5299c7cfea861634ad0e55e16c6021c08855df5a478d201e4db4488add060d3dfcfb3cf61442eb6f41153afc7a SHA512 a9292333a838d38484f6a87930a251880aba01cb0c2c923f132759a94668dc2ce776aad1ca190742e84df2c081cc2bc677237dce4611c14c57b4f6cebf6825f7 +EBUILD libgit2-1.8.4.ebuild 1565 BLAKE2B e6fdc32a9e7db73980bea242bd7ed73cd581a96fd60794fc387423302200d2b3481e9c7ab4a64a6ca4c6559eb8353fb91fa4d06734c03da9dd50cbe7444b127b SHA512 6f44eb7651b86561d2a669506ef4e5a281cbe3c5a0f2f5a56ea39971e3ffc95b248b52cd6714a8dbbd5a4e3bc10058233b8dd6f5a78c7d1dd6af4bbb460479a8 +EBUILD libgit2-1.9.0.ebuild 1577 BLAKE2B 78d1de85eda7cae4091a6330450fe120325bd82d03b810934dee663be86f21d37acee5d728d62990630fb5e1e27d61aa39a3ccc896fd248ebe09aea1616c727f SHA512 8864e3957a5f84f6c08df41113ad4ccde3966b4fd9dc8ece7d5a7542bb2ed55401213a53767bb6cb2442e97f22dc6bf028c0a355580247d5c6ec2598b2fda778 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7 diff --git a/dev-libs/libgit2/libgit2-1.8.4.ebuild b/dev-libs/libgit2/libgit2-1.8.4.ebuild index 6fd39616baa4..3a6f70228408 100644 --- a/dev-libs/libgit2/libgit2-1.8.4.ebuild +++ b/dev-libs/libgit2/libgit2-1.8.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="examples gssapi +ssh test +threads trace" RESTRICT="!test? ( test )" diff --git a/dev-libs/libgit2/libgit2-1.9.0.ebuild b/dev-libs/libgit2/libgit2-1.9.0.ebuild index 2633d8d6db71..e67a9617a728 100644 --- a/dev-libs/libgit2/libgit2-1.9.0.ebuild +++ b/dev-libs/libgit2/libgit2-1.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="examples gssapi +ssh test +threads trace" RESTRICT="!test? ( test )" diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index 66ddc2774947..84950cd7e7fd 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -1,5 +1,7 @@ DIST libinput-1.26.2.tar.bz2 824312 BLAKE2B df463f377cf2f246f6b5b35bdc69039830b4eb5b836a8df9698330140b1bc4b31c7dd50d8ffdec7c935e8b14909d98436ce8f1f9a6d0120e4b72f29381f9b697 SHA512 51fab62e1bfb6007287e1219bf458a351806ce685e6e7ba5360062c863f0811da75acc6ec92aef7f9e0556dac0413fbe43a4744885f7449e38036130112907a6 DIST libinput-1.27.0.tar.bz2 843722 BLAKE2B 342166bc48943a65e70be274a4b946769b27029b8d3014b081f268537c7bbdf5c7e9be5e2c2b547e1433e444c9e5b2994a4d03f7894afe15b923ba09cd58d490 SHA512 ddfb4a16cbd40f8e55a536f8e18e77bb26113690bd4188d2e6ea04c1a906d8392d4df340d4e24f20c5152b3ef7d727702229a86fc27ad50c5ea9a85a58d3e24a +DIST libinput-1.27.1.tar.bz2 844741 BLAKE2B 816977ea6fdc84c160523ad574801f818cdf9f8da5b0ebe30e04a71c2d1ebd15e1530cacf4d56893ef3e23fa14cd7bcd25b6ce6661adf291e8d7a9d4ab2b7752 SHA512 c8312000d7ce8c6f209b233177358c53dc830769cf2a80bd23ceebb408a0371de668846a5d1321b6ef803b3c17af5c0aba941ce5a2dc1fac6a0d5d791a13088b EBUILD libinput-1.26.2.ebuild 2373 BLAKE2B 05f4b599a866481fb5be923377db9b033214418fec1328ebaf83edb3dc94f7ca2014de9f2bd843fe57311bca22aede445d9e6cbdaba7b8bc66a7a7ed79edd9a1 SHA512 fb7a22f39d22340bb5f2a8e7a68b354cf34d5ff694cb542900631ad7f52e1c819c4edef20485c11ff79147fa8ce89520816ef98491550363741c33b2d7c0eee8 EBUILD libinput-1.27.0.ebuild 2374 BLAKE2B ae4b45bb29aa9fe6e9cf00df9a436414bb57fb84cd447cb741deccff18dd2598d125b056c427186b64b214fc45f3a1315bb15e5768260f0f34407f947f70eedf SHA512 7bc6d27303c9c6bea4ed07f075295864ceae3dd9cb54f47a3b8dc301dee9a4f17aaf0feca4208da2e97308017493fd650d79e1064d6cf6c7d995b7ecb3db55fa +EBUILD libinput-1.27.1.ebuild 2380 BLAKE2B 979af13fca07832ef74589cd275a268f7a04f16d90576613a4c60ba4e3b540ca9ab6e597b1e73b88e1be67efd0168784a351bb49331001ffc78b4d4090bc3cd7 SHA512 1845cf1bc55e7a8c2aa707a85805dd5992a9105d6c311cbdf56392012360d96959ccfc87c71753e0dafc41aa973c5720ee2b441327d3541f1cfb31582090c44e MISC metadata.xml 339 BLAKE2B c649f0ffaad1b1dc76c3d3184d95356b2925f642ff6b96c3eba0c31a1d96c3d9b741c1348f8ec90d02428c30a836872fe4e42e7ab5f5e5197f4a787f9147a1a8 SHA512 e9aeca6cc4451ab5b622f597f8debaecfdc672244e5e0b687ac294c20009ba42fb2ccc45e7016a2427312e1c768259005e0a7ff53026087570382652ec23cb60 diff --git a/dev-libs/libinput/libinput-1.27.1.ebuild b/dev-libs/libinput/libinput-1.27.1.ebuild new file mode 100644 index 000000000000..3b150a3add3f --- /dev/null +++ b/dev-libs/libinput/libinput-1.27.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 2014-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit meson optfeature python-any-r1 udev + +DESCRIPTION="Library to handle input devices in Wayland" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput" +SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0/10" +if [[ $(ver_cut 3) -lt 900 ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi +IUSE="doc input_devices_wacom test" +RESTRICT="!test? ( test )" + +RDEPEND=" + input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) + >=dev-libs/libevdev-1.9.902 + >=sys-libs/mtdev-1.1 + virtual/libudev:= + virtual/udev +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-libs/check-0.9.10 ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( + $(python_gen_any_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + >=dev-python/sphinx-rtd-theme-0.2.4[${PYTHON_USEDEP}] + ') + >=app-text/doxygen-1.8.3 + >=media-gfx/graphviz-2.38.0 + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +# test? ( dev-debug/valgrind ) + +python_check_deps() { + if use doc; then + python_has_version \ + "dev-python/commonmark[${PYTHON_USEDEP}]" \ + "dev-python/recommonmark[${PYTHON_USEDEP}]" \ + "dev-python/sphinx[${PYTHON_USEDEP}]" \ + ">=dev-python/sphinx-rtd-theme-0.2.4[${PYTHON_USEDEP}]" \ + || return + fi + if use test; then + python_has_version \ + "dev-python/pytest[${PYTHON_USEDEP}]" \ + "dev-python/pytest-xdist[${PYTHON_USEDEP}]" \ + || return + fi +} + +src_prepare() { + default + sed "s@, '-Werror'@@" -i meson.build || die #744250 +} + +src_configure() { + # gui can be built but will not be installed + local emesonargs=( + -Ddebug-gui=false + $(meson_use doc documentation) + $(meson_use input_devices_wacom libwacom) + $(meson_use test tests) + -Dudev-dir="${EPREFIX}$(get_udevdir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + if use doc ; then + docinto html + dodoc -r "${BUILD_DIR}"/Documentation/. + fi +} + +pkg_postinst() { + optfeature "measure and replay tools" dev-python/libevdev + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest index 53b32e7c3c63..897b88c16c9f 100644 --- a/dev-libs/libltdl/Manifest +++ b/dev-libs/libltdl/Manifest @@ -3,5 +3,5 @@ DIST libtool-2.5.3.tar.xz 1050076 BLAKE2B e7bc3421d2273851f894583b879c897239bdda DIST libtool-2.5.4.tar.xz 1056924 BLAKE2B 47de3c49a690d44d7ddd5e3b5e4090c91dc5fbb9c40fc4a3963e150fb7329326ee3e21b8c149974726171c4b0380028e0efc7a369c4f04357eea46f69852e1cc SHA512 eed207094bcc444f4bfbb13710e395e062e3f1d312ca8b186ab0cbd22dc92ddef176a0b3ecd43e02676e37bd9e328791c59a38ef15846d4eae15da4f20315724 EBUILD libltdl-2.4.7-r1.ebuild 1106 BLAKE2B e7829bd6d0b642806aa8823b9cb09551b690dc956d309cd29f1f67e312b682695c35e03314c842ee078e6ff20d3f8540e25b877f13bb1cc9be192d97e114e644 SHA512 4759faa380d42aeda3b4b22b0c8857da01b862b6b5da8c379bc6bfb4c8e591c65357aeb4b1e7c0c608d70abf5567ffdb33b47ac5527771199dc20e5e8f07cee7 EBUILD libltdl-2.5.3.ebuild 1268 BLAKE2B bcb7f24a0ede0d9421428e34d4346ba42be0101dac5df968f900367d33a1056625901c7273a3c8881ac93646f561721c0c496dbe1333170b413063be5befaf15 SHA512 b64c1ef9373d980c538d5fd8c8216d72600f3169c246e7c4a7eba75a1aa2226aead4e9f67b0c2b9ce1833b94ec600cb480d63d53298decfea5898cd76b62f298 -EBUILD libltdl-2.5.4.ebuild 1268 BLAKE2B bcb7f24a0ede0d9421428e34d4346ba42be0101dac5df968f900367d33a1056625901c7273a3c8881ac93646f561721c0c496dbe1333170b413063be5befaf15 SHA512 b64c1ef9373d980c538d5fd8c8216d72600f3169c246e7c4a7eba75a1aa2226aead4e9f67b0c2b9ce1833b94ec600cb480d63d53298decfea5898cd76b62f298 +EBUILD libltdl-2.5.4.ebuild 1261 BLAKE2B 46c6874bf14a6c196055299a9f4a1b3b7042cbef13317da723b7fbb81bde05fe85a44ac7c3ff740627644bda264ec73027111d85cb60eada7913cb56811946df SHA512 e9cd90f88036029e0a1ff0fc46fcfa48bbdd21de4ee4d45b6c7756020a912e889f4a2f683a45d685921a95689741634d440ea4c84a328f42b2d3160dc559f40c MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609 diff --git a/dev-libs/libltdl/libltdl-2.5.4.ebuild b/dev-libs/libltdl/libltdl-2.5.4.ebuild index b367c10d5e46..93790c2c82bb 100644 --- a/dev-libs/libltdl/libltdl-2.5.4.ebuild +++ b/dev-libs/libltdl/libltdl-2.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ if false && ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then SRC_URI="https://alpha.gnu.org/gnu/libtool/${MY_P}.tar.xz" else SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}"/${MY_P}/libltdl diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest index ec06e4921c61..ac42bee17a99 100644 --- a/dev-libs/libtpms/Manifest +++ b/dev-libs/libtpms/Manifest @@ -3,6 +3,6 @@ AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f AUX libtpms-0.9.5-slibtool.patch 1981 BLAKE2B fa4adf1c063d24a2550f964dcaae1ea2e2d93f7d2704bc00e29ef22ceecaaf214860e82e668e1358854482fcf3ba1af89745422657763b7683a232f7e286ac7e SHA512 4b8eebc895ce6941a3ad5995ee0d5f1b1537861700878fa1ce0a95ec37ee1d51354782da4bb2feeedc1c5871aa62ec248484b409c6109bed95cf73962ff8b206 DIST libtpms-0.10.0.tar.gz 1397526 BLAKE2B 8d05023f5f0fc8dd20cbf5606fa7be391b7dfdc45710c76387c97cef6afb555bd5f0920f73e4578719bdad8e64ba239c14f8c63ed1232c4c3e1b4a80c247b8e0 SHA512 a728188c26447656f43298d1475ebccf0f074d9474780a71fc64baf1ac8b6f6569c90e5ad07098dddc711ba1080eef409c1ac5334d054e7f144e48fa21b66df9 DIST libtpms-0.9.6.tar.gz 1264338 BLAKE2B 7b127ef370a48214814bb9ad0e8461ed0af21f32ab84f243945980c5e36ba5e374b4de7a83bf9c67c29264609063d48eae2dae83832daed70170bb1ed39eafea SHA512 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3 -EBUILD libtpms-0.10.0.ebuild 1312 BLAKE2B 5140ebf199682743d20e9f2033a67fa5610aeb429ad400f691d9dbd8d29c3624875983fe65a77d8aef487aca39158bfac3723c34517e1a95c9655fef4b10c4fb SHA512 fe37589ea0c6f28d0038b81cf01fb5ba4f6a79328e4b99c19e15ecc6fe30091388fc92755f2fd49774436a15a4a0ff2957106ee8a7bd49a8a7cbb2b725633afb -EBUILD libtpms-0.9.6.ebuild 1357 BLAKE2B 21ecc3c6e03111c24c5b06f2698d980c1f22e69de41f42998ea655bafc48a8975feb32ad7b85973216fa444b7dd193bcbd9d7dc0f8cc0f7f526fab011cfa8f23 SHA512 d8a48b47cb8ca9cb13b2d8dba29692d2ad14109355a063216febd81b256f88bea5c007e9f9fa9d07d6c562fba3bb27d9d63a313e8ccba7bb78f8df1a9be5f995 +EBUILD libtpms-0.10.0.ebuild 1308 BLAKE2B 485822d7c01f56dbdb6d38ba0127f94fa26b6860c6b81d08b8959d68b725f1d020bce3db2a4acf296de5c44847151cc6a43963d4b93dfa698b16ba86af2d2f1e SHA512 205afbce5859736905862554c5b5e1ca8b05e2b26e063d89c2aa5368861b4dea3eee8983a935602a87315228f237f6d8b46aff98a7243353f6987e6dff899256 +EBUILD libtpms-0.9.6.ebuild 1358 BLAKE2B c7a648d78656c4df0d35fe10949c05bfa4ff04060dfda21ee4cfaaa3596e03e30075f7d0961e9a79b49b09c695b14a0e2689d6dc9c88472381f5075adc374879 SHA512 d7c987471c5229a34b86df19ef22a00c5ef3fbcab567427ca2c4b3a605a3b9ddffb796295d515280836db0be86b9f578b987dcfff6c111dae3cc380538af833d MISC metadata.xml 621 BLAKE2B 5431a08a57b654746f41820560912e2bac4fc0c5cd2eb5f44c77e4eda65c1a160845205c3ae76392c4a6f9aa33562999576c055ee6d1b89579a9e2a49c59e4f6 SHA512 5e9fff7be647a2e9e8eb71dadcc6b8cc8577ade658fd4ab8ba20cfd64f1b5ba129fc7e5f8fcfb52e69a646681741079c0bc85b06a92f9086ce66a28770c1a9da diff --git a/dev-libs/libtpms/libtpms-0.10.0.ebuild b/dev-libs/libtpms/libtpms-0.10.0.ebuild index e7a56cee6fd5..a44e38dd85ed 100644 --- a/dev-libs/libtpms/libtpms-0.10.0.ebuild +++ b/dev-libs/libtpms/libtpms-0.10.0.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit autotools -DESCRIPTION="Library providing software emultion of a TPM" +DESCRIPTION="Library providing software emulation of a TPM" HOMEPAGE="https://github.com/stefanberger/libtpms" SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" DEPEND="dev-libs/openssl:=" RDEPEND="${DEPEND}" diff --git a/dev-libs/libtpms/libtpms-0.9.6.ebuild b/dev-libs/libtpms/libtpms-0.9.6.ebuild index b78b99d4a24a..5dda33f6cd23 100644 --- a/dev-libs/libtpms/libtpms-0.9.6.ebuild +++ b/dev-libs/libtpms/libtpms-0.9.6.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit autotools -DESCRIPTION="Library providing software emultion of a TPM" +DESCRIPTION="Library providing software emulation of a TPM" HOMEPAGE="https://github.com/stefanberger/libtpms" SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 5b6866bdadf0..1704adfb19ca 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,6 +1,6 @@ AUX libzip-1.11.2-nullability.patch 2580 BLAKE2B 77fa6f497ddb0520edb6284465e10032e4f5215ac83a7228ee8bd656418d643d3895d0f01446d18a8ff11ccc43ca446e8bbfc6be2ee4e8a4b7004e6f551cbb05 SHA512 f077517a96828bf60a0e00407fc9130d839300d325fe946c2f236e02e7766a83e00ca0594b6434c04fcd344b1ebe257b4fe213232df301b5f6b7d985298d7398 DIST libzip-1.11.2.tar.xz 787300 BLAKE2B 84b41a4dfb5f61404972314021ee5de153199747d8724bbc86adb982fdcea74ede67fac03523081a12e463c33e25441037beb1f6312f93f0c011471c3b150c72 SHA512 e80afcff8a65d614c4e7087223e8afafe0b1c6799d6f1d04d1a3735d37a63d134ec2335fe87923a27f0845ee71062da444fe7a6c8a4458827333a52d9dee8166 DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5 -EBUILD libzip-1.11.2.ebuild 2501 BLAKE2B f9a3b8b6186c2275dc88aa0215d3214d1fa63dfcaa4bfbdd01a63fafd01814d57effd74e889b3cdcf2f4dd5fca1e55611e489c96549ae94d5357e105ef415652 SHA512 898f2d924749d93a5bb964fa353ae0e22fc0d643b9a6e88fa7f78674f5bb0f85bdc92f690b0815cf0d7b8a7b283af04c872fe4ec74f5fdaa93d14a3fc22e4430 +EBUILD libzip-1.11.2.ebuild 2508 BLAKE2B 8f883c7bbb88266595ba01fae5aa6acee82316bdc061416dab7471df46d8e3323d66bcc59416d64dc9d659310e08da46939d6de0e3553cc98c36e3d96e86990d SHA512 0cd1a9a91ac69d8f79a6705efe21d1039c7a4ebd0360d2dabbc1566525d15955bb9700837df74e9c9dad2f7a2c585b2bda67acbe3f6372957905892f82d8859b EBUILD libzip-1.9.2.ebuild 2438 BLAKE2B 78f610e67dec398354b7a675b456aa9f4b344b6f85416f450a6bc13f114463e4bef72142b4304dca2dd7673f25c7425c824be421ef9cb1a6be88c1702d868cc0 SHA512 0f151c1ee3896d906a3b36e98419161f0c91828484f49b428259cdaf7e907c2a6bc787372727f35b054896143c243339aa1dfb38ef322ebe66edcd13bbcbfa8f MISC metadata.xml 563 BLAKE2B 2cb57938618664b1424b3c4d475d79ae6a66964788665c559520ff8d7466d9a1c41c1a1821dd1213dde1062898e3bdb79478ff44fa3290c4ef6802a64539e77c SHA512 d14c625c1a43bbe8d69508cba6c78adad10287b6018693938a46af322614b3ba999fabf6f2d97c48836a80ded2dd7e0e32c1d6491654a8bdb5b77bd23acd1b24 diff --git a/dev-libs/libzip/libzip-1.11.2.ebuild b/dev-libs/libzip/libzip-1.11.2.ebuild index 769236e73b97..918572c6f00a 100644 --- a/dev-libs/libzip/libzip-1.11.2.ebuild +++ b/dev-libs/libzip/libzip-1.11.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz" LICENSE="BSD" SLOT="0/5" -KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd" REQUIRED_USE="test? ( tools )" RESTRICT="!test? ( test )" diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest index d0eefc206e11..f005cee8eb46 100644 --- a/dev-libs/npth/Manifest +++ b/dev-libs/npth/Manifest @@ -1,8 +1,6 @@ AUX npth-1.7-musl.patch 402 BLAKE2B cccb3266238fb4879eb0a80a1d336e58b3647021c3b71e22c0e980050c3790cba3bca21e90b1632ea21e621ebac052df086d33c7a4074739820fbb9a5c03c695 SHA512 b94be7c35f453c579f59b1b49aa2f599bd21b6aa9c85745cdb4893cae5bd737148f9cf6e2afeb8e50d6659e38800048ca8adec687e9c2ac9f461b5fc0c556be4 -DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2 DIST npth-1.7.tar.bz2 313213 BLAKE2B 39bc5857fb61a4264bef6ff23c28755d2a3b3ceef93034aefd5cf1c2ad905adf696c6753ebd5cea5e0a875df4ecb97db03e023a50a27f51ec0641bbc36b54089 SHA512 8893023bcf953a3f7c490cf8116bed323a9d4af2bea35277e919f437916fda8b8e68ded28ec1777717cf9187c504892556159cbdb8bc02ed4a8b30b3d897d244 DIST npth-1.8.tar.bz2 317739 BLAKE2B 554620f6a45f57bb958d245f7464abffd565b592941f0c404ce384c854be57ee35754a78dcf6afac751ee87e1df230bf3d2b78fb37cb1ef3e5ea534ddfd4ef2a SHA512 34fdeea3d8a7a594d8fdbcc6d5d389b5c8e282e8e84c1491b1e51960c0fa007df6a1d62543f0107f0772f3215557d4b25c2a9c7067cb0ae2f8de7b4d63d09fb4 -EBUILD npth-1.6-r1.ebuild 873 BLAKE2B 03663ce220dde0907c502a1683eae01b73aa4f31a2a285d8ccaaf08c3fba528aa13e8d0cc38522b7db5be20c9634e44a0e22d10e2a19d6db4acd60a07741b33a SHA512 369b0a42b5bcb3d09b64ee3adb1a60fa2674516e4e0c27ea5a9d0ec3aed63d4d85ab764322e40371c151bcb928c16bb63988283d3f30b4d225601b9b39c42908 EBUILD npth-1.7-r1.ebuild 855 BLAKE2B 2c271be58b7f4e23381cde3ea098e6cdca4cc4ac67df78b5cc816610746ec9e3a5a7d7921069ffaf5440c7153bab3d615411e8715718b58af125f44fc1c53847 SHA512 0d0407317fc8dbdc613848ef1a20e828c5c4c334477f61ba3f1a308cc02d09ecb33b97fd0060740ae2310cd528b513015926405d2f09e1c094bfba29277814c0 -EBUILD npth-1.8.ebuild 823 BLAKE2B 0f4665e5a49617ce27547083e7626b38a422773c455b7eac48d3f65afb427417aabae41cbc8b5ea165f7ce25e323330caee102bda539e2edc07675f5149262a7 SHA512 0e4260cc655bfd6b268197e4df3983e0fe8cb036159f792a6ce8c78e5fa4229839b0e8fd10b3f0d889e6a02a75e6ca516ad48115777c71422af0a581da9bb1e3 +EBUILD npth-1.8.ebuild 816 BLAKE2B e04267b35195a1c4005eb68d4190b8b7407d9c5e79d851a04be1307d70d6c195eb07ac822fa7108954126dae5597e93610d72748255c32eaecae3c7007dbb303 SHA512 2f06f720244128a0bddf5f78c17ed62b2b3d693e212e884cbc0c9e4bab2c7c3ea1a0196d5a635f8e6a21c6114de66861596ea4aba60c216d588ba183b0ee17ea MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild deleted file mode 100644 index 0da1d8cb733c..000000000000 --- a/dev-libs/npth/npth-1.6-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="New GNU Portable Threads Library" -HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="hppa" -IUSE="test" -RESTRICT="!test? ( test )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi - - econf \ - --disable-static \ - $(use_enable test tests) -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/npth/npth-1.8.ebuild b/dev-libs/npth/npth-1.8.ebuild index b83032c047d3..df49e68dd360 100644 --- a/dev-libs/npth/npth-1.8.ebuild +++ b/dev-libs/npth/npth-1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/openspecfun/Manifest b/dev-libs/openspecfun/Manifest index 5b8953a81c67..577a7a3595fa 100644 --- a/dev-libs/openspecfun/Manifest +++ b/dev-libs/openspecfun/Manifest @@ -3,5 +3,5 @@ AUX openspecfun-0.5.5-Makefile.patch 1802 BLAKE2B 9e1174fb6663d394dcd7bf4cc400d6 DIST openspecfun-0.5.3.tar.gz 121156 BLAKE2B 4b1d883634524db9a5c1d5c2e291667264f3bc15c2b6cd1c335ef7a4748668091255c4940c54cea27ab0fd301e7c08156825bcdecfef71802b7d571d74af021e SHA512 503da7592b126cce9ecb8af5ce16c667a9b022676721063e5f551fb88c0955f465ed66df7728ed2391f068ea14b77414bfd9934c0ee38081d11b998826d6b88a DIST openspecfun-0.5.5.tar.gz 121025 BLAKE2B 72d92a676c90f24378f9902f76d59df47a403810b56d9a90bd39d6348082d34be59223b0f6b9ad00cd1ebdeb03001b31141134088d8e8164cf9a9c4fad239c78 SHA512 429c0ce47c3a3a044266fee0e285bd4e53e7433c83bf02b03fc4526b8d0e415295143693642a34cdf1c6b59aa86e76fd76c51ffc9440d0ba655c16a8a24a2a1b EBUILD openspecfun-0.5.3.ebuild 846 BLAKE2B 8a4e82c5387f30b2207808473812ca9e16353a812fa2ad81a508d9a74d2306f5724ad24f3dec1e3ddd4181252f016937d7aada30fef6c46fb14c2ca6fc7061fb SHA512 1d39fad14ca2b13b56f1e5cec714720001baf66bc80b42cdbd41368e7290d897921afaf2f3abe9900099ae104270a978e284640abc299e075c62825d920b78f2 -EBUILD openspecfun-0.5.5.ebuild 878 BLAKE2B d3057df1a74acad59b752f230773f7d2015eeaeb1128848a7ae1ce05734a45c0cd29222c198b83568fd1d3722554b614a16eaaef9f72849be5bac92c4be77a66 SHA512 b360325eb62e6ca1499d74831f20ac966725fbdd44e9f1f688cb77b12603a648905c02cbd29b8d0895b20e542fc191ca94d81b8909222faaedccc0bd5b6c1f06 +EBUILD openspecfun-0.5.5.ebuild 885 BLAKE2B 7bad9feff5debcfb0b68fcbaac25c76191f7f73c79baa9127647a59b0e18d6a4714b2502790aa7679495e7f6e11a526bf173b29574c4589cebf9ca1e59f05255 SHA512 fdb8268a150c936ec64899d737d03cae85be45984a2ddf48d00623e98c14ec83bd05e36703c039fe6ab23638172d557d1fa314cf3c34e6f87eec6c9915523963 MISC metadata.xml 464 BLAKE2B 5fe304df52f66ccc4bb5c7a123c9f49e9e43c33201c073334fd2e3a43410f066f4e071009c570482acb118a4183ad60195ef92dae426a98621f8c12306284902 SHA512 36c099b5a0d2ee685fc7acbea16b9d9809e5705d08befc530cf6514f704cc16437089f1f6f48e7c64ece4ed7939cf1a31775dfd71ae72da0e33e1733cfc92d38 diff --git a/dev-libs/openspecfun/openspecfun-0.5.5.ebuild b/dev-libs/openspecfun/openspecfun-0.5.5.ebuild index e296b44d04f0..951a5d905401 100644 --- a/dev-libs/openspecfun/openspecfun-0.5.5.ebuild +++ b/dev-libs/openspecfun/openspecfun-0.5.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}. LICENSE="MIT public-domain" SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" DEPEND="sci-libs/openlibm:=" RDEPEND="${DEPEND}" diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest index 6e955de1f772..17eeaa327033 100644 --- a/dev-libs/poco/Manifest +++ b/dev-libs/poco/Manifest @@ -1,8 +1,9 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43fdf1db53cb0139f3cab5eb8ca67ca30dfa97058e4db4618d27ab2cd642e205349f5f70970fd2a4961a018aa7e1c5dac SHA512 1a155b10e98cdce8659a9308ac70e8114361a0062a1af469dc774b5d32bc00b5f1aa0e873fa5061625527ddeb006fdf29939b1899939a193d8724e491dedba10 +AUX poco-1.14.0-missing-utf8proc.patch 1979 BLAKE2B 34b8b4595939a0fb95f9acc92636206e80ae0192f35e84fef292a6e62eb2ed2cdb1cd4a7f64290a281aafd7258d25a4c3883c66e6e1865facc1ca1e8bb4183ae SHA512 2b0645880aa1409b0097bfa40396c94b25f29212795f4e600226d59486266d9f605905418bf402ed28cd54419e882f498f72c0d68db460dcd4f350b473c622d2 DIST poco-1.12.4.tar.gz 11296139 BLAKE2B 45e1214616e78041d5ca512cee46621c006fe21f51231f3261dc40ca4941eb3cd4e52db493aa826779784f9d3f35cfd08e3e9d08fb35ebec2d610fb6528c635a SHA512 730700a24b5a00d44aa85914e7d3c9eff76969a123a67315ba5e9b2d18c0ace70d2664d8a611496851f497aa4985d36685a67813a95e814461ae0fffdb460d91 DIST poco-1.13.3.tar.gz 11332562 BLAKE2B 04380cae92bbd2427873f0ea1a3fcade244ee5168390e26081983ded9faaf22e456bdd4ae87f9c77bafc92155f860ea9f56678ec2204bcd7c51a871e7f00d759 SHA512 084064fb462c9e7993d069ebdf395802af900ed92c5b294465a2c246162bb86caa3505985de329e8110d3e9fb3bc39ae9536d523843729d4ed5ce00c35289d92 DIST poco-1.14.0.tar.gz 12158142 BLAKE2B 3ae9a520941634ac9aa72d323541d6433ac2e73d4d19e0654f932ea031d17870ca4ad764a8e3c5e68d69c5dc9750d779102d80d6d810598db275f269928ae8ea SHA512 4475a0ede5d06e4ce9537295fec92fa39b8fd5635d1cfb38498be4f707bc62b4a8b57672d2a15b557114e4115cc45480d27d0c856b7bd982eeec7adad9ff2582 EBUILD poco-1.12.4.ebuild 4220 BLAKE2B 9be84416a479873236f983cc7b7eed506361e35b6200b8b0f328bc476fec5cf6521a4991198418284136e389cd5ac2a867cf8fd4b66c5251705e781ea51ad2b8 SHA512 dd99c1db6e4e00d31dbe115a972464011b4b138c8f6ef785d3083a7112215fc7655dc199a4b3a913298ac0b9d8ca6c10d63a8d05c0d974ca17f599022f6a2109 EBUILD poco-1.13.3.ebuild 3907 BLAKE2B b570a253f8b7e3d7dc38a2e94b13d518d7e1a5e8e44b1b7d940a88013716a8598b452052ad1978af2a972a669ac4c628975ac6aad503aae0c406be49a8e16c99 SHA512 2d451bf30476b3db92d8155c3f4e60cd64288fc93c1f0a05403d5624d91073135776d8040c0b95c348199672deccb2ff60eb0fe63d07c61bea50eac3d539a768 -EBUILD poco-1.14.0.ebuild 3849 BLAKE2B 9a2e4aba34218756b32f24295e6193b78eac2b434f81ddb66468f76acc6dd834c92a63aedc74397d264659bcedc24a445d34a219b9e3f0bfb5b5f427bee57265 SHA512 223e7cebfdc00ca4474ba028dfafc2c4081396dc63b87d793974788e7e6a469043627cd9a8c5bad438b11d35ff08422d456d1c53306e493a6818dd775c2efe43 +EBUILD poco-1.14.0-r1.ebuild 3905 BLAKE2B 1f681cd97e581b3f4bfb0698556618e19dc9353b9e72d9e941e49e61eeabcfd674b913364823873c1197dc87a42d180bf86dd644d9384c761a571b4ac52ddadb SHA512 ddbf28bb7e50d6f7596ee9b8276344772eb3a3f2993a79f699fec56451fdf9843358010a973ccc53e35f1c7053b5051f5de115f396944acf878d9015e3f374f3 MISC metadata.xml 2947 BLAKE2B b2c04966e9be3ddebceb3098fa213f2196ac594b96cd6885e3fbc1050971e9bf9e88f234f9680ac4dcc313dd766810315066f212b4411ae56d4689c6ad07a24c SHA512 c9c386bacca78595bf35d77b89fc2935d41bf2290e486532f66e484cee039f66a553475202c78e1eb7f57caa7dec7e723469d67a043e79141f698cbeb7144ed7 diff --git a/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch b/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch new file mode 100644 index 000000000000..82f5d0c46036 --- /dev/null +++ b/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch @@ -0,0 +1,58 @@ +https://bugs.gentoo.org/947508 +https://github.com/pocoproject/poco/pull/4816 + +From b5873caae53ef9adaecd7d10897c47b0b4812b3e Mon Sep 17 00:00:00 2001 +From: Matej Kenda <matejken@gmail.com> +Date: Wed, 11 Dec 2024 16:18:04 +0100 +Subject: [PATCH] CMake: fix for missing utf8proc with unbundled build, + resolves #4798 (#4816) + +* fix(cmake): Add missing install and find dependency for utf8proc in unbundled build. + +* chore(gitignore): Corrected path to Qt creator generated build files. +--- + .gitignore | 2 +- + CMakeLists.txt | 4 ++-- + Foundation/cmake/PocoFoundationConfig.cmake | 1 + + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 4c163f64de..3a5ed86f82 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -48,7 +48,7 @@ config.make + + # Qt Creator # + ######### +-build/ ++build/Qt_* + + # CMake # + ######## +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 861c27c565..2d120e68fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -557,8 +557,8 @@ install( + ) + + if(POCO_UNBUNDLED) +- install(FILES cmake/FindPCRE2.cmake +- DESTINATION "${PocoConfigPackageLocation}") ++ install(FILES cmake/FindPCRE2.cmake DESTINATION "${PocoConfigPackageLocation}") ++ install(FILES cmake/FindUtf8Proc.cmake DESTINATION "${PocoConfigPackageLocation}") + endif() + + message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") +diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake +index 82c5788940..32b5d83023 100644 +--- a/Foundation/cmake/PocoFoundationConfig.cmake ++++ b/Foundation/cmake/PocoFoundationConfig.cmake +@@ -3,6 +3,7 @@ if(@POCO_UNBUNDLED@) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + find_dependency(ZLIB REQUIRED) + find_dependency(PCRE2 REQUIRED) ++ find_dependency(Utf8Proc REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") diff --git a/dev-libs/poco/poco-1.14.0.ebuild b/dev-libs/poco/poco-1.14.0-r1.ebuild index 122e330a4374..e93b9e8e1966 100644 --- a/dev-libs/poco/poco-1.14.0.ebuild +++ b/dev-libs/poco/poco-1.14.0-r1.ebuild @@ -59,6 +59,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${P}-missing-utf8proc.patch" +) + src_prepare() { cmake_src_prepare diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index 5e4111ad75a8..007fa3c1778a 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -21,11 +21,14 @@ DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6 DIST protobuf-24.4.tar.gz 5180235 BLAKE2B 1c7e9035d9f3810886baaea7d679414c882463c79828c99dd8895a9549638c1ca17f9ab3b38d461019f3e1412d9cb9584b995b1da99866eb6fdbb8bdeb063e6f SHA512 52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315 DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115 DIST protobuf-25.4.tar.gz 5878444 BLAKE2B 9b40985bda31a84dd3ab7a1d18f746d5f88660d9e036a20234cbc85e79322005d2ffd4e60d72c55a8b5f624d7cc50522771f0804f203f2eabca7b0b8ace0545e SHA512 1b3ba1a1575bcc9d52ddce93d466912863d600dfbb40f64845b8e66c8000047d05508b8f1baba8d5eef42a7ff90eb778f7c8a553c9ec2778fd3a9a18122c67ab +DIST protobuf-25.5.tar.gz 5877036 BLAKE2B a8174c7cbda47afa3f31d64c7a7aa7f233efd5df5a783abedd229613c8c27a2380684fb5851dad67f76f063688dd8060a0a373f2c95441c2ad91630eb187af22 SHA512 9fe130f5c04919accc99113e13096df93db4c2254a9c2428faf9459416907c77fbf4adefbae3fe644e1f26d9c1fc597165e2c5b6219156c97500d6ef3fdc0793 DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397 DIST protobuf-27.4.tar.gz 9156456 BLAKE2B 004427f4923e523bf77298600bf91a8fe4ca8be4bd6da5b7efcfe9186a032155e525426f83f683e1bed1e799ed1e62d250053386c1463cbd0c062bd05da786d0 SHA512 d076ce7e075096d0dba7ee2314b12e3223c4239c019e25670636a0ef812ddf0ce3f1fd9b9fe8517319db87b14bbdb2653cc4e06023f90032dfedb014457b2863 +DIST protobuf-27.5.tar.gz 9153935 BLAKE2B 08b1b5927188e68ef2ae8ce8cdc6f21c34ee8453f4dfaeb362a7f5a5f0ee5ddc24772e5583ab10fbf193aa43e7fdd316e8fbbe4d066df704aef5469dae01fc8d SHA512 bb266483b11268c207aa0e8ce76442351a331f30151586714d57ed7c9bae05f09aabf5042b90eac85658f708671ba0b33c64d1c58a91a24c00bbf4f4ffdce1bb DIST protobuf-28.0.tar.gz 9259114 BLAKE2B 328e09ebffb296d838557ea72a4fc4da8e0ad5f1edfccebcc8ee7c9e0e74d06e5e6dbad741fd89f6a4502c1cb246a973fd60c035ccdbf89700b7baff49e2a65e SHA512 8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1 DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d +DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643 EBUILD protobuf-21.12.ebuild 2504 BLAKE2B b90c7eb65835f98825faf41fb70b7edcd40030c5c430be7faf13308a74cbc3576a910b83a73dcf593ebb248392900536b96152ba18d05f532b0632ad637b2ad8 SHA512 454f7104106edd5cbc9c1897cdc57fcef337fef51239d5e8832064a9a049b238bb3d4d549df88369098b26a350b4828131ecda74a65c832cf4aa9b1128445d7b EBUILD protobuf-21.9.ebuild 4163 BLAKE2B 8c4897218ecde9eab2ab95d68c613d4e0990de5570f51f2d3d8e5367f83887be37d3aff6412f961aeb8db27d08380dd5df8845cd144afe841524150a38c8c23f SHA512 160efd25da58ca8dc6cfa68f8a50e8ca98b682d4e21b1e38bdaf4a6ebb3bd7810c657fe7f06bf931358d30a2f2c524658628200444e89f2bf6a6532e51e05d86 EBUILD protobuf-22.5-r1.ebuild 3094 BLAKE2B 6bcee931b6cd9a85365b59fd5f3ce58378918c248d12e5c6793c2a5afacc2596c8f3985a59bb790d17449085f9581b908db26025bc120676df65ce6a34c90453 SHA512 5b09aa886dcc68070f77bb836a271580bd88ea8c8945700bc57e19c814a38cb33db87aa0f233aa6537a70a0b92071eb546d68f745c05dc1eae8d16a1e70f8487 @@ -35,10 +38,13 @@ EBUILD protobuf-23.4.ebuild 2980 BLAKE2B ffd3be624f60c7b8a9f0780a4b5d3fc55a05ef2 EBUILD protobuf-24.4.ebuild 2915 BLAKE2B 2fd3f84bf7e86b64393fd39962080809ef4d65b9b06928abe03d3755360ac5768ffad5bb132c205e25f5bd3829b09b1b14e7e3e1840895edd99229d5dafa4807 SHA512 91ddec809ffb71f23f5884d37e46dcb3a98c48423712ffe6e45607a114b6054c959dc59990c9c1c5a3b709b21653eb38f05b767bb3fe040740905f29a28bedcb EBUILD protobuf-25.3.ebuild 2914 BLAKE2B 4ddc5b0263ce920a014c805cd0bbb5c7f2e436c7e0185e1aa80e58f47610ae83ed55f64183d7ced81badc1e002ab3d60bd236df8da8d8111f19a03d3b236f451 SHA512 9e401d708de3865310db104d8a61ea763a24997b36e31e3770a1cf038772f12d3b8d956f11e62330ba2bb6ace0abc38576312015d16dadcad1966d3528c9b0db EBUILD protobuf-25.4.ebuild 3888 BLAKE2B 92e102f7dc8925101f54bc8bc9b51d57f0f4881f5acfa32940370889949526001ffc613d292e5960ac3f0fc3cd20bb6fef03cd64f29eae01108a59860dfb9c5d SHA512 683bd2e998acb32705d7c120503ed9d7b09559eb2267e238dac9284ad920de2bf4c17fc487906e5a1eca88a4ed44e0ade46e5aff44fab3b55ec8727aec8dc266 +EBUILD protobuf-25.5.ebuild 4045 BLAKE2B c98840d788637334043b704f2dc75c460df66df7666ab2e9d07a51fe9dd2e33241110a108c268d40cf5541d8f391917114e7c7594dd2b639fef84c7bc7b0d434 SHA512 0920ba6ddb6846a1045f2db1b9381ef52c58fbc4f5cf140b6531824913b5e6f806dfea9b62dfae74bcfebf75dbffe1e49b9e4a17709e767404bb15e58f7e079c EBUILD protobuf-26.1-r2.ebuild 2915 BLAKE2B 75df59e6ca105a529cf582cda4371c26f0b9bf1df94fb11c3b409e1b01fcde43e0705e05212ea630839446aba819c4b8132514383f94fa2aa455b232a3f64eae SHA512 8daaf04ef736d389f634f2366e833e7c6ce40a9e60b022a31df31868b01a282f948d583270827b1714cc7cfacac4cdd0e9971944dc5b3dd823afa4696c4cf1c7 EBUILD protobuf-27.2.ebuild 3739 BLAKE2B f93b87963a5c0e5d78c21817ac657e02b1869a36679eb0501d06ce3523518260e6a55e65de5f2b251ebff3a36e4006cf9eaa8fd18f186dbf7a46c4fb416e4bd9 SHA512 f801b662ce4a47c137f061ca17010481cfe40f87bca22f7c895fe42e85c7e33a7a865092aa2db21aaf5e78177a7127902cfdabfd969bca6c567045790a8fcb0f EBUILD protobuf-27.4.ebuild 3942 BLAKE2B 6f5050e4120d890fdf88c743c8fb214862f8ea23c6105094242a41f9146acb325bb815d6edc0ce877b0bb4d866ebfdb14b24d9321e213fb90480a1af805cea37 SHA512 23cc67686171e88490bc604236fe8d5b204a0ad6583b01cf9fd4c86a35e6503f1e53db90d02d86759f7ef67bd221aa255b086badc02d89979d8f3100d58b0490 -EBUILD protobuf-28.0.ebuild 3936 BLAKE2B bc04bab7ca7fa824694bf2328a1d60912aef9ced11d58ecc12bd1386871c17846f697b9c8bb215ba790d1494764b60e165fad1c7d22fb78df2aac9250ac702f0 SHA512 80aa6ea9b52d15d4267cd18713e6aff5dba5e9531d673f670047f52121978f68830e2696bbf76e5ce069442dff3543505026100ef26b72dbaed1a3864792497f -EBUILD protobuf-28.3.ebuild 3942 BLAKE2B c10a6bb36fb1190db1c1d97c248c2083803f74f47cef6bc62755564f77636400157941f1ec29937c1884e5027fba082986dcfd9ed475733db50e35ed1a4c58bb SHA512 19087b6c287d0df254bb7686e600655a1cc32ff5163d2baa24fedc901fcf2fb4f682741f1e1f7061000dfc721f896c12e0811416ccd50d2daa9c87ef41b9897b -EBUILD protobuf-9999.ebuild 3942 BLAKE2B 6f5050e4120d890fdf88c743c8fb214862f8ea23c6105094242a41f9146acb325bb815d6edc0ce877b0bb4d866ebfdb14b24d9321e213fb90480a1af805cea37 SHA512 23cc67686171e88490bc604236fe8d5b204a0ad6583b01cf9fd4c86a35e6503f1e53db90d02d86759f7ef67bd221aa255b086badc02d89979d8f3100d58b0490 +EBUILD protobuf-27.5.ebuild 4098 BLAKE2B ebac46fe3198ada4f12aa5965c74a143a0526d363fda32497d2b22ca86913a43fc1b3553a71f0108b292587bfe460e9c41173b4a023cf5b838cff0502b290ff8 SHA512 3615721bc15433ff52439d64b512feedb04f43cc17aac76779d91a4c2a735af50b72fd654b8ed3ae8479fd20df4d140b62951fd5a5ed5c7c862ccda40d6dedee +EBUILD protobuf-28.0.ebuild 4116 BLAKE2B bbf35a188a559c2ce720d502befb96c85ffb44a889d70d09c959bb292eb7ee6d1516f07389554ebc1ae2fa37a2d990a7be3275332d7ff388429e54d10aefa5e7 SHA512 7dbe1d3a031cee32ef793c1a535ac47bc12d108029b451394446b7fe9d62b9b83bc88c1dc8d8094d4698a6942ef7573119b4a5423a49c6ac8663cc1778d05626 +EBUILD protobuf-28.3-r1.ebuild 4278 BLAKE2B bb02aee6792a9773ae311add71bc8492cf33f3e38a30fc4799b7e0a462d82668c5ce5a62f299e778321b8a5f704b25cd51b97fee660bd879f8a6fc6505ce30c6 SHA512 c47411af0a205592f5cb42f62322525e4ae0ee70d523dd5d9f4d78e223288829949b3c2642d5e7b8e4380a1da12945258cc6fc3946f3cd2f49ce8a9ee6b01e64 +EBUILD protobuf-29.2.ebuild 4225 BLAKE2B e7b3624a0621d5ba7d6beeebe19231a849cd926dc317e0111109a8b34f42f69e07e55e9da2284b360a46142f4e5e00b971e59e09bb5d83378ef072590f19331c SHA512 1d361fa2439bd0e373be128128c19db12d63edf7c89c2965731907148e58559269e028568348d409093a1feffa35efecdb0457e8fdc96f1fe8bbf7a2a35ca3f6 +EBUILD protobuf-9999.ebuild 4225 BLAKE2B e7b3624a0621d5ba7d6beeebe19231a849cd926dc317e0111109a8b34f42f69e07e55e9da2284b360a46142f4e5e00b971e59e09bb5d83378ef072590f19331c SHA512 1d361fa2439bd0e373be128128c19db12d63edf7c89c2965731907148e58559269e028568348d409093a1feffa35efecdb0457e8fdc96f1fe8bbf7a2a35ca3f6 MISC metadata.xml 917 BLAKE2B c25c810e47e764843ad71be5eb5ebe617d881e7363ce3206401eb59c6df12969bc22bbedc34f08b0a2fbcf955de5b85aa8e4d3a964c1349f07ed1d0eb344a915 SHA512 baa5737981669f1b28ce32884698a4d91e0f1fbdde6056779307e1a6c85dde8ca36ee47ca3ce8794b996934dfafc5482afbe9532a7f3e17c833c3aef0a330376 diff --git a/dev-libs/protobuf/protobuf-25.5.ebuild b/dev-libs/protobuf/protobuf-25.5.ebuild new file mode 100644 index 000000000000..6a9820f1a034 --- /dev/null +++ b/dev-libs/protobuf/protobuf-25.5.ebuild @@ -0,0 +1,169 @@ +# Copyright 2008-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib elisp-common multilib + +# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules +ABSEIL_BRANCH="lts_2023_08_02" + +ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}" +ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}" + +if [[ "${PV}" == *9999 ]]; then + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" + EGIT_SUBMODULES=( '-*' ) + MY_SLOT="28.0" + + inherit git-r3 +else + SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + MY_SLOT=$(ver_cut 1-2) +fi + +DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" +HOMEPAGE="https://protobuf.dev/" + +LICENSE="BSD" +SLOT="0/${MY_SLOT}.0" +IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib" + +# Require protobuf for the time being +REQUIRED_USE=" + protobuf + examples? ( protobuf protoc ) + libprotoc? ( protobuf ) + libupb? ( protobuf ) + protoc? ( protobuf ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + emacs? ( app-editors/emacs:* ) +" + +COMMON_DEPEND=" + >=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}] + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) +" + +DEPEND=" + ${COMMON_DEPEND} + conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] ) + test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${COMMON_DEPEND} + ${BDEPEND} +" + +PATCHES=( + "${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch" + "${FILESDIR}/${PN}-23.3-static_assert-failure.patch" + "${FILESDIR}/${PN}-27.4-findJsonCpp.patch" +) + +DOCS=( CONTRIBUTORS.txt README.md ) + +src_prepare() { + cmake_src_prepare + + cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die +} + +multilib_src_configure() { + local mycmakeargs=( + -Dprotobuf_ABSL_PROVIDER="package" + -Dprotobuf_JSONCPP_PROVIDER="package" + + -Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")" + -Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)" + -Dprotobuf_BUILD_LIBUPB="$(usex libupb)" + -Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)" + -Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)" + -Dprotobuf_BUILD_SHARED_LIBS="yes" + -Dprotobuf_BUILD_TESTS="$(usex test)" + + -Dprotobuf_DISABLE_RTTI="no" + + -Dprotobuf_INSTALL="yes" + -Dprotobuf_TEST_XML_OUTDIR="$(usex test)" + + -Dprotobuf_WITH_ZLIB="$(usex zlib)" + -Dprotobuf_VERBOSE="$(usex debug)" + -DCMAKE_MODULE_PATH="${S}/cmake" + ) + if use protobuf ; then + if use examples ; then + mycmakeargs+=( + -Dprotobuf_BUILD_EXAMPLES="$(usex examples)" + -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)" + ) + fi + fi + + use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" ) + + cmake_src_configure +} + +src_compile() { + cmake-multilib_src_compile + + if use emacs; then + elisp-compile editors/protobuf-mode.el + fi +} + +src_test() { + local -x srcdir="${S}/src" + + local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}" + mkdir -m 777 "${TEST_TMPDIR}" || die + + setup_test_env() { + ln -sr "${S}/src" "${BUILD_DIR}/include" || die + } + + multilib_foreach_abi setup_test_env + + cmake-multilib_src_test +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + + if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then + eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \ + "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" + die "Please update SLOT variable" + fi + + insinto /usr/share/vim/vimfiles/syntax + doins editors/proto.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/proto.vim" + + if use emacs; then + elisp-install "${PN}" editors/protobuf-mode.el* + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + DOCS+=(examples) + docompress -x "/usr/share/doc/${PF}/examples" + fi + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-libs/protobuf/protobuf-28.3.ebuild b/dev-libs/protobuf/protobuf-27.5.ebuild index bffa811e8049..3c5e73019120 100644 --- a/dev-libs/protobuf/protobuf-28.3.ebuild +++ b/dev-libs/protobuf/protobuf-27.5.ebuild @@ -30,32 +30,29 @@ LICENSE="BSD" SLOT="0/${MY_SLOT}.0" IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib" +# Require protobuf for the time being REQUIRED_USE=" - || ( - libprotoc - libupb - protobuf - protoc - ) + protobuf + examples? ( protobuf protoc ) + libprotoc? ( protobuf ) + libupb? ( protobuf ) + protoc? ( protobuf ) " RESTRICT="!test? ( test )" BDEPEND=" emacs? ( app-editors/emacs:* ) - !protobuf? ( - >=dev-libs/protobuf-${PV} - ) " COMMON_DEPEND=" - dev-libs/jsoncpp[${MULTILIB_USEDEP}] >=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}] zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) " DEPEND=" ${COMMON_DEPEND} + conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] ) test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] ) " RDEPEND=" @@ -84,7 +81,6 @@ multilib_src_configure() { -Dprotobuf_JSONCPP_PROVIDER="package" -Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")" - -Dprotobuf_BUILD_EXAMPLES="$(usex examples)" -Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)" -Dprotobuf_BUILD_LIBUPB="$(usex libupb)" -Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)" @@ -95,13 +91,21 @@ multilib_src_configure() { -Dprotobuf_DISABLE_RTTI="no" -Dprotobuf_INSTALL="yes" - -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)" -Dprotobuf_TEST_XML_OUTDIR="$(usex test)" -Dprotobuf_WITH_ZLIB="$(usex zlib)" -Dprotobuf_VERBOSE="$(usex debug)" -DCMAKE_MODULE_PATH="${S}/cmake" ) + if use protobuf ; then + if use examples ; then + mycmakeargs+=( + -Dprotobuf_BUILD_EXAMPLES="$(usex examples)" + -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)" + ) + fi + fi + use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" ) cmake_src_configure diff --git a/dev-libs/protobuf/protobuf-28.0.ebuild b/dev-libs/protobuf/protobuf-28.0.ebuild index 7e7dfd9eae0a..08a9d6fd464f 100644 --- a/dev-libs/protobuf/protobuf-28.0.ebuild +++ b/dev-libs/protobuf/protobuf-28.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2024 Gentoo Authors +# Copyright 2008-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -127,6 +127,14 @@ src_test() { multilib_foreach_abi setup_test_env + # Do headstands for LTO # 942985 + local -x GTEST_FILTER + GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*" + + cmake-multilib_src_test + + GTEST_FILTER="${GTEST_FILTER//-/}" + cmake-multilib_src_test } diff --git a/dev-libs/protobuf/protobuf-28.3-r1.ebuild b/dev-libs/protobuf/protobuf-28.3-r1.ebuild new file mode 100644 index 000000000000..ed7af8070753 --- /dev/null +++ b/dev-libs/protobuf/protobuf-28.3-r1.ebuild @@ -0,0 +1,178 @@ +# Copyright 2008-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib elisp-common multilib + +# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules +ABSEIL_BRANCH="lts_2023_08_02" + +ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}" +ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}" + +if [[ "${PV}" == *9999 ]]; then + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" + EGIT_SUBMODULES=( '-*' ) + MY_SLOT="28.0" + + inherit git-r3 +else + SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + MY_SLOT=$(ver_cut 1-2) +fi + +DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" +HOMEPAGE="https://protobuf.dev/" + +LICENSE="BSD" +SLOT="0/${MY_SLOT}.0" +IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib" + +# Require protobuf for the time being +REQUIRED_USE=" + protobuf + examples? ( protobuf protoc ) + libprotoc? ( protobuf ) + libupb? ( protobuf ) + protoc? ( protobuf ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + emacs? ( app-editors/emacs:* ) +" + +COMMON_DEPEND=" + >=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}] + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) +" + +DEPEND=" + ${COMMON_DEPEND} + conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] ) + test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${COMMON_DEPEND} + ${BDEPEND} +" + +PATCHES=( + "${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch" + "${FILESDIR}/${PN}-23.3-static_assert-failure.patch" + "${FILESDIR}/${PN}-27.4-findJsonCpp.patch" + "${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch" +) + +DOCS=( CONTRIBUTORS.txt README.md ) + +src_prepare() { + cmake_src_prepare + + cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die +} + +multilib_src_configure() { + local mycmakeargs=( + -Dprotobuf_ABSL_PROVIDER="package" + -Dprotobuf_JSONCPP_PROVIDER="package" + + -Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")" + -Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)" + -Dprotobuf_BUILD_LIBUPB="$(usex libupb)" + -Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)" + -Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)" + -Dprotobuf_BUILD_SHARED_LIBS="yes" + -Dprotobuf_BUILD_TESTS="$(usex test)" + + -Dprotobuf_DISABLE_RTTI="no" + + -Dprotobuf_INSTALL="yes" + -Dprotobuf_TEST_XML_OUTDIR="$(usex test)" + + -Dprotobuf_WITH_ZLIB="$(usex zlib)" + -Dprotobuf_VERBOSE="$(usex debug)" + -DCMAKE_MODULE_PATH="${S}/cmake" + ) + if use protobuf ; then + if use examples ; then + mycmakeargs+=( + -Dprotobuf_BUILD_EXAMPLES="$(usex examples)" + -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)" + ) + fi + fi + + use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" ) + + cmake_src_configure +} + +src_compile() { + cmake-multilib_src_compile + + if use emacs; then + elisp-compile editors/protobuf-mode.el + fi +} + +src_test() { + local -x srcdir="${S}/src" + + local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}" + mkdir -m 777 "${TEST_TMPDIR}" || die + + setup_test_env() { + ln -sr "${S}/src" "${BUILD_DIR}/include" || die + } + + multilib_foreach_abi setup_test_env + + # Do headstands for LTO # 942985 + local -x GTEST_FILTER + GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*" + + cmake-multilib_src_test + + GTEST_FILTER="${GTEST_FILTER//-/}" + + cmake-multilib_src_test +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + + if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then + eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \ + "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" + die "Please update SLOT variable" + fi + + insinto /usr/share/vim/vimfiles/syntax + doins editors/proto.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/proto.vim" + + if use emacs; then + elisp-install "${PN}" editors/protobuf-mode.el* + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + DOCS+=(examples) + docompress -x "/usr/share/doc/${PF}/examples" + fi + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-libs/protobuf/protobuf-29.2.ebuild b/dev-libs/protobuf/protobuf-29.2.ebuild new file mode 100644 index 000000000000..3080cc281d8b --- /dev/null +++ b/dev-libs/protobuf/protobuf-29.2.ebuild @@ -0,0 +1,177 @@ +# Copyright 2008-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib elisp-common multilib + +# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules +ABSEIL_BRANCH="lts_2023_08_02" + +ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}" +ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}" + +if [[ "${PV}" == *9999 ]]; then + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git" + EGIT_SUBMODULES=( '-*' ) + MY_SLOT="28.0" + + inherit git-r3 +else + SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + MY_SLOT=$(ver_cut 1-2) +fi + +DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" +HOMEPAGE="https://protobuf.dev/" + +LICENSE="BSD" +SLOT="0/${MY_SLOT}.0" +IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib" + +# Require protobuf for the time being +REQUIRED_USE=" + protobuf + examples? ( protobuf protoc ) + libprotoc? ( protobuf ) + libupb? ( protobuf ) + protoc? ( protobuf ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + emacs? ( app-editors/emacs:* ) +" + +COMMON_DEPEND=" + >=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}] + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) +" + +DEPEND=" + ${COMMON_DEPEND} + conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] ) + test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${COMMON_DEPEND} + ${BDEPEND} +" + +PATCHES=( + "${FILESDIR}/${PN}-23.3-static_assert-failure.patch" + "${FILESDIR}/${PN}-27.4-findJsonCpp.patch" + "${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch" +) + +DOCS=( CONTRIBUTORS.txt README.md ) + +src_prepare() { + cmake_src_prepare + + cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die +} + +multilib_src_configure() { + local mycmakeargs=( + -Dprotobuf_ABSL_PROVIDER="package" + -Dprotobuf_JSONCPP_PROVIDER="package" + + -Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")" + -Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)" + -Dprotobuf_BUILD_LIBUPB="$(usex libupb)" + -Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)" + -Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)" + -Dprotobuf_BUILD_SHARED_LIBS="yes" + -Dprotobuf_BUILD_TESTS="$(usex test)" + + -Dprotobuf_DISABLE_RTTI="no" + + -Dprotobuf_INSTALL="yes" + -Dprotobuf_TEST_XML_OUTDIR="$(usex test)" + + -Dprotobuf_WITH_ZLIB="$(usex zlib)" + -Dprotobuf_VERBOSE="$(usex debug)" + -DCMAKE_MODULE_PATH="${S}/cmake" + ) + if use protobuf ; then + if use examples ; then + mycmakeargs+=( + -Dprotobuf_BUILD_EXAMPLES="$(usex examples)" + -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)" + ) + fi + fi + + use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" ) + + cmake_src_configure +} + +src_compile() { + cmake-multilib_src_compile + + if use emacs; then + elisp-compile editors/protobuf-mode.el + fi +} + +src_test() { + local -x srcdir="${S}/src" + + local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}" + mkdir -m 777 "${TEST_TMPDIR}" || die + + setup_test_env() { + ln -sr "${S}/src" "${BUILD_DIR}/include" || die + } + + multilib_foreach_abi setup_test_env + + # Do headstands for LTO # 942985 + local -x GTEST_FILTER + GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*" + + cmake-multilib_src_test + + GTEST_FILTER="${GTEST_FILTER//-/}" + + cmake-multilib_src_test +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + + if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then + eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \ + "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" + die "Please update SLOT variable" + fi + + insinto /usr/share/vim/vimfiles/syntax + doins editors/proto.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/proto.vim" + + if use emacs; then + elisp-install "${PN}" editors/protobuf-mode.el* + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + DOCS+=(examples) + docompress -x "/usr/share/doc/${PF}/examples" + fi + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild index 30ab416efd86..3080cc281d8b 100644 --- a/dev-libs/protobuf/protobuf-9999.ebuild +++ b/dev-libs/protobuf/protobuf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2024 Gentoo Authors +# Copyright 2008-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,32 +30,29 @@ LICENSE="BSD" SLOT="0/${MY_SLOT}.0" IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib" +# Require protobuf for the time being REQUIRED_USE=" - || ( - libprotoc - libupb - protobuf - protoc - ) + protobuf + examples? ( protobuf protoc ) + libprotoc? ( protobuf ) + libupb? ( protobuf ) + protoc? ( protobuf ) " RESTRICT="!test? ( test )" BDEPEND=" emacs? ( app-editors/emacs:* ) - !protobuf? ( - >=dev-libs/protobuf-${PV} - ) " COMMON_DEPEND=" - dev-libs/jsoncpp[${MULTILIB_USEDEP}] >=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}] zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) " DEPEND=" ${COMMON_DEPEND} + conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] ) test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] ) " RDEPEND=" @@ -64,7 +61,6 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch" "${FILESDIR}/${PN}-23.3-static_assert-failure.patch" "${FILESDIR}/${PN}-27.4-findJsonCpp.patch" "${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch" @@ -84,7 +80,6 @@ multilib_src_configure() { -Dprotobuf_JSONCPP_PROVIDER="package" -Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")" - -Dprotobuf_BUILD_EXAMPLES="$(usex examples)" -Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)" -Dprotobuf_BUILD_LIBUPB="$(usex libupb)" -Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)" @@ -95,13 +90,21 @@ multilib_src_configure() { -Dprotobuf_DISABLE_RTTI="no" -Dprotobuf_INSTALL="yes" - -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)" -Dprotobuf_TEST_XML_OUTDIR="$(usex test)" -Dprotobuf_WITH_ZLIB="$(usex zlib)" -Dprotobuf_VERBOSE="$(usex debug)" -DCMAKE_MODULE_PATH="${S}/cmake" ) + if use protobuf ; then + if use examples ; then + mycmakeargs+=( + -Dprotobuf_BUILD_EXAMPLES="$(usex examples)" + -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)" + ) + fi + fi + use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" ) cmake_src_configure @@ -127,6 +130,14 @@ src_test() { multilib_foreach_abi setup_test_env + # Do headstands for LTO # 942985 + local -x GTEST_FILTER + GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*" + + cmake-multilib_src_test + + GTEST_FILTER="${GTEST_FILTER//-/}" + cmake-multilib_src_test } diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest index 340cf2d171cd..cb020c19922c 100644 --- a/dev-libs/rccl/Manifest +++ b/dev-libs/rccl/Manifest @@ -1,7 +1,11 @@ AUX rccl-5.7.1-remove-chrpath.patch 592 BLAKE2B 8510698259154be9138c136c87c3650276140ac500a235049cdd1f8ea9dcc969ac6cd16b13ce628c448f1d5aa8c49818c455e761e96c24a0abc3aa0d3d431320 SHA512 7df69e5293edb3021f57caf9fa6ec12fd3c6a2841f62de4d6358092ec8f5c11f18d2f6434704e64c225327b3a55a4e64710cb07a82ebee103e4faa3865baa72d AUX rccl-6.0.2-fix-version-check.patch 552 BLAKE2B fb1230b262a959c783e6f796e83621c3b32f69cc81ab94c07a9596a8fa37bf2d496aebfe4bec97adf2873d3dc946e690d64f51b4d578528470436b9949cfa432 SHA512 efd6343ffd9b5dee9152787f993621e7bbd5a6d46d4b33d1c0c47ded4fd1a5da9dc753c956c646f48bde5dd6b61876a633d89810ba33861734ec2b2c0040d0ec +AUX rccl-6.3.0-headers-fix.patch 400 BLAKE2B 09bab334806f737e4a2675b435d8b386c1d671b8fdad8f458d1501cfdd9848d797d9cb6b385fe1b118ddfd991eb370763b936c693b77d232895653d56f610428 SHA512 e20da2a824e2669d160d6724b4efc362787e79dcfa547153ab2531731f1d239cf44394cf248e2e5abfd0feb5c7906e710acda05e08656584c529e4fa9a44f11f +AUX rccl-6.3.0-same-rank-sendrecv.patch 13180 BLAKE2B 28d2d7d904ce2cb3008fd4a7472a93336cb9f1e3efd3d15b18d8142eb8b34ca9860907a23f64f818ff8c5611b94d11351a8c8b9dfdd103f58e8206f9b9330838 SHA512 c8fc176f0b7ec560eeef312fc60a53efa7e5c0e73f06b21f279d4c0c86715464eb698749dbe7953b3feb55c0a6e85e95ea5ef68c8a669ce648d9c02dfccc3398 DIST rccl-5.7.1.tar.gz 1425561 BLAKE2B 852c111ad806d5c99f48b3c65c8cf37315c68b969f9544bfa14c1faf1d5557edcc57cdc21705ced6ded4a0288d42b1076e65fb67b3f89b4fa78cfba9d317b23e SHA512 5913b8ff67fa787714713b7d5b571374898be740d56c77db9f04fe7a3e6ca74023fa930a3494d8a6f984ac9e68ee318343835e110049d08700fe773376618af4 DIST rccl-6.1.1.tar.gz 1679144 BLAKE2B 371d64691dc74f875c49e14df8f3f2d8b9c607376e6c5a889bd2bdb50607e88715d6d75ffed4ba3184a5b9b241cb37b8501e927a5f495632212909e410102490 SHA512 6c6376dd822182bcf28f573c0f3b5c7e52f94f4b670ee7c88519232f51b443d52cd37cbe6c41b5b6e9cb0b93c1124246a989f6e6a2ae74935134135585118002 +DIST rccl-6.3.0.tar.gz 1828647 BLAKE2B 8c312fc51e7d600bb62fa059e1af53e153955b79b2ba2e8a6b6b52228b9217b7df6dc815c3a48c0800aaa9387f645070e079d04e99c0e8ebdfe41d5ebe0bda06 SHA512 a068b4a21786176638d108c8c85d5e5a8b0413335b555c2602f2a2e0b9f291f6872dbf68fbb5a17a6a0af9d9b5a90b1b37cce63b655a867b68fc9e20d49931ea EBUILD rccl-5.7.1.ebuild 1836 BLAKE2B 3286a92c9d08f9e0baac3ad3fbf0a9782109788b999bab8ac4864fa0ab47a6fcd53a73eee2d34a7cb5400998e60f246ec64df6f4a3f8bb07c38405e7f0b4417b SHA512 dd4dfeecdd908eeddba9d0450eba831ccc4778accbcab6023d4d47bac218d2e5d92a967744796b7c8854a579c5df16d8253795dd294183b2054dcf725a0372ae EBUILD rccl-6.1.1.ebuild 1612 BLAKE2B e175a46484a37e31f0fc0ab3db662a2faaa1ff72cd21f6cbf4540245bc7be012baa9c6c0dc40bdfde39674a0f08ea898b33673db395de3288879ebd778a94ff0 SHA512 2ae7ea089fbac169fe09aed8d82dadb0bd343bee2e525470965987068ea364999e29022298468dfc91d9c625bcfd06e0ea695550275604a4d211d3e30cd322fe +EBUILD rccl-6.3.0.ebuild 1705 BLAKE2B a732614eb178cb84b53441b83387d5b212c9386c3a48ac3ef39061038da4a60b48bb690aab6af3066aa92d350135913c30dedc054e7e1a87de458042cff91de5 SHA512 1e675f02d76ce4ae18b30cf308ac160db3c100dfbf55d16b94164806880f3f4ae9a970032d881debc19cee1591953220acdad4a120cb05c724b9377870d55fd2 MISC metadata.xml 695 BLAKE2B 7d52b2606665aebfade0d15c339f04fe9ac743d1ef402437adefa6a1ab710ae8e0367172cfa3bae8876609d40d26356cc9a93f555fd28f887cff957e38192416 SHA512 6b1d2a88fb7f88bc2bd1fd7126ba33a7d63b6e323cf43072a6c56fad3a5b8cde4262bc7ed7c9485a650544d562377b146d52088e2ecdd8c0e65d0b91addea57c diff --git a/dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch b/dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch new file mode 100644 index 000000000000..297627819f2c --- /dev/null +++ b/dev-libs/rccl/files/rccl-6.3.0-headers-fix.patch @@ -0,0 +1,12 @@ +gtest 1.14 included iomanip, gtest 1.15 does not anymore. +Upstream bug: https://github.com/ROCm/rccl/issues/1455 +--- a/test/common/TestBed.cpp ++++ b/test/common/TestBed.cpp +@@ -4,6 +4,7 @@ + * See LICENSE.txt for license information + ************************************************************************/ + #include <unistd.h> ++#include <iomanip> + #include "TestBed.hpp" + #include <rccl/rccl.h> + diff --git a/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch b/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch new file mode 100644 index 000000000000..435d6ac57b0f --- /dev/null +++ b/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch @@ -0,0 +1,250 @@ +Enable UT sendrecv to same rank. Fixes test failure. +Backports commit: https://github.com/ROCm/rccl/commit/fd9924cfe7afbb94b1f157972ba001865481480a +--- a/test/SendRecvTests.cpp ++++ b/test/SendRecvTests.cpp +@@ -16,7 +16,6 @@ namespace RcclUnitTesting + std::vector<int> const numElements = {1048576, 53327, 1024, 0}; + bool const inPlace = false; + bool const useManagedMem = false; +- int const groupCallId = 0; + + OptionalColArgs options; + bool isCorrect = true; +@@ -28,7 +27,10 @@ namespace RcclUnitTesting + int ranksPerGpu = rpg == 0 ? 1 : testBed.ev.maxRanksPerGpu; + int totalRanks = numGpus * ranksPerGpu; + int const numProcesses = isMultiProcess ? numGpus : 1; +- testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu), 1); ++ testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu), ++ {1,2}, //two group, second group sendrecv to self, has 2 coll ++ testBed.GetNumStreamsPerGroup(1,2), ++ 2); + + for (int dataIdx = 0; dataIdx < dataTypes.size() && isCorrect; ++dataIdx) + for (int numIdx = 0; numIdx < numElements.size() && isCorrect; ++numIdx) +@@ -37,6 +39,8 @@ namespace RcclUnitTesting + for (int recvRank = 0; recvRank < totalRanks; ++recvRank) + { + options.root = recvRank; ++ int groupCallId = sendRank == recvRank; //self sendrecv group has two coll ++ int recvId = sendRank == recvRank; //where recv will be second coll + testBed.SetCollectiveArgs(ncclCollSend, + dataTypes[dataIdx], + numElements[numIdx], +@@ -47,36 +51,46 @@ namespace RcclUnitTesting + sendRank); + if (recvRank == 0) + { +- testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, sendRank); +- testBed.PrepareData(groupCallId, 0, sendRank); +- } +- if (recvRank != sendRank) +- { +- if (testBed.ev.showNames) // Show test names +- INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n", +- isMultiProcess ? "MP" : "SP", +- ncclDataTypeNames[dataTypes[dataIdx]], +- sendRank, +- recvRank, +- numElements[numIdx]); +- +- options.root = sendRank; +- testBed.SetCollectiveArgs(ncclCollRecv, ++ //set up the collArg slot to make sure AllocateMem is called once and correctly ++ testBed.SetCollectiveArgs(ncclCollSend, + dataTypes[dataIdx], + numElements[numIdx], + numElements[numIdx], + options, + 0, +- groupCallId, +- recvRank); +- testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, recvRank); +- testBed.PrepareData(groupCallId, 0, recvRank); +- testBed.ExecuteCollectives({sendRank, recvRank}); +- testBed.ValidateResults(isCorrect, groupCallId, 0, recvRank); +- testBed.DeallocateMem(groupCallId, 0, recvRank); ++ !groupCallId, ++ sendRank); ++ testBed.AllocateMem(inPlace, useManagedMem, 0, 0, sendRank); ++ testBed.PrepareData(0, 0, sendRank); ++ testBed.AllocateMem(inPlace, useManagedMem, 1, 0, sendRank); ++ testBed.PrepareData(1, 0, sendRank); + } ++ ++ if (testBed.ev.showNames) // Show test names ++ INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n", ++ isMultiProcess ? "MP" : "SP", ++ ncclDataTypeNames[dataTypes[dataIdx]], ++ sendRank, ++ recvRank, ++ numElements[numIdx]); ++ options.root = sendRank; ++ ++ testBed.SetCollectiveArgs(ncclCollRecv, ++ dataTypes[dataIdx], ++ numElements[numIdx], ++ numElements[numIdx], ++ options, ++ recvId, ++ groupCallId, ++ recvRank); ++ testBed.AllocateMem(inPlace, useManagedMem, groupCallId, recvId, recvRank); ++ testBed.PrepareData(groupCallId, recvId, recvRank); ++ testBed.ExecuteCollectives({sendRank, recvRank}, groupCallId); ++ testBed.ValidateResults(isCorrect, groupCallId, recvId, recvRank); ++ testBed.DeallocateMem(groupCallId, recvId, recvRank); + } +- testBed.DeallocateMem(groupCallId, 0, sendRank); ++ testBed.DeallocateMem(0, 0, sendRank); ++ testBed.DeallocateMem(1, 0, sendRank); + } + testBed.DestroyComms(); + } +@@ -94,7 +108,6 @@ namespace RcclUnitTesting + bool const inPlace = false; + bool const useManagedMem = false; + bool const userRegistered = true; +- int const groupCallId = 0; + + OptionalColArgs options; + bool isCorrect = true; +@@ -106,7 +119,10 @@ namespace RcclUnitTesting + int ranksPerGpu = rpg == 0 ? 1 : testBed.ev.maxRanksPerGpu; + int totalRanks = numGpus * ranksPerGpu; + int const numProcesses = isMultiProcess ? numGpus : 1; +- testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu), 1); ++ testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu), ++ {1,2}, //two group, second group sendrecv to self, has 2 coll ++ testBed.GetNumStreamsPerGroup(1,2), ++ 2); + + for (int dataIdx = 0; dataIdx < dataTypes.size() && isCorrect; ++dataIdx) + for (int numIdx = 0; numIdx < numElements.size() && isCorrect; ++numIdx) +@@ -115,6 +131,8 @@ namespace RcclUnitTesting + for (int recvRank = 0; recvRank < totalRanks; ++recvRank) + { + options.root = recvRank; ++ int groupCallId = sendRank == recvRank; ++ int recvId = sendRank == recvRank; + testBed.SetCollectiveArgs(ncclCollSend, + dataTypes[dataIdx], + numElements[numIdx], +@@ -125,36 +143,45 @@ namespace RcclUnitTesting + sendRank); + if (recvRank == 0) + { +- testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, sendRank, userRegistered); +- testBed.PrepareData(groupCallId, 0, sendRank); +- } +- if (recvRank != sendRank) +- { +- if (testBed.ev.showNames) // Show test names +- INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n", +- isMultiProcess ? "MP" : "SP", +- ncclDataTypeNames[dataTypes[dataIdx]], +- sendRank, +- recvRank, +- numElements[numIdx]); +- +- options.root = sendRank; +- testBed.SetCollectiveArgs(ncclCollRecv, ++ testBed.SetCollectiveArgs(ncclCollSend, + dataTypes[dataIdx], + numElements[numIdx], + numElements[numIdx], + options, + 0, +- groupCallId, +- recvRank); +- testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, recvRank, userRegistered); +- testBed.PrepareData(groupCallId, 0, recvRank); +- testBed.ExecuteCollectives({sendRank, recvRank}); +- testBed.ValidateResults(isCorrect, groupCallId, 0, recvRank); +- testBed.DeallocateMem(groupCallId, 0, recvRank); ++ !groupCallId, ++ sendRank); ++ testBed.AllocateMem(inPlace, useManagedMem, 0, 0, sendRank, userRegistered); ++ testBed.PrepareData(0, 0, sendRank); ++ testBed.AllocateMem(inPlace, useManagedMem, 1, 0, sendRank, userRegistered); ++ testBed.PrepareData(1, 0, sendRank); + } ++ ++ if (testBed.ev.showNames) // Show test names ++ INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n", ++ isMultiProcess ? "MP" : "SP", ++ ncclDataTypeNames[dataTypes[dataIdx]], ++ sendRank, ++ recvRank, ++ numElements[numIdx]); ++ ++ options.root = sendRank; ++ testBed.SetCollectiveArgs(ncclCollRecv, ++ dataTypes[dataIdx], ++ numElements[numIdx], ++ numElements[numIdx], ++ options, ++ recvId, ++ groupCallId, ++ recvRank); ++ testBed.AllocateMem(inPlace, useManagedMem, groupCallId, recvId, recvRank, userRegistered); ++ testBed.PrepareData(groupCallId, recvId, recvRank); ++ testBed.ExecuteCollectives({sendRank, recvRank}, groupCallId); ++ testBed.ValidateResults(isCorrect, groupCallId, recvId, recvRank); ++ testBed.DeallocateMem(groupCallId, recvId, recvRank); + } +- testBed.DeallocateMem(groupCallId, 0, sendRank); ++ testBed.DeallocateMem(0, 0, sendRank); ++ testBed.DeallocateMem(1, 0, sendRank); + } + testBed.DestroyComms(); + } +--- a/test/common/TestBedChild.cpp ++++ b/test/common/TestBedChild.cpp +@@ -395,6 +395,8 @@ namespace RcclUnitTesting + { + CollectiveArgs& collArg = this->collArgs[groupId][localRank][collIdx]; + CHECK_CALL(collArg.AllocateMem(inPlace, useManagedMem, userRegistered)); ++ if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv)) ++ CHILD_NCCL_CALL(ncclCommRegister(this->comms[localRank], collArg.inputGpu.ptr, collArg.numInputBytesAllocated, &(collArg.commRegHandle)),"ncclCommRegister"); + if (this->verbose) INFO("Rank %d on child %d allocates memory for collective %d in group %d on device %d (%s,%s,%s) Input: %p Output %p\n", + globalRank, this->childId, collIdx, groupId, this->deviceIds[localRank], + inPlace ? "in-place" : "out-of-place", +@@ -646,8 +648,6 @@ namespace RcclUnitTesting + "ncclAllToAllv"); + break; + case ncclCollSend: +- if (collArg.userRegistered) +- CHILD_NCCL_CALL_RANK(errCode, ncclCommRegister(this->comms[localRank], collArg.inputGpu.ptr, collArg.numInputBytesAllocated, &(collArg.commRegHandle)),"ncclCommRegister"); + CHILD_NCCL_CALL_RANK(errCode, ncclSend( + collArg.inputGpu.ptr, + collArg.numInputElements, +@@ -658,8 +658,6 @@ namespace RcclUnitTesting + "ncclSend"); + break; + case ncclCollRecv: +- if (collArg.userRegistered) +- CHILD_NCCL_CALL_RANK(errCode, ncclCommRegister(this->comms[localRank], collArg.outputGpu.ptr, collArg.numOutputBytesAllocated, &(collArg.commRegHandle)), "ncclCommRegister"); + CHILD_NCCL_CALL_RANK(errCode, ncclRecv( + collArg.outputGpu.ptr, + collArg.numOutputElements, +@@ -891,8 +889,6 @@ namespace RcclUnitTesting + for (int collIdx = 0; collIdx < collArgs[groupId][localRank].size(); ++collIdx) + { + CollectiveArgs& collArg = this->collArgs[groupId][localRank][collIdx]; +- if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv)) +- CHILD_NCCL_CALL(ncclCommDeregister(this->comms[localRank], collArg.commRegHandle), "ncclCommDeregister"); + if (collId == -1 || collId == collIdx) + { + if (this->verbose) +@@ -900,6 +896,10 @@ namespace RcclUnitTesting + INFO("Child %d release memory for collective %d in group %d (Input: %p Output %p\n", + this->childId, collIdx, groupId, collArg.inputGpu.ptr, collArg.outputGpu.ptr); + } ++ if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv)) ++ { ++ CHILD_NCCL_CALL(ncclCommDeregister(this->comms[localRank], collArg.commRegHandle), "ncclCommDeregister"); ++ } + + CHECK_CALL(collArg.DeallocateMem()); + } diff --git a/dev-libs/rccl/rccl-6.3.0.ebuild b/dev-libs/rccl/rccl-6.3.0.ebuild new file mode 100644 index 000000000000..d610f7eb139c --- /dev/null +++ b/dev-libs/rccl/rccl-6.3.0.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake edo rocm flag-o-matic + +DESCRIPTION="ROCm Communication Collectives Library (RCCL)" +HOMEPAGE="https://github.com/ROCm/rccl" +SRC_URI="https://github.com/ROCm/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz" +S="${WORKDIR}/rccl-rocm-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=" + dev-util/hip:${SLOT} + dev-util/rocm-smi:${SLOT}" +DEPEND="${RDEPEND} + sys-libs/binutils-libs" +BDEPEND=" + >=dev-build/cmake-3.22 + >=dev-build/rocm-cmake-5.7.1 + dev-util/hipify-clang:${SLOT} + test? ( dev-cpp/gtest )" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-6.0.2-fix-version-check.patch" + "${FILESDIR}/${PN}-6.3.0-same-rank-sendrecv.patch" + "${FILESDIR}/${PN}-6.3.0-headers-fix.patch" +) + +src_prepare() { + cmake_src_prepare + + # https://reviews.llvm.org/D69582 - clang does not support parallel jobs + sed '/parallel-jobs/d' -i CMakeLists.txt || die + + # complete fix-version-check patch + sed "s/@rocm_version@/${PV}/" -i CMakeLists.txt || die + + # don't install tests + sed "/rocm_install(TARGETS rccl-UnitTests/d" -i test/CMakeLists.txt || die +} + +src_configure() { + rocm_use_hipcc + + # lto flags make compilation fail with "undefined hidden symbol" + filter-lto + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TESTS=$(usex test ON OFF) + -DROCM_SYMLINK_LIBS=OFF + -DROCM_PATH="${EPREFIX}/usr" + -DRCCL_ROCPROFILER_REGISTER=OFF + -Wno-dev + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}" || die + LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests +} diff --git a/dev-libs/rocdbgapi/Manifest b/dev-libs/rocdbgapi/Manifest index f884c00ddde6..da1259b3d8ec 100644 --- a/dev-libs/rocdbgapi/Manifest +++ b/dev-libs/rocdbgapi/Manifest @@ -1,5 +1,8 @@ +AUX rocdbgapi-6.3.0-fix-libcxx.patch 1214 BLAKE2B 941ce91241a99bfa7cbacd22e2442399a70692c976a021b513c7282a755afefa97bb1f7c730d5f9f5c1a77677197973c275070ed7ede3ebc3dea813d8287b823 SHA512 7e70cd1e8327aba217aaabeb54594e905d409f421c4a34e3c31408d904567515f65072f493f059e4a986b971adaf82c4eb3db22afbe28080e2f97c3deb65c476 DIST rocdbgapi-5.7.1.tar.gz 251913 BLAKE2B 96dc859937fdde75a3d68368b29efdd14711e256c7d3c60cd40b128e9a0c066f108c02f7d47d9d64d7ca485e85e9d56d48cac6c67088fc3fbafe44d1d23a7ce2 SHA512 e30cf6062b07ced7de1660398cd84d104e632907cfaf9bc05d29289a81a977c2272b69ff0810db201675f9d7e8476b4451c988ad9da0a13eee01fffdde839d26 DIST rocdbgapi-6.1.1.tar.gz 254274 BLAKE2B 1621dc715e2540578126ff2fa6dc30dc9db711689e82b5c750dd203aafa091c00f897425a372d4617bec25eddb7b9a44105e8c9b46eb660e197602ede2beecba SHA512 d613e633e27ad9f582b9612d7d088c3ea465c29d6520e94b4821e0340c736e556dcd4a89f8027701097ee4e2d8b55640a232d484f9fa26f8a9165c648f8af219 +DIST rocdbgapi-6.3.0.tar.gz 275368 BLAKE2B da4ee565d0bbafad4838ca6a346525bfc0e174ee39a1e4d99da16f2ba041885211d38cc9f9aac0ab0358b62557061f7c4cfc8fd3bcf241398b510ea952d56254 SHA512 b9acf8787fa6e76bd9d28a36b3c09932d830085cbdc4b6712d481c19cb36c2fd4ff50fb31fd249d9a523c053019657ae7eace850102be94170c327d4efb49e9d EBUILD rocdbgapi-5.7.1.ebuild 1198 BLAKE2B 228aab82524870227733d7aeb6428de6d97974ce35ba94026766413dae743a80837fddac66984f21d36fd3dc35ed592eb44d41ad3e47ea809b0bc88604fb4a74 SHA512 6f8871f8dfced05905b9e9acc84fcf0bdb9ccc4cae9c96c61aedbf7818b4943fe94696f96ba8dba99f00e24986d1fbef923b2fd7b9744f6e890eace7a659b118 EBUILD rocdbgapi-6.1.1.ebuild 1325 BLAKE2B b9c0086ce53a33a0280195fcbebe6bd9f030bd9390f73e4dc215bd7013c29985df13a268241da1db239262c102c4ccd32fc4de43b4d96bfe26b5e96fd5aa058c SHA512 fa6a2476f939534ed7ef4862c13e2d87967902822cd666c52c54e582d050af3a0eb3311f3888649abbdddc562698996dee4e534761cc1ccbbf83023ff1c9d81f +EBUILD rocdbgapi-6.3.0.ebuild 1382 BLAKE2B f86587c1c463cd4577cf1f3fd08cf949c280690ae5ecdb74143f7fa4b4d22f5ee01d8769c9ddf2d6297767b7381f3f0315e8845f40840d9f85fe4596b7e71456 SHA512 ee28d531cd56f2a11501eae6217ccdc3c2b5d4e3593e7700cfcd91a474f25d905f356b8d9679e6a8d70534018c07aada03f2805843550122128bba79ec4bdf86 MISC metadata.xml 499 BLAKE2B bf9cb4f91d5c6160bce2f5df41177fc18b153cd8c8c6a13384c68fddb4a9a6011eb0d40339af7f1d9c01200af57ee431d9193f68ed9724549445ec908ff07796 SHA512 7ed8d2bcb55b46e57cdbea6c4e6242ab5f660c7b1537c9ddfeb0c426495bc4c5e7e78b54bf66940d582c42913a1b3d36c5fc821abd7da666c782c141c001b355 diff --git a/dev-libs/rocdbgapi/files/rocdbgapi-6.3.0-fix-libcxx.patch b/dev-libs/rocdbgapi/files/rocdbgapi-6.3.0-fix-libcxx.patch new file mode 100644 index 000000000000..b51901035ca6 --- /dev/null +++ b/dev-libs/rocdbgapi/files/rocdbgapi-6.3.0-fix-libcxx.patch @@ -0,0 +1,37 @@ +Fix for libc++ (std::basic_ostringstream<char> is not a part of C++ standard). +Upstream bug: https://github.com/ROCm/ROCdbgapi/issues/18 +--- a/src/os_driver.cpp ++++ b/src/os_driver.cpp +@@ -1006,12 +1006,12 @@ public: + template <typename T, std::enable_if_t<!std::is_pointer_v<T>, int> = 0> + void write (const T &v) + { +- m_stream.write (reinterpret_cast<const std::byte *> (&v), sizeof (T)); ++ m_stream.write (reinterpret_cast<const char *> (&v), sizeof (T)); + } + + void write (const std::vector<std::byte> &v) + { +- m_stream.write (reinterpret_cast<const std::byte *> (v.data ()), ++ m_stream.write (reinterpret_cast<const char *> (v.data ()), + v.size ()); + } + +@@ -1026,7 +1026,7 @@ public: + + auto str = m_stream.str (); + note.size = str.size (); +- auto buffer = amd::dbgapi::allocate_memory<std::byte> (note.size); ++ auto buffer = amd::dbgapi::allocate_memory<char> (note.size); + std::copy (str.begin (), str.end (), buffer.get ()); + note.data = buffer.release (); + +@@ -1034,7 +1034,7 @@ public: + } + + private: +- std::basic_ostringstream<std::byte> m_stream; ++ std::basic_ostringstream<char> m_stream; + }; + + }; /* anonymous namespace. */ diff --git a/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild b/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild new file mode 100644 index 000000000000..bac45a37c3f1 --- /dev/null +++ b/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="AMD Debugger API" +HOMEPAGE="https://github.com/ROCm/ROCdbgapi" +SRC_URI="https://github.com/ROCm/ROCdbgapi/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/ROCdbgapi-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +IUSE="doc" + +BDEPEND=" + doc? ( + app-text/doxygen[dot] + virtual/latex-base + dev-texlive/texlive-latexextra + dev-texlive/texlive-plaingeneric + ) +" +RDEPEND=" + dev-libs/rocm-comgr:${SLOT} + dev-libs/rocr-runtime:${SLOT} +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-6.3.0-fix-libcxx.patch" +) + +src_prepare() { + sed -e "s/-Werror//" \ + -e "s/if(DOXYGEN_FOUND)/if(WITH_DOCS AND DOXYGEN_FOUND)/" \ + -e "s:\${CMAKE_INSTALL_DATADIR}/html/amd-dbgapi:\${CMAKE_INSTALL_DOCDIR}/html:" \ + -i CMakeLists.txt || die + + # Clang 19 detects error + # https://github.com/ROCm/ROCdbgapi/issues/12 + sed -e "s/->n_next/->m_next/g" -i src/utils.h || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_DOCS=$(usex doc ON OFF) + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + + # remove unneeded copy + rm -r "${ED}/usr/share/doc/${PF}-asan" || die +} diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index 708bebe3e64f..32581b971320 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -31,10 +31,12 @@ AUX rocm-comgr-6.1.0-dont-add-nogpulib.patch 1020 BLAKE2B e99408ab32428b7a320d10 AUX rocm-comgr-6.1.0-enforce-oop-compiler.patch 996 BLAKE2B c4c0bfe9bf55f2f4e8661f01ed1b2ec03f4c07691facad063cc03bda2599fcc94648549a829694b7e5f6d4b82d42f7c92e1ce8cea9e934f37b62f7beda4dd48f SHA512 97f850115b8cdd2c5a2091ca26cc40b9e13cfa86a7980f7730c55932b6db254580f86f267ce7a2b3af739210db55faa29e06e57bdbc11eaa9cfa08d3e4929ea9 AUX rocm-comgr-6.1.0-fix-comgr-default-flags.patch 1967 BLAKE2B c71628e83827738d2458a69a27fb44fbcba44ca6633e9a6856406627b0b4451b996876cc8e86c46382f40006efe472488d2b81ed3571d48e18505eb4fe9b673a SHA512 c85715e427a10f92eb91d6cdb7bd4b455371694b1a87429978e82b9f5127e37710558795541a616395e29735ac57325f3c094ba8c40badb6612aea6865ac4ffa AUX rocm-comgr-6.1.0-llvm-18-compat.patch 2990 BLAKE2B cf3c2ca3933ad714de6d98404a9d97bcca98ba7536228ad7e1396c0e4a8cc6b88b7bba12857e599f96d9fde3d37033a9a9c7c123c230d4af3b5d942206af0941 SHA512 f36e2d6b16f78e93a8291f914d122dfd917aeb0d09e1545f44cb16ab0f064710d450b4e7aa24b6b2ee374c29821d464f878efcc1660e00456118c839e89b31a0 -AUX rocm-comgr-6.2.2-missing-isa.patch 1104 BLAKE2B eecabceb743e0a2bd31de5e55c0d743daa6bea3ecc862b9e9961e4a29f8b09e1ba8268be90e2c295634c17cacf9fef143b4801a5a8a61443dbf27d83b55576a3 SHA512 c5f08ee930d9198a1788483d6df37e8a27aeb8bdc21444e2994e515e2e214f1d294f5ff595a67af4b95304f005f81fd3f7c1fcd1c54d40746b8abc95efe723cd +AUX rocm-comgr-6.3.0-bypass-device-libs-copy.patch 971 BLAKE2B 3e1f0314dc92e2f33bb26d0fb19c912c734f3bf5d3dd63af11619679173598964b6551132b1e4da97ad248dbb6d342fbfd87e5069a05d94d7313738e43e47167 SHA512 52478e60f40150bbb20cd13bbe3dd46abc52b78d26bedb53ea40fba8bdb5eef4622d03fcf28373ebf02e9077c4f9265a49ce751b3930ddf1f469293a750a2066 +AUX rocm-comgr-6.3.0-fix-comgr-default-flags.patch 1530 BLAKE2B 99afaf2f461de4e1edfd55774540d62f45020342185b1acd33517f085ed92be562344652aa8e19bc42171f469b1f15eec87ac00b27abe1cfb0ce7b8cee0c164c SHA512 a81433f8bb21c4791453cf469379ef82fbfc2493e91647279901ad98ce26c710b5ae177d9487d08d616b468b9c5efc219eceaf0a7f25458f2c9d05290f39ac6b +AUX rocm-comgr-6.3.0-llvm-19-compat.patch 2564 BLAKE2B 823db031e8e09946396f7e4e73a4ac04b6fd99db70e8c80ce19fa269e0c782bfea8198367f0e22157e5171fc120f0f49cffe8c7b410e6596d8dbf3cf3413724d SHA512 145cf9660b443dd3536425c06ed2cfdb65fb865721cf426ac3f48b4513dbb87c85f7f4e07be7046bb3ebbafb4eec4bd9c911c944a0311193dc054fb4b0ea28a4 DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0 -DIST llvm-project-rocm-6.2.4.tar.gz 206742705 BLAKE2B e4d40c900b56a3d31003295c517fcb8fdc5cb0954f298d541d545c6d142746eecfa70a44bfdcb9044d70284f15af612c27dbd55d51e94e638e03bf21c1d3bc06 SHA512 5c5784c318c607168c9d2227ce1150e92fdc6aa457a9e64d62745a70f6fce92c4d4b1202422940f1ccc37a4bccf1efb220d8be39ec2ffdba7591d17e54ec8a5f +DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59 DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b DIST rocm-comgr-5.3.3.tar.gz 120414 BLAKE2B 29b9d466d74ef94165a2b9bea35eac4616f6b2fc529cdac3c830ee7dc08f219cb9e5d4f081658881c76633f12eaebb74d1a2ea30a76652231b8ee516f9988db1 SHA512 ba7b1ef214e3624168e438ed7fd94291a07508fe89d178c0b158bf22e0998d5a8e4d8f0a7f08f05ac108ef65f725db5764fd66353a85bc25000e572a4fdcb61f DIST rocm-comgr-5.4.3.tar.gz 120461 BLAKE2B c4eb79dd5a72a2b18e16841fc8cb9a3a33efb0c7b04a7585df9672d682bba6fa826ab8b37dba5febca3b8c5ee5aca30d8546e1fa69e77671e5c750e2a8c1f12f SHA512 1a25af99a0166d70ca6dc5df5a667068eaf583dccd74bbb18a2a5de3c1b769e0c1eb9a0c539e0cd88bc50bbbe53214a1d1b23fbdfd6fc5b6507c44da259815c4 @@ -47,5 +49,5 @@ EBUILD rocm-comgr-5.5.1.ebuild 2022 BLAKE2B 38cadb6763e798bca799f098b2c4809cc91f EBUILD rocm-comgr-5.7.1.ebuild 2027 BLAKE2B 437bdde0cc68f29c920d7d98731f3c816960039f33dd0e8e5f37a0e063495112394ea8e6d0feff294bb866cf0d5d259c6344280f058f01c5ea6300f6ae70afbd SHA512 d49a7564b5a549a7784db274f5a17463a006ec08dbc32fee365bb56e3dd1c5b90b5643463910209a65a09d0d99f56a53e233b6d394a7c5da3b06e45a4e1b3a1f EBUILD rocm-comgr-6.1.1.ebuild 2403 BLAKE2B b19d984c535a3fa4df5f1af1a5fc26b9c9f00c2347ac3dcc0faea4be30cd11bf8f3984d7afcb0709a32d4897e825cbbf714accd04e2be33eb12627e8e80f3309 SHA512 4d340d46831c089e2b9f9d1d44e0b1d2a0cd020cb50eed8589a5f745ec5c806b9ff65d0751b7439366135cc3bb801d725586e4f285ec27b24e90cac69383cd3a EBUILD rocm-comgr-6.1.2.ebuild 2403 BLAKE2B b19d984c535a3fa4df5f1af1a5fc26b9c9f00c2347ac3dcc0faea4be30cd11bf8f3984d7afcb0709a32d4897e825cbbf714accd04e2be33eb12627e8e80f3309 SHA512 4d340d46831c089e2b9f9d1d44e0b1d2a0cd020cb50eed8589a5f745ec5c806b9ff65d0751b7439366135cc3bb801d725586e4f285ec27b24e90cac69383cd3a -EBUILD rocm-comgr-6.2.4.ebuild 2339 BLAKE2B 5f30ce4a4974e07ff8cbc6a2f19edf918c7b8b4a59dc10b273261c59f875ee4c60e73abbcefe67a9486ab31d83eabc9499a873451f14bcbbeb42cf95118719ef SHA512 cfcd3b6372bf443a4fa2316fcb1ac322219b8b0217dce6740c07f70cc4452b7c8bb3a209e0b4eb064aa9e865ade045345b412d300b04976e723229d1087383f4 +EBUILD rocm-comgr-6.3.0.ebuild 2418 BLAKE2B 4111a7c233343f694f7c726e02ea37f8be293955804fce29d626889224437198a8cc4e7eec1728af2bcb0e700df113b09a1902e7279ceff9831f443b9d4f7db5 SHA512 e6a4dfd1163ebcce5106c0b3ae1bb536f34741e74ec91f4584dc6d02e9c8bf293229f3fa653169663667b292a9f42f4792795e6c151018c9b19ab17ad6e8275f MISC metadata.xml 638 BLAKE2B d2396daa1a9e505ff3fc3b7a2465f4ca5c933ac8609c08732513c30ebb715f244681075b8b415b75a0d0c330144cb6fab483e6b4231b1144c3bf3bc5091693f3 SHA512 da41a365f6d75e8feabed3a54ca117a8406cabec215137751280ab5985ab86e178a14183e804af220b49b83d4084489c1ec1dd1d543aaa585d910b6636b866c4 diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch deleted file mode 100644 index ea8e3ee1eabf..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/comgr-isa-metadata.def 2024-10-14 13:40:22.023251450 -0000 -+++ b/src/comgr-isa-metadata.def 2024-10-14 13:40:31.949824212 -0000 -@@ -89,7 +89,6 @@ - HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1103", false, false, EF_AMDGPU_MACH_AMDGCN_GFX1103, true, 65536, 32, 4, 40, 1024, 106, 800, 106, 16, 1024, 256) - HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1150", false, false, EF_AMDGPU_MACH_AMDGCN_GFX1150, true, 65536, 32, 4, 40, 1024, 106, 800, 106, 16, 1024, 256) - HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1151", false, false, EF_AMDGPU_MACH_AMDGCN_GFX1151, true, 65536, 32, 4, 40, 1024, 106, 800, 106, 24, 1536, 256) --HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1152", false, false, EF_AMDGPU_MACH_AMDGCN_GFX1152, true, 65536, 32, 4, 40, 1024, 106, 800, 106, 16, 1024, 256) - HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1200", false, false, EF_AMDGPU_MACH_AMDGCN_GFX1200, true, 65536, 32, 4, 40, 1024, 106, 800, 106, 24, 1536, 256) - HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1201", false, false, EF_AMDGPU_MACH_AMDGCN_GFX1201, true, 65536, 32, 4, 40, 1024, 106, 800, 106, 24, 1536, 256) diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-bypass-device-libs-copy.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-bypass-device-libs-copy.patch new file mode 100644 index 000000000000..8c126d9a5108 --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-bypass-device-libs-copy.patch @@ -0,0 +1,28 @@ +Use files from dev-libs/rocm-device-libs instead of their copy in /tmp. +--- a/src/comgr-compiler.cpp ++++ b/src/comgr-compiler.cpp +@@ -1070,24 +1070,7 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { + } + + amd_comgr_status_t AMDGPUCompiler::addDeviceLibraries() { +- llvm::SmallString<128> FakeRocmDir = TmpDir; +- path::append(FakeRocmDir, "rocm"); +- llvm::SmallString<128> DeviceLibsDir = FakeRocmDir; +- path::append(DeviceLibsDir, "amdgcn", "bitcode"); +- if (fs::create_directory(InputDir)) { +- return AMD_COMGR_STATUS_ERROR; +- } +- Args.push_back(Saver.save(Twine("--rocm-path=") + FakeRocmDir).data()); + NoGpuLib = false; +- +- for (auto DeviceLib : getDeviceLibraries()) { +- llvm::SmallString<128> DeviceLibPath = DeviceLibsDir; +- path::append(DeviceLibPath, std::get<0>(DeviceLib)); +- if (auto Status = outputToFile(std::get<1>(DeviceLib), DeviceLibPath)) { +- return Status; +- } +- } +- + return AMD_COMGR_STATUS_SUCCESS; + } + diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-fix-comgr-default-flags.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-fix-comgr-default-flags.patch new file mode 100644 index 000000000000..2d4ed66481cc --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-fix-comgr-default-flags.patch @@ -0,0 +1,40 @@ +--- a/src/comgr-compiler.cpp ++++ b/src/comgr-compiler.cpp +@@ -1031,9 +1031,8 @@ AMDGPUCompiler::addTargetIdentifierFlags(llvm::StringRef IdentStr, + } + + amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { +- HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str(); +- // HIP headers depend on hsa.h which is in ROCM_DIR/include. +- ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str(); ++ // Allow to include <include/cuda_wrappers/algorithm> (used in some hip files) ++ ClangIncludePath = @CLANG_RESOURCE_DIR@; + + // Default to O3 for all contexts + Args.push_back("-O3"); +@@ -1059,9 +1058,7 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() { + Args.push_back("-nogpuinc"); + Args.push_back("--offload-device-only"); + Args.push_back("-isystem"); +- Args.push_back(ROCMIncludePath.c_str()); +- Args.push_back("-isystem"); +- Args.push_back(HIPIncludePath.c_str()); ++ Args.push_back(ClangIncludePath.c_str()); + break; + default: + return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT; +--- a/src/comgr-compiler.h ++++ b/src/comgr-compiler.h +@@ -95,12 +95,7 @@ class AMDGPUCompiler { + /// User supplied target GPU Arch. + std::string GPUArch; + std::string OffloadArch; +- /// ROCM include Path +- std::string ROCMIncludePath; +- /// HIP and Clang Include Paths +- std::string HIPIncludePath; + std::string ClangIncludePath; +- std::string ClangIncludePath2; + /// Perform out-of-process compilation. + bool CompileOOP = false; + /// Precompiled header file paths. diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-llvm-19-compat.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-llvm-19-compat.patch new file mode 100644 index 000000000000..e910b8ade94c --- /dev/null +++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-llvm-19-compat.patch @@ -0,0 +1,65 @@ +Combination of upstream patches to make comgr compatible with LLVM 19 +https://github.com/ROCm/llvm-project/commit/91c18ff3482abdf90239e9b482797403f6e7e9bc +https://github.com/ROCm/llvm-project/commit/971fd662887f21877d29f936c2f818eac37589d3 +https://github.com/ROCm/llvm-project/commit/7a784d7acfd7dadfa8516054adfbe7c884e70786 +https://github.com/ROCm/llvm-project/commit/1fb58bcb4868087ed314e2f5e7363d871d69f4da +--- a/src/comgr-compiler.cpp ++++ b/src/comgr-compiler.cpp +@@ -384,15 +384,14 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts, + assert(MRI && "Unable to create target register info!"); + + llvm::MCTargetOptions MCOptions; ++ MCOptions.X86RelaxRelocations = Opts.RelaxELFRelocations; ++ MCOptions.CompressDebugSections = Opts.CompressDebugSections; + std::unique_ptr<MCAsmInfo> MAI( + TheTarget->createMCAsmInfo(*MRI, Opts.Triple, MCOptions)); + assert(MAI && "Unable to create target asm info!"); + + // Ensure MCAsmInfo initialization occurs before any use, otherwise sections + // may be created with a combination of default and explicit settings. +- MAI->setCompressDebugSections(Opts.CompressDebugSections); +- +- MAI->setRelaxELFRelocations(Opts.RelaxELFRelocations); + + bool IsBinary = Opts.OutputType == AssemblerInvocation::FT_Obj; + std::unique_ptr<raw_fd_ostream> FDOS = getOutputStream(Opts, Diags, IsBinary); +@@ -428,9 +427,6 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts, + } + + MOFI->initMCObjectFileInfo(Ctx, PIC); +- if (Opts.SaveTemporaryLabels) { +- Ctx.setAllowTemporaryLabels(false); +- } + if (Opts.GenDwarfForAssembly) { + Ctx.setGenDwarfForAssembly(true); + } +--- a/src/comgr-symbol.cpp ++++ b/src/comgr-symbol.cpp +@@ -146,7 +146,7 @@ SymbolContext *SymbolHelper::createBinary(StringRef Ins, const char *Name, + return NULL; + } + StringRef SymName = *SymNameOrErr; +- if (SymName.equals(Sname)) { ++ if (SymName == Sname) { + #if DEBUG + outs() << "Found! " << sname.data() << "\n"; + #endif +--- a/src/comgr.cpp ++++ b/src/comgr.cpp +@@ -51,6 +51,7 @@ + #include "llvm/Object/ObjectFile.h" + #include "llvm/Support/TargetSelect.h" + #include "llvm/IR/Constants.h" ++#include "llvm/IR/Module.h" + #include <fstream> + #include <mutex> + #include <string> +@@ -2126,7 +2127,7 @@ amd_comgr_populate_name_expression_map(amd_comgr_data_t Data, + } + StringRef SecName = std::move(SecNameOrError.get()); + +- if (SecName.equals(StringRef(".rodata"))) ++ if (SecName == StringRef(".rodata")) + rodataShdr = Shdr; + } + } diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild index eb873e94c0dc..66239d28f79c 100644 --- a/dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild +++ b/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( 18 ) +LLVM_COMPAT=( 19 ) inherit cmake llvm-r1 prefix @@ -11,7 +11,7 @@ MY_P=llvm-project-rocm-${PV} components=( "amd/comgr" ) DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport" +HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/comgr" SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}/${components[0]}" @@ -27,9 +27,10 @@ PATCHES=( "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch" "${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch" - "${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch" + "${FILESDIR}/${PN}-6.3.0-fix-comgr-default-flags.patch" "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" - "${FILESDIR}/${PN}-6.2.2-missing-isa.patch" + "${FILESDIR}/${PN}-6.3.0-llvm-19-compat.patch" + "${FILESDIR}/${PN}-6.3.0-bypass-device-libs-copy.patch" ) RDEPEND=">=dev-libs/rocm-device-libs-${PV} diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest index d42496eabe95..ae11a8ede9b9 100644 --- a/dev-libs/rocm-device-libs/Manifest +++ b/dev-libs/rocm-device-libs/Manifest @@ -8,9 +8,10 @@ AUX rocm-device-libs-6.1.0-fix-llvm-link.patch 1089 BLAKE2B c14aa8fe06d351ba5ec7 AUX rocm-device-libs-6.1.0-fix-test-failures.patch 3232 BLAKE2B ae76a41e48192bc5cc940a7769b9f264cda742eab52870eeba730403440aa52580dde5d3c735e79e261c6d0b7a5ddac96dc590e547f7fbe1a3f369d08ab38229 SHA512 10905ddca80c6013561849920382f9716ad7d72080241a84aca568dd4ae43845e22627d309f6423f994f068dd64af1db52d64896aa66a79e4c803c093d44dcda AUX rocm-device-libs-6.1.0-fix-test-failures2.patch 1492 BLAKE2B a75aa720c1573111280c6fc07c2f5fef4b152116081b6c9eb25844efa9412680c6301f6e3150bd0334265ff76db38ace8a21a9abd6db42692387f04b1d5534d1 SHA512 b265327fa21ecbabbaca2270d8a7022ca46f2890b597683b827848a3d503d26ac7eeb1edb292387694730f6e86dc46a69209d8266ea7aa156266e96052a198ed AUX rocm-device-libs-6.1.2-fix-build.patch 4182 BLAKE2B 2fded91e25a4b0eb55c021047d7cee4d13f6f1a00da9e596bed45ad1292f1b30ffce2f08d34eb6d693a13bb5499b9e3e49e83dd7c71525ec054881965c6b1fd7 SHA512 e2d8bdaf4fde64a470d3b87134a81a1348806b757e5a0362faee4ffde34e442e52c47f233f01b1cc4129beb17c8a4378579faa3383a4d3d681b51eb719c3f38e +AUX rocm-device-libs-6.2.0-test-bitcode-dir.patch 1333 BLAKE2B 86c39cc152d488d914d27e0078b8522bbcdd3d8e7fc062ec01cb87f0f3758296c4b961e8cb68cf0993762eb7b68d502b17034a8d63e7b59446a5ad1eb8f8fc99 SHA512 e46f636635967c7741569e78954c255bc7038b0a4351c734d0aa3e92668016b3f79aa490d4d4f045db36ec55b0924ec3bb9c1eb0d045d118a46f8b80f20b8541 DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0 -DIST llvm-project-rocm-6.2.4.tar.gz 206742705 BLAKE2B e4d40c900b56a3d31003295c517fcb8fdc5cb0954f298d541d545c6d142746eecfa70a44bfdcb9044d70284f15af612c27dbd55d51e94e638e03bf21c1d3bc06 SHA512 5c5784c318c607168c9d2227ce1150e92fdc6aa457a9e64d62745a70f6fce92c4d4b1202422940f1ccc37a4bccf1efb220d8be39ec2ffdba7591d17e54ec8a5f +DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59 DIST rocm-device-libs-5.1.3.tar.gz 242862 BLAKE2B 68d66de897f461e9f876de5fe2214803d4c00665651dea6af0952f0ce579c6704a5ec41b08971fa613ade309a0a85cb611b56b592dc2a25e247183e634ea3378 SHA512 cc3dfb8d4b4841ba777355c537175259d0019159ff462358320674b85082cccd99f6462f60fee66228ddfb88fade043445c1bac62504aa1462ba61b7e2751de7 DIST rocm-device-libs-5.3.3.tar.gz 245690 BLAKE2B 475c0d818b8b0f090a8daeca2910cd4002e4cdf505d020327f46eb5f864a26937a6a3dfe4ff7b188ebda0f936b1c396f2163bb27b9e2a62c5976e60fa60856ac SHA512 8f6f2fc1534e348e02ba30a25cfc6017f8eab768968b5d0344a5ea7d65c4f0a874072f9e53919c74545814330602ef7c190753c7ff019137230e02f58a5d3a5d DIST rocm-device-libs-5.4.3.tar.gz 246095 BLAKE2B eb749346c96d465a5f22831968ccbd71f02749e6aa0d9c2becc0f378641ca0f65c1a131bfd3ed226f838b4208091fcc920b1e31b427adbd69a42881898668e6a SHA512 67b904363a3cff6c15bbd032cbc72cb5cd5f82acaa68c74391dbcf415266e8f35486a496b69b69e1fc0721e0e4e21fb6a6b9c180a46cb59cdcf53916be846ca4 @@ -23,5 +24,5 @@ EBUILD rocm-device-libs-5.5.1.ebuild 1206 BLAKE2B 01dee1e4c7118bca0e2a8e017418be EBUILD rocm-device-libs-5.7.1.ebuild 1455 BLAKE2B 85df640675a3e163397691198be61e9c7cc11bc02b9cbfbcf4820ed2d4403218b60c83ba4fbcf38a62bb0df49eea6447e94d27f7ecc6beaebb5777d2bf750d04 SHA512 ba10a16ae8f530fbe783fa4b42ff02b9ed1a4e53fc42d40e201d0609fe4300814067d29875367eb67dbf045f7e058cac82d38ce3867f8c720d75bfcbf65aa2d4 EBUILD rocm-device-libs-6.1.1.ebuild 2378 BLAKE2B 806c3f420e5156f770429208b481b1768350918b1cd9cd9f373bb85e80186132cd2e102c60e9271e8895661c2877c6b979565385e53cc0d544cc9458f31b4746 SHA512 0e773fc157f02e6b8b4beee34bc87217b4c80b83854c85973ab83c595dc9fe29960128d789cb1846c3878f1fe3547aac293d2edc2fbd7cae633cae3d85e71e6f EBUILD rocm-device-libs-6.1.2.ebuild 2421 BLAKE2B 8aa35401997852ccbd17cfe6fb836ff4496e1a4ae79fa40f03d4d91e9bc7947fbbb026a484fd7f197c32113037e601aecfe543b3050cd53d99fa65c776433eee SHA512 675809b9017a65b8bc13b88a096fe3e4247947dd3b49501f476eee642b600a7baaa4d9a9c123f1ea3917d3b69d8d3f7225dd330ae56ebf0e83cc6abea9517fdb -EBUILD rocm-device-libs-6.2.4.ebuild 2217 BLAKE2B fad129188e2afe402d3ff831e5a9bfcabd9510b7df95722a683b75588611ef5b19a26dc624041c812d5811b8d0bed883ade675cb56aeb61459bbb3d3166c1a3c SHA512 1c3969a281df20b2ea4bfc01adf7e509612c26190a9b4812634115bf40f9a402749d4e0b867e81f380947fa57d17c8eb41ca19061e07920564ff5068415df56a +EBUILD rocm-device-libs-6.3.0.ebuild 2487 BLAKE2B c66c0c2f69f6add3c9735377b1c199ff472e71110cefa3a3ff2662ad085b45ec53f412ec937469e62c26b283ef7ec7507fb679612cb5038acbdbe0d93ed8e11e SHA512 155cbfa18f0ff07f8b2e9d7051a302c1634004866c331722171b192172ae2cb25d714a8c832a2ad963e4913973d3088ea9a989f52f17b21c2b110eb32b6a28b2 MISC metadata.xml 486 BLAKE2B 39c4a21b96ad471942a38d1c46b2600e3544729a87cd01c79606d495c595f271d5c04621ec581d2322686aca56de5d7c4b2b0d6125fc8db15b1236b2c093c8c9 SHA512 1a7d6570a687bb55877c6a5d9cbd7dc30a72ec0613b84e33be0982ff46b8d80d89e502e50364afdcc1022d7620fc10317a411b27c255caeafa2b45a85a43fd8c diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.2.0-test-bitcode-dir.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.2.0-test-bitcode-dir.patch new file mode 100644 index 000000000000..0ab47c9d7e6d --- /dev/null +++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.2.0-test-bitcode-dir.patch @@ -0,0 +1,32 @@ +`--rocm-device-lib-path` is needed to execute the tests because they are not +installed to system yet +--- a/test/compile/CMakeLists.txt ++++ b/test/compile/CMakeLists.txt +@@ -40,6 +40,7 @@ function(add_compile_test test_name func_name) + -DFILECHECK_BIN=${FILECHECK_BIN} + -DOUTPUT_FILE=output.${test_name}.${test_cpu}.s + -DINPUT_FILE=${file_name} ++ -DAMDGCN_BITCODES=${PROJECT_BINARY_DIR}/lib/amdgcn/bitcode + -DTEST_CPU=${test_cpu} + -DCOMPILE_FLAGS=${COMPILE_TEST_COMPILE_FLAGS} + -DEXTRA_CHECK_PREFIX=${COMPILE_TEST_EXTRA_CHECK_PREFIXES} +--- a/test/compile/RunCompileTest.cmake ++++ b/test/compile/RunCompileTest.cmake +@@ -16,6 +16,7 @@ execute_process(COMMAND + -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU} + -Xclang -finclude-default-header + --rocm-path=${BINARY_DIR} ++ --rocm-device-lib-path=${AMDGCN_BITCODES} + -mllvm -amdgpu-simplify-libcall=0 + ${COMPILE_FLAGS} + -o ${OUTPUT_FILE} ${INPUT_FILE} +--- a/test/compile/RunConstantFoldTest.cmake ++++ b/test/compile/RunConstantFoldTest.cmake +@@ -16,6 +16,7 @@ execute_process(COMMAND + -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU} + -Xclang -finclude-default-header + --rocm-path=${BINARY_DIR} ++ --rocm-device-lib-path=${AMDGCN_BITCODES} + -mllvm -amdgpu-simplify-libcall=0 + -o ${OUTPUT_FILE} ${INPUT_FILE} + RESULT_VARIABLE CLANG_RESULT diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.2.4.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.3.0.ebuild index 0995cc93e0c9..16f98f0605c3 100644 --- a/dev-libs/rocm-device-libs/rocm-device-libs-6.2.4.ebuild +++ b/dev-libs/rocm-device-libs/rocm-device-libs-6.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( 18 ) +LLVM_COMPAT=( 19 ) inherit cmake flag-o-matic llvm-r1 MY_P=llvm-project-rocm-${PV} @@ -20,7 +20,7 @@ else fi DESCRIPTION="Radeon Open Compute Device Libraries" -HOMEPAGE="https://github.com/ROCm/ROCm-Device-Libs" +HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/device-libs" LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" @@ -40,6 +40,7 @@ CMAKE_BUILD_TYPE=Release PATCHES=( "${FILESDIR}/${PN}-6.1.0-fix-llvm-link.patch" "${FILESDIR}/${PN}-6.1.2-fix-build.patch" + "${FILESDIR}/${PN}-6.2.0-test-bitcode-dir.patch" ) src_unpack() { @@ -57,8 +58,9 @@ src_unpack() { } src_prepare() { - sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die - sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die + sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" \ + -i "${S}/cmake/OCL.cmake" \ + -i "${S}/cmake/Packages.cmake" || die cmake_src_prepare } @@ -83,3 +85,15 @@ src_install() { local bitcodedir="$("${CLANG_EXE}" -print-resource-dir)/$(get_libdir)/amdgcn/bitcode" dosym -r "/usr/lib/amdgcn/bitcode" "${bitcodedir#${EPREFIX}}" } + +src_test() { + # https://github.com/ROCm/llvm-project/issues/76 + # "Failing tests are on gfx that are not supported" + local CMAKE_SKIP_TESTS=( + compile_frexp__gfx600 + compile_fract__gfx600 + compile_fract__gfx700 + ) + + cmake_src_test +} diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest index 543f2882d61a..9e5dcfbdab8e 100644 --- a/dev-libs/rocm-opencl-runtime/Manifest +++ b/dev-libs/rocm-opencl-runtime/Manifest @@ -5,6 +5,8 @@ AUX rocm-opencl-runtime-5.0.2-enable-gfx800.patch 970 BLAKE2B 4080ab450457c21de1 AUX rocm-opencl-runtime-5.1.3-remove-clinfo.patch 1178 BLAKE2B b708214f9c4a6860a23281e8ece176d4b1968fc005e1b95a88e67752a8c60a23a7f66ff267ef909ddee4a45f4c8441339ea6f5de867d77df10c98d8043bb54d4 SHA512 626574b948a16cd59513496791bd73a5c1f3bda68ae9e01ea982bd036858f7c8817ea33a22e85f180cecdbe19d999afb2604c8cb549bdd71d4bfc56c18f5d4ad AUX rocm-opencl-runtime-5.3.3-gcc13.patch 791 BLAKE2B 6b284cb6cd9b273ee6d21850f7a29f75079567c70bdb263b3b95b27632ac71dd5e0be1200db58281c3ac737ff9d042dbd87615300e6182c9f43425098ae3389c SHA512 9edcfed7d5a5ed8e5aa1ccd8e09639d95ef373878eb7bc4ad65aa38539d8138c1d589056ffe9fd95cb18e95aebef3f206f5731557a1451758cbf3ae0e7b30e21 AUX rocm-opencl-runtime-6.1.2-fix-segfault.patch 1471 BLAKE2B 868e0b7d653277623d1f708680bb2cef8c5899472205345487c117888717987a3697837b6f931b31f3adf8adefdda4e6eb91102219c05c1639c5cf389eda3209 SHA512 27ab04193692a5089b8ee73f9882a9c86e518cb77afd631dc84b3a9ffe9cda48a0ac853dd259d66bc937791cfb2422668429d472fd62b833aef076cfa930180f +AUX rocm-opencl-runtime-6.1.2-musl.patch 566 BLAKE2B ca84d7a1c38b6ae3e7dedbda8cafa0ad5bf31165c3a7b5af8a1a9714d871eeedb64bd6e6c71960e65ee3f7bed2bdf302d07e7c33e225102123d8516018391430 SHA512 e224e84b6eb4b43fd79e5172ad4882d1862d7a50fcb7ed60afc58148a399a96fafaf14477ed31d503f3ecb4c93ba2b58bdcad3c6dce7afab61ee7a8e60d3f65e +AUX rocm-opencl-runtime-6.2.4-fix-lib-version.patch 575 BLAKE2B e5e7ad57f54d7c789c6da40d6b1c4460ec5bb4712e91adc63586d382e3e973ebc747d08c2bc2e313b6f7bd32c72b972946126ea4e60d1783d185a7764d581498 SHA512 0496c9f7ac503cad66e2ad9b55ae03e13b783d1698529dbee290a4d3abf23acdc9c4a121bf31a58f3ed09ba80dd106800816fbf4009dc5383356d3d5005a8cfa DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a @@ -12,7 +14,7 @@ DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec7 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965 DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc DIST rocm-clr-6.1.2.tar.gz 2031283 BLAKE2B d51d32a77794ea97f1a3817786c9fd6b482106b665eea6e2c9b4c11e4dce19a3486386eb5ba111554c2d82c30e2a93add7502eed5768caf3fb709fb5fbb2e71b SHA512 e97224451864efe0084c4117f54893c9624a6a9f365a0b4abad08fd9635f008dea742dc589429fbb714e1b8177d06362c0f5a741f6c4a050d0fd4d48da72d54b -DIST rocm-clr-6.2.4.tar.gz 2078004 BLAKE2B 28fdd2a81a5b831e157d781d6d869c02a288d9b8dc47a8a1d0a9f3b7ed99393c06f9b2bbc8d7dc2b2173a1b8c57fa1328b0fd6a7f24e759ace77e8c1ae777442 SHA512 74a198595929003248a3684fb5d83c20a8769eef237fcc07371f4385380f347917d6beaca15527334d06ea19bc446a03fca7251e5b2782f05547a36ccd1dfa49 +DIST rocm-clr-6.3.0.tar.gz 2093572 BLAKE2B 14f75f9f5dc4000a2abf28e523659def8cd96112c9c8b95abb634c33433077faa3ddab3fbe659e0ed2e1f309f63a93b7eb03fa6f246b4cea06ca8c512c13308a SHA512 f005baaf2a8f63946811db990e2d373906b31a4085a51427d407c9e4c1d877a14aeb713190a285953cadb960b5517570941c60e2f998adb2b1f9833f1d2f5925 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d @@ -23,7 +25,7 @@ EBUILD rocm-opencl-runtime-5.4.3-r1.ebuild 4031 BLAKE2B c952245f6f6ad1910facd33a EBUILD rocm-opencl-runtime-5.5.1.ebuild 4002 BLAKE2B e784debbe6ca533290ca801cf965087e7e01d39c84a65ad2a738a672f3d330c7a28cc13fd5a8d6cbcc9520c9543cce9b762d480b6f3f4173006301c293af013b SHA512 38940e4b6d028fc8e713ec1641824776d0fab540f3e9e3011f6b377caf82a9b4d13ccd897605c01557975c1ec4f89285e944cee6b67bdbe56ddc300284d2df55 EBUILD rocm-opencl-runtime-5.7.1-r1.ebuild 3119 BLAKE2B 672082b1bea0f6cd45f8c37181e731d60dec3844fa0a31aca555b7c6e154d4981d33d1140fc83b3f8c6fbc46b7a13b88c76278ea0c04463eb0f2b398a60b3bbf SHA512 7d12f85d62bfb48df3f7c0d705e5411dad21ffa71964f19b09f2623aa836ecd91fedb28ad1ee5790ca5c538139e6790b2154c66dccc67687decdd3fb62d92b18 EBUILD rocm-opencl-runtime-6.1.1.ebuild 2695 BLAKE2B 2e2241518863f36222e755d61f8e5c25510c5a5250458fce110d5830898a36ae3e97a20fce61382d7ebf39346dee705b673dd0c1e4390e3ee44f7c23eff4d1b7 SHA512 edfb87e56c042000e41480771186a8e536e35a58cb2e57ef71f3d118501dcc85eb1025eba6a6af0b25d9c896329aa832d56f9b1037031c4279e5f21367dfa81b -EBUILD rocm-opencl-runtime-6.1.2-r1.ebuild 2767 BLAKE2B f1fc8c310f299d6d3b42d0d64ea46cbab36cccabf9d332e8a40efbb790367416be0010a4d4e2d69748205765b9d118f2f6a9082880ecb286c58af5fcbaa23e5b SHA512 9e1646e606bc4f50c5bdaef68890b7ea0b2caeea563ec9a8947035d9a65e3121417bf60d13d38c23c95b197dd526651cb2b2739b96c5cd868d7f8314d09606e7 +EBUILD rocm-opencl-runtime-6.1.2-r1.ebuild 2792 BLAKE2B db82b119e08794967bb97ff40816a6311ba8d42968697497163849716cf29ade994cc9b50656c2cd052abf12fb03c0a25784c2cb3b598bbef7dbdad6f2137e46 SHA512 288de016364fd933a5cee3464094374ee79b4b5636ef537658517cf5b2da7a7f0b6b7a83a153a9ef6cbc4b57c658ed1d1b0aa5fb362391b5163ecfeeeff85780 EBUILD rocm-opencl-runtime-6.1.2.ebuild 2695 BLAKE2B 2e2241518863f36222e755d61f8e5c25510c5a5250458fce110d5830898a36ae3e97a20fce61382d7ebf39346dee705b673dd0c1e4390e3ee44f7c23eff4d1b7 SHA512 edfb87e56c042000e41480771186a8e536e35a58cb2e57ef71f3d118501dcc85eb1025eba6a6af0b25d9c896329aa832d56f9b1037031c4279e5f21367dfa81b -EBUILD rocm-opencl-runtime-6.2.4.ebuild 2695 BLAKE2B 2e2241518863f36222e755d61f8e5c25510c5a5250458fce110d5830898a36ae3e97a20fce61382d7ebf39346dee705b673dd0c1e4390e3ee44f7c23eff4d1b7 SHA512 edfb87e56c042000e41480771186a8e536e35a58cb2e57ef71f3d118501dcc85eb1025eba6a6af0b25d9c896329aa832d56f9b1037031c4279e5f21367dfa81b -MISC metadata.xml 525 BLAKE2B 9af34c6be2bb5ff304e4d01810b810eb8a0639d1972325fad3b81c93aa4d060cbebddc9c06da702dd80f9aa98549720cf2bc674d5b11ef6f99ed30efe50d2110 SHA512 c50670dde49ec0d9d3acca19d37842ecf567429f455e1b37c5181e5d4361d829eff0980ba35096ef42c0789f8904d52425faf4a2aabf641142722957b626378d +EBUILD rocm-opencl-runtime-6.3.0.ebuild 2775 BLAKE2B 6fcc59f0997268f445f141a49a5d48694e3a2f2b32149d51ee1601787cd0a8599054ee209368a1acb2c148c162f354c7dbbe99637a5d680213a71a95e6b72627 SHA512 1e514a8943560aee03c203cb57ec6d293158863c9199b629fafbcfefc876f2074004b6b1198059a1899016374f2b35ed6642c7f6459cd8a5547484247a9a9d35 +MISC metadata.xml 512 BLAKE2B bf634540a3606c91de1909529e2cb11e447e530192dd3bbe5b118b8420f1fea5564fe84665fa3a7aa548e2431ac33dc19ac08607c215ec4d70a6381eb9791133 SHA512 33fe8f8cca60ffad6359daf73315b006b6103dedf3370fc32ac203f1d9a584b8ff3754b9198f852483e0e2500afbb16fc711f53b932879272a7cf3a80d551570 diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch new file mode 100644 index 000000000000..424cd0dde119 --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch @@ -0,0 +1,24 @@ +Fix "basename" and "__cpu_mask" definitions for musl + +Upstream PR: https://github.com/ROCm/clr/pull/83 +--- a/rocclr/os/os.hpp ++++ b/rocclr/os/os.hpp +@@ -29,6 +29,7 @@ + + #if defined(__linux__) + #include <sched.h> ++#include <libgen.h> + #endif + + #ifdef _WIN32 +@@ -377,6 +378,10 @@ ALWAYSINLINE address Os::currentStackPtr() { + + #if defined(__linux__) + ++#ifndef __GLIBC__ ++typedef unsigned long int __cpu_mask; ++#endif ++ + inline void Os::ThreadAffinityMask::init() { CPU_ZERO(&mask_); } + + inline void Os::ThreadAffinityMask::set(uint cpu) { CPU_SET(cpu, &mask_); } diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch new file mode 100644 index 000000000000..17c6ebcc6f6e --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch @@ -0,0 +1,13 @@ +There is no ROCM_LIBPATCH_VERSION outside of AMD farm. +Upstream bug: https://github.com/ROCm/clr/issues/112 +--- a/opencl/amdocl/CMakeLists.txt ++++ b/opencl/amdocl/CMakeLists.txt +@@ -66,6 +66,8 @@ set(AMDOCL_LIB_VERSION_MAJOR "2") + set(AMDOCL_LIB_VERSION_MINOR "1") + if(DEFINED ENV{ROCM_LIBPATCH_VERSION}) + set(AMDOCL_LIB_VERSION_PATCH "${AMDOCL_LIB_VERSION_MAJOR}.${AMDOCL_LIB_VERSION_MINOR}.$ENV{ROCM_LIBPATCH_VERSION}") ++else() ++ set(AMDOCL_LIB_VERSION_PATCH "${AMDOCL_LIB_VERSION_MAJOR}.${AMDOCL_LIB_VERSION_MINOR}") + endif() + + set_target_properties(amdocl PROPERTIES diff --git a/dev-libs/rocm-opencl-runtime/metadata.xml b/dev-libs/rocm-opencl-runtime/metadata.xml index c815e421fb36..1b835a209717 100644 --- a/dev-libs/rocm-opencl-runtime/metadata.xml +++ b/dev-libs/rocm-opencl-runtime/metadata.xml @@ -10,6 +10,6 @@ <name>Yiyang Wu</name> </maintainer> <upstream> - <remote-id type="github">RadeonOpenCompute/ROCm-OpenCL-Runtime</remote-id> + <remote-id type="github">ROCm/ROCm-OpenCL-Runtime</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild index 540038443185..ff5b6f1635e8 100644 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild @@ -29,7 +29,10 @@ BDEPEND=">=dev-build/rocm-cmake-5.3 test? ( >=x11-apps/mesa-progs-8.5.0[X] ) " -PATCHES=( "${FILESDIR}/rocm-opencl-runtime-6.1.2-fix-segfault.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-6.1.2-fix-segfault.patch" + "${FILESDIR}/${PN}-6.1.2-musl.patch" +) src_configure() { # -Werror=strict-aliasing diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.2.4.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.3.0.ebuild index 465e3a2ddc66..9b71c076cb2d 100644 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.2.4.ebuild +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.3.0.ebuild @@ -7,9 +7,9 @@ ROCM_SKIP_GLOBALS=1 inherit cmake edo flag-o-matic rocm DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr" +HOMEPAGE="https://github.com/ROCm/clr" -SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz" +SRC_URI="https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz" S="${WORKDIR}/clr-rocm-${PV}/" LICENSE="Apache-2.0 MIT" @@ -18,17 +18,25 @@ KEYWORDS="~amd64" IUSE="debug test" RESTRICT="!test? ( test )" -RDEPEND=">=dev-libs/rocr-runtime-6.0 - >=dev-libs/rocm-comgr-6.0 - >=dev-libs/rocm-device-libs-6.0 +RDEPEND=" + dev-libs/rocr-runtime:${SLOT} + dev-libs/rocm-comgr:${SLOT} + dev-libs/rocm-device-libs:${SLOT} >=virtual/opencl-3 - media-libs/mesa[-opencl]" + media-libs/mesa[-opencl] +" DEPEND="${RDEPEND}" -BDEPEND=">=dev-build/rocm-cmake-5.3 +BDEPEND=" + >=dev-build/rocm-cmake-6.0 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) " +PATCHES=( + "${FILESDIR}/${PN}-6.2.4-fix-lib-version.patch" + "${FILESDIR}/${PN}-6.1.2-musl.patch" +) + src_configure() { # -Werror=strict-aliasing # https://bugs.gentoo.org/856088 @@ -62,7 +70,7 @@ src_install() { cd "${BUILD_DIR}"/opencl || die insinto /usr/lib64 - doins amdocl/libamdocl64.so + doins amdocl/libamdocl64.so* doins tools/cltrace/libcltrace.so } diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest index c65ac123ce61..a3571ecf9386 100644 --- a/dev-libs/rocr-runtime/Manifest +++ b/dev-libs/rocr-runtime/Manifest @@ -4,6 +4,11 @@ AUX rocr-runtime-5.7.1-extend-isa-compatibility-check.patch 3003 BLAKE2B 203b65a AUX rocr-runtime-5.7.1-musl.patch 3923 BLAKE2B 9cc1abc84be25fe6432c50c227ce65f11526b0c53ee3f08aea79f4d14679943a6a68b55e56c1f14a75ed9c43d3e2dac21b3cfdfe8dc44bc0e21bd6e09b79fa1c SHA512 b44d292bc6dd1178bbc7885812db22cc96fc9e05509f175b59bc7d453dee5d58bfe45073f86f2496322a24cbd2986972f80b6495947dfcaa6838641a36690df8 AUX rocr-runtime-6.1.0-ld-lld.patch 561 BLAKE2B 93ec03a4d758791ab0a88f9d80cf1f522681cf3d0cf4f020aa1014848dc607045b628d275a25bf9830c3f1a19342ae96b9bb026ae7a9513d5ba193774526c29a SHA512 83ebcac0ada1b8406a2f7277be5f3db0c71777009cfc8996c6f9317deb1f3846a25387a956f45c6aedcb8ef04cda0814ec7c6dcf1b369cb98f9ba8f3e774022d AUX rocr-runtime-6.1.0-musl.patch 3589 BLAKE2B b690a5c63ccd7056e8fc6699d0905933b55fac3d1015fa486cacf5713d43386d57131efdf8ab6b04625b11548e0e2d831a2ee83a3c65f71cc6353e456e98d223 SHA512 bb947984e747a9b772700934be3047e906f19469459f250986a36bf0fd7f0e3acbaaa9961fc18ceef13655070affb8dc4642b4957556b9941084348d9c62e0df +AUX rocr-runtime-6.2.0-ld-lld.patch 644 BLAKE2B b622f2ad36f657633281aefca162984cd3637f8f99d2b3ae3e531596dc900d440435f28062999fba893196eba96997fbcfb2a4baf4808898aa48d17f42c13fd8 SHA512 6f7aceb9bf04e54a7d39057cdd52b2b0869a4afd1f4be948edc65cfb213cae77dc02ce9914181a3c741c328e6e546856ecbd4a27460ac3c55752169d5c6dfb43 +AUX rocr-runtime-6.2.0-no-aqlprofiler.patch 1002 BLAKE2B 6d575e9fdfd2ea568fab8f54c1b4690532caecffea1219294e99f2fc1060e4952e2fc23a11a68a15808b4509624c262c4f130aaea75161784b9a631f28c796c8 SHA512 c6a5bda629540ab8a3ef50f12e467588d833af7b4e2ffe95897a2bfb099265c05057d03a23a78906fc6760ba1b93b5b972efc54f62aa30034b02e54796774783 +AUX rocr-runtime-6.2.2-gcc15-stdint.patch 247 BLAKE2B e58abc680f93c5333c91343c6510a73b067047d202387a61675cdd6b66f6ebfb65695ff31a90eb5c55bce0d877c34b2c66c5410d9466b49873a6d081c2a9af2b SHA512 bd4eb98ebc35077827def53351ac22a5a71e0c5b8757addffc04334cc7720dcf59a356cbaf4a2cbe102bed24f463b10b0db924a5bc2e8eb08e1822d6ee519025 +AUX rocr-runtime-6.3.0-musl.patch 3961 BLAKE2B af9d2b7360d306081de19c8ebae7372627437ad71f1bfc354d36e5cd84ed2238d405819b427dab2267c66239a087c6574445c2187de920644f9a8971ed37d66d SHA512 03f62a64df00d58a2166ba97fc429864e9f5a2bb9e86ce7df0dfc9b487ea88f1b2cf5a2ccfb92fa468ee4273388a5e2d0accbe83ded8ddb109626f8b7d63b738 +AUX rocr-runtime-6.3.0-use-system-hsakmt.patch 837 BLAKE2B 0c913ffa28d0e8a5fc802d386a864e7486ae7291e13d0364d071856a55391756f8df2cf4efae0f2b1d2725235b655b7e975f3887e3582167c880a75659bbf3b3 SHA512 c28e43790b414c33a61568a1dba009ccd65de2a89bdd4d49eb262f07709e0099f8d8e85913cacb8ded839ac5fc6129d00cd74e337039c8488a6451f233b5fb58 DIST rocr-runtime-5.1.3.tar.gz 720567 BLAKE2B bdf2d258ec607ffc69264d48ce82c36787757b7809397d643a24abaa852f3cc217a57210fba760d4d11ef8ce2922dc1ef275d3b47a4bebc5c7b204bbbb5b7c66 SHA512 d47523ea2fe32fee832ca19b56a091f52e16b366db1c571f87e5599514b826376d49281e79ff0936dcaf7349f9becbc8ae9b3e9472a9c3e14b62a3f98d541b35 DIST rocr-runtime-5.3.3.tar.gz 809871 BLAKE2B 1a44e88c34fcebcea3351de812f2ac64a7b151303c5bfc4066920755c185731388afff89c705afee6010d262f68358a20b1c0197e8f23c22ab24409eb55fde0a SHA512 27efe57954575549703b31c4a632548bf3d82df0f01d5f15485d0bda7efa6ec2ad0a4a8710b8f240ff57296eb62d3796926e32d16dfe448b188d8264fde0ef8b DIST rocr-runtime-5.4.3.tar.gz 811062 BLAKE2B 4ee8ef49cdac7f6918db3aa96089852847d093aacc11ed7e7157a6eb512cf36a3d37396670c14ea24b16b1127c4547977390694d05bc6006ac48b40e707d6dae SHA512 29f13a1b16ef457071cc050227d57cda92992f416ebc074f8cd5a856d9bd76fd34ab2ccb53c21c3d798165282d44bba287ef44a9d1da327ee198e1facc77a4db @@ -11,13 +16,13 @@ DIST rocr-runtime-5.5.1.tar.gz 816175 BLAKE2B e588d98cbd0d9a753b950ba676d6cddeed DIST rocr-runtime-5.7.1.tar.gz 832009 BLAKE2B 67e4a64ee03b1f6edc43923c7ac44113ab58f78b032dc0a01952b2dd5b2ca37404044811effb9c8d83002ac4ea344a5d95ac62f3c66012bff2884ef55285cdb5 SHA512 a6547a104303032244d17b662a3eda48039732c215debb6178c0af8842c01c60f80989793420c101bd554e58332d215205da0c228dfc25538c56499f47dc6832 DIST rocr-runtime-6.1.1.tar.gz 903611 BLAKE2B 175e7267bfd9d70fb805135e765004cf2b43b2d66354f0cef857d417c8dac4ce7638ec1b90a1088324aa5f90ed8354c66b56846115368d68d622a215350d84dd SHA512 5e6e28dee29ef9df9d617f56038b2e52022738d5510833cd8e1738defe1049d0a957db4d9f63bbf55d8efca3a4ea349b95919dd1b6b35b9814ebba575a67af57 DIST rocr-runtime-6.1.2.tar.gz 903633 BLAKE2B 058492c6c37bb80e8cdb29752f3f1404ac88108dcfd5137042e4fdaff521db01d64bd14bdcbed9e53b8984f8bbb22b126f1a798bd064c393b5bcf76c1d3311ca SHA512 2893aff72a5fbf03bfde67ab64fcf00f4e10b5e5b11ff4617e94ae0c019a24a9b80601d8629d4e119e6a4957dc0aaf03d645111063979af60090fe3b232a477e -DIST rocr-runtime-6.2.4.tar.gz 959982 BLAKE2B a4cc3960c7e559c7c1837e009c998784832c861ca59c0cbf9388c8ae081670b4e45c4e5b032dbd17a4c2efe8708a1330c9ff66c814196e29df5c7a6735a6d3e9 SHA512 cdd84ddf2120f494eec282b78d0858970e0603ea096213f25731af5a97f652d058ff93122bb3a0813c45cb87f625af6f33c2c108d8fb5db63d62674b13e40c71 +DIST rocr-runtime-6.3.0.tar.gz 2258605 BLAKE2B 53b43a8bc4a327c2138e39db20f5217b2def6866d1b52e48017c41e6c3c8541e6bdce76f5a7669cdffccfb34a4cfa863e56e0ce4058d23c5f38d9d0900903751 SHA512 451e74d88875b8d0a1f21d95c543fd93610d966e69258b50fe4b8796381c58f5ea381384e199e5bcf01a80369a59e5a093d8f318fbe2ed1ca6a97dc915060f7a EBUILD rocr-runtime-5.1.3-r1.ebuild 1522 BLAKE2B ae7ad025e281985f4748df112fc1bb63a2ec7eb400a32693a1bb81c8eb35bb03fef2d245eed0b32f441d60121115e7a8c2ea595000dae5e8a1a3b392371a2858 SHA512 ad94236736a5dbaebc286d0a1c92187fb7f45c14c6a0ccc968c30cfd585c8599cc9047405e18179da09a37d88e8fbdb485b1e5304914cfef415eeefe737f1ee2 EBUILD rocr-runtime-5.3.3-r1.ebuild 1338 BLAKE2B c9737cc797fc73b7f2b0068dae1a3d7d3b89a02f3b166033df765cd164bd2d4f0e07e3cab0ebb8aca27b2e7ff39e68af6e9749a5a30a401a7da2c6ade95c4afb SHA512 39bd8f222401c0af6c6990e3d513854aaa28ad12e390c86398c795fc4df2e5da092c883b9cc559f211f3752792746c3181a7c7da7bcc4b726c9fff805df8d5ed EBUILD rocr-runtime-5.4.3-r1.ebuild 1549 BLAKE2B b077ccd7be78ebc71d4c34ceb9ed44dbbf09bf8e2699929ef8794d020b12ba610079770fdb6d4fe4ed27683ab6248851336aea7f1a0416afd14437747e03b4d5 SHA512 a20f0564335d51e6332ca3b4d2d45a6d38aeda25ce98d040f9ba93975b350601d7af9dca2fcb7332eb97d761898b179ea6effd29fbffe18156b2136d3321e661 EBUILD rocr-runtime-5.5.1.ebuild 1338 BLAKE2B 0557b175c46dfd0324bba29ba596a9241872220c8dc5e0862cc82adcfa09a17ac14c13ec84f7e0ea149c722b1f09abaab4f071a8639324b91705e5667f1bc19f SHA512 5a793bd7f9cf9f56ceb7bbbbf746b3a544bdefa093be5173505d8ded66429b41b2e14e42460ddae7a2546c6b2c10ff6d8a87c28d9dd938a53bb95d804459f192 EBUILD rocr-runtime-5.7.1-r3.ebuild 1599 BLAKE2B b9f9ac349b71da10b6334eb398cf7c0455f8abcfe20c101db7e62ca9b81853d8e1619c0b024942764f6a1b93e8ab7ab32180327b324f2ac8875d9b93e567bcea SHA512 5816d09d2308fb010ed00e306026ac4e0a410db9fab5e1954fc51210f1a172075d9f9a1b0749c2703ce397644426eca9c099ae334da23238a3048409fcc55640 EBUILD rocr-runtime-6.1.1.ebuild 1533 BLAKE2B 4b786de79180ce430ea31afa574fe011edb1b992bab530675958d98b41638cc658fc8a59f7aa3749c5484afce908ac730f80c61302c43b0b3dcf52422f87cf11 SHA512 77a2c887637477f5e49b70d0ca04adca864997170864b1b94752eb1da081fa587cffec95b6aeab3890f0cc332cd795236e140796dfaa83dfb8e2cf5e2b801851 -EBUILD rocr-runtime-6.1.2.ebuild 1533 BLAKE2B 4b786de79180ce430ea31afa574fe011edb1b992bab530675958d98b41638cc658fc8a59f7aa3749c5484afce908ac730f80c61302c43b0b3dcf52422f87cf11 SHA512 77a2c887637477f5e49b70d0ca04adca864997170864b1b94752eb1da081fa587cffec95b6aeab3890f0cc332cd795236e140796dfaa83dfb8e2cf5e2b801851 -EBUILD rocr-runtime-6.2.4.ebuild 1455 BLAKE2B 789d71474ac4258886ecf39ffb294edc4444f595e3c82b4fdc72192c3dea9805d6ba3dbdf2e6d6ff0ab36287978ef1874d0e37e1d187d4f785bd665f5d64bd3c SHA512 d563aa796951748b714a0a47d04f6cfd6dd9dbbe29a33ddf77b3d3837eb9ba1cd3ca1559e5fae47e1bae11bf5daf18db77b18c6437eadc00d1bccf87a7df3490 +EBUILD rocr-runtime-6.1.2.ebuild 1533 BLAKE2B 58d1a8ee310eac791ae55a6b31847e50df3756df4749944052564b489a2a3d3e76a52a74d91214657ce1effa42b6160d3bd07fafa07d29cc53c527d89573da72 SHA512 67c4ac3f84620e76cfb656c8c9c8d99423aad4f4bf57f8f56b46a891d7930c0538dee80d617a1181877c2ce32be5bb302f2cf54ef8e893adc1bc574ad6c35feb +EBUILD rocr-runtime-6.3.0.ebuild 1662 BLAKE2B b9cd5429ff79346b0cd618b57562affc05d97e8fc2758a70962a648a9ff28386495cdecb09807d5e3af1a2eaac1b7fb96f213c477ecc6768e969b53fa5e4a809 SHA512 53f298f0d8eb1ae5a8aa51ce3ed0c90a646e56429c81601c6dc4ee4e07a02c3ff73d852eaac27095aa7c6444b9775c8066fb9664a3ef706c23dd92d38a607ebd MISC metadata.xml 623 BLAKE2B bc808d06e4dd8c715a0abde57dba1fa02d563bed034e9cd4a8f50d78ed478ec1545aa0b42f6521ffa5c1ea57d456984c51af0cab39055201c4c04a4b46acc100 SHA512 d83b1e22d012536236067ac241b4b94f479e0adcd14a9e5647571f0550352e8d348965103183d51576e11414bb85714ded4222bfbb2a6464841b45e7644e8c2b diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-ld-lld.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-ld-lld.patch new file mode 100644 index 000000000000..e35ee8c0e46b --- /dev/null +++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-ld-lld.patch @@ -0,0 +1,17 @@ +Fix "symbol not defined" when linking with ld.lld >= 17 +https://github.com/ROCm/ROCR-Runtime/issues/204 +--- a/hsacore.so.def ++++ b/hsacore.so.def +@@ -247,12 +247,6 @@ global: + hsa_amd_vmem_retain_alloc_handle; + hsa_amd_vmem_get_alloc_properties_from_handle; + hsa_amd_agent_set_async_scratch_limit; +- hsa_tools_scratch_event_alloc_start; +- hsa_tools_scratch_event_alloc_end; +- hsa_tools_scratch_event_free_start; +- hsa_tools_scratch_event_free_end; +- hsa_tools_scratch_event_async_reclaim_start; +- hsa_tools_scratch_event_async_reclaim_end; + hsa_ven_amd_pcs_iterate_configuration; + hsa_ven_amd_pcs_create; + hsa_ven_amd_pcs_create_from_id; diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-no-aqlprofiler.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-no-aqlprofiler.patch new file mode 100644 index 000000000000..018c3298ed8d --- /dev/null +++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-no-aqlprofiler.patch @@ -0,0 +1,27 @@ +libhsa-amd-aqlprofile64 library is not packaged +Bug: https://github.com/ROCm/ROCm/issues/1781 +--- a/core/runtime/amd_gpu_agent.cpp ++++ b/core/runtime/amd_gpu_agent.cpp +@@ -1333,11 +1333,6 @@ hsa_status_t GpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const { + setFlag(HSA_EXTENSION_AMD_PC_SAMPLING); + } + +- if (os::LibHandle lib = os::LoadLib(kAqlProfileLib)) { +- os::CloseLib(lib); +- setFlag(HSA_EXTENSION_AMD_AQLPROFILE); +- } +- + setFlag(HSA_EXTENSION_AMD_PROFILER); + + break; +--- a/core/runtime/hsa.cpp ++++ b/core/runtime/hsa.cpp +@@ -490,7 +490,7 @@ hsa_status_t hsa_system_get_major_extension_table(uint16_t extension, uint16_t v + return HSA_STATUS_SUCCESS; + } + +- if (extension == HSA_EXTENSION_AMD_AQLPROFILE) { ++ if (0) { + if (version_major != hsa_ven_amd_aqlprofile_VERSION_MAJOR) { + debug_print("aqlprofile API incompatible ver %d, current ver %d\n", + version_major, hsa_ven_amd_aqlprofile_VERSION_MAJOR); diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.2.2-gcc15-stdint.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.2.2-gcc15-stdint.patch new file mode 100644 index 000000000000..21691ae0c1c0 --- /dev/null +++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.2.2-gcc15-stdint.patch @@ -0,0 +1,11 @@ +https://github.com/ROCm/ROCR-Runtime/issues/227 +--- a/core/inc/amd_elf_image.hpp ++++ b/core/inc/amd_elf_image.hpp +@@ -47,6 +47,7 @@ + #include <sstream> + #include <vector> + #include <memory> ++#include <cstdint> + + namespace rocr { + namespace amd { diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-musl.patch new file mode 100644 index 000000000000..75cd032ce373 --- /dev/null +++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-musl.patch @@ -0,0 +1,107 @@ +--- a/runtime/hsa-ext-finalize/CMakeLists.txt ++++ b/runtime/hsa-ext-finalize/CMakeLists.txt +@@ -101,6 +101,18 @@ if( NOT DEFINED OPEN_SOURCE_DIR ) + set ( OPEN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.." ) + endif() + ++## Check for _GNU_SOURCE pthread extensions ++set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) ++CHECK_SYMBOL_EXISTS ( "pthread_attr_setaffinity_np" "pthread.h" HAVE_PTHREAD_ATTR_SETAFFINITY_NP ) ++CHECK_SYMBOL_EXISTS ( "pthread_rwlockattr_setkind_np" "pthread.h" HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP ) ++unset(CMAKE_REQUIRED_DEFINITIONS) ++if ( HAVE_PTHREAD_ATTR_SETAFFINITY_NP ) ++ target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_PTHREAD_ATTR_SETAFFINITY_NP ) ++endif() ++if ( HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP ) ++ target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP ) ++endif() ++ + ## ------------------------- Linux Compiler and Linker options ------------------------- + set ( CMAKE_CXX_FLAGS "-std=c++11 " ) + +--- a/runtime/hsa-runtime/CMakeLists.txt ++++ b/runtime/hsa-runtime/CMakeLists.txt +@@ -47,7 +47,7 @@ cmake_minimum_required ( VERSION 3.7 ) + ## Need an update to CMake 3.12 to remove this hack. See CMake policy change CMP0073. + unset ( hsa-runtime64_LIB_DEPENDS CACHE ) + +-set(CMAKE_VERBOSE_MAKEFILE ON) ++#_cmake_modify_IGNORE set(CMAKE_VERBOSE_MAKEFILE ON) + + ## Set core runtime module name and project name. + set ( CORE_RUNTIME_NAME "hsa-runtime64" ) +@@ -109,6 +109,18 @@ if ( HAVE_MEMFD_CREATE ) + target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_MEMFD_CREATE ) + endif() + ++## Check for _GNU_SOURCE pthread extensions ++set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) ++CHECK_SYMBOL_EXISTS ( "pthread_attr_setaffinity_np" "pthread.h" HAVE_PTHREAD_ATTR_SETAFFINITY_NP ) ++CHECK_SYMBOL_EXISTS ( "pthread_rwlockattr_setkind_np" "pthread.h" HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP ) ++unset(CMAKE_REQUIRED_DEFINITIONS) ++if ( HAVE_PTHREAD_ATTR_SETAFFINITY_NP ) ++ target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_PTHREAD_ATTR_SETAFFINITY_NP ) ++endif() ++if ( HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP ) ++ target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP ) ++endif() ++ + ## Set include directories for ROCr runtime + target_include_directories( ${CORE_RUNTIME_TARGET} + PUBLIC +--- a/runtime/hsa-runtime/core/util/lnx/os_linux.cpp ++++ b/runtime/hsa-runtime/core/util/lnx/os_linux.cpp +@@ -137,12 +137,14 @@ class os_thread { + for (int i = 0; i < cores; i++) { + CPU_SET_S(i, CPU_ALLOC_SIZE(cores), cpuset); + } ++#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY_NP + err = pthread_attr_setaffinity_np(&attrib, CPU_ALLOC_SIZE(cores), cpuset); + CPU_FREE(cpuset); + if (err != 0) { + fprintf(stderr, "pthread_setaffinity_np failed: %s\n", strerror(err)); + return; + } ++#endif + } + + do { +@@ -165,6 +167,18 @@ class os_thread { + } + } while (stackSize < 20 * 1024 * 1024); + ++#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP ++ if (cores && cpuset) { ++ err = pthread_setaffinity_np(thread, CPU_ALLOC_SIZE(cores), cpuset); ++ CPU_FREE(cpuset); ++ if (err != 0) { ++ fprintf(stderr, "pthread_setaffinity_np failed: %s\n", strerror(err)); ++ thread = 0; ++ return; ++ } ++ } ++#endif ++ + args.release(); + } + +@@ -655,18 +669,12 @@ SharedMutex CreateSharedMutex() { + return nullptr; + } + +-#ifdef __GLIBC__ ++#ifdef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP + err = pthread_rwlockattr_setkind_np(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); + if (err != 0) { + fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err)); + return nullptr; + } +-#else +- err = pthread_rwlockattr_setkind(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); +- if (err != 0) { +- fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err)); +- return nullptr; +- } + #endif + + pthread_rwlock_t* lock = new pthread_rwlock_t; diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-use-system-hsakmt.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-use-system-hsakmt.patch new file mode 100644 index 000000000000..06f6610a71f4 --- /dev/null +++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-use-system-hsakmt.patch @@ -0,0 +1,20 @@ +libhsakmt is a part of dev-libs/roct-thunk-interface +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,11 +96,16 @@ if (HSA_DEP_ROCPROFILER_REGISTER) + string(APPEND CPACK_RPM_BINARY_PACKAGE_REQUIRES " rocprofiler-register") + endif() + ++if (BUILD_HSAKMT) + add_rocm_subdir(libhsakmt "${THUNK_DEFINITIONS}") + set_target_properties(hsakmt PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/libhsakmt/archive" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/libhsakmt/lib" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/libhsakmt/runtime") ++else() ++ find_package(hsakmt REQUIRED) ++ add_library(hsakmt ALIAS hsakmt::hsakmt) ++endif() + + if (BUILD_ROCR) + add_rocm_subdir(runtime/hsa-runtime "${ROCR_DEFINITIONS}") diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild index d7000ea9ca92..4caff8c750f2 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild @@ -33,8 +33,8 @@ IUSE="debug" COMMON_DEPEND="dev-libs/elfutils x11-libs/libdrm" DEPEND="${COMMON_DEPEND} - >=dev-libs/roct-thunk-interface-${PV} - >=dev-libs/rocm-device-libs-${PV} + dev-libs/roct-thunk-interface:${SLOT} + dev-libs/rocm-device-libs:${SLOT} $(llvm_gen_dep ' llvm-core/clang:${LLVM_SLOT}= llvm-core/lld:${LLVM_SLOT}= diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.2.4.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild index dfbf8f00ebdd..0fe1225bfb40 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-6.2.4.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild @@ -3,26 +3,22 @@ EAPI=8 -LLVM_COMPAT=( 18 ) +LLVM_COMPAT=( 19 ) inherit cmake flag-o-matic llvm-r1 if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/ROCm/ROCR-Runtime/" inherit git-r3 - S="${WORKDIR}/${P}/src" + S="${WORKDIR}/${P}" else SRC_URI="https://github.com/ROCm/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src" + S="${WORKDIR}/ROCR-Runtime-rocm-${PV}" KEYWORDS="~amd64" fi DESCRIPTION="Radeon Open Compute Runtime" HOMEPAGE="https://github.com/ROCm/ROCR-Runtime" -PATCHES=( - "${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch" - "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch" -) LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" @@ -31,8 +27,8 @@ IUSE="debug" COMMON_DEPEND="dev-libs/elfutils x11-libs/libdrm" DEPEND="${COMMON_DEPEND} - >=dev-libs/roct-thunk-interface-${PV} - >=dev-libs/rocm-device-libs-${PV} + dev-libs/roct-thunk-interface:${SLOT} + dev-libs/rocm-device-libs:${SLOT} $(llvm_gen_dep ' llvm-core/clang:${LLVM_SLOT}= llvm-core/lld:${LLVM_SLOT}= @@ -42,10 +38,21 @@ RDEPEND="${DEPEND}" BDEPEND="app-editors/vim-core" # vim-core is needed for "xxd" +PATCHES=( + "${FILESDIR}/${PN}-6.3.0-use-system-hsakmt.patch" + "${FILESDIR}/${PN}-6.3.0-musl.patch" +) + src_prepare() { + cd "${S}/runtime/hsa-runtime" || die + eapply "${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch" + eapply "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch" + eapply "${FILESDIR}/${PN}-6.2.2-gcc15-stdint.patch" + # Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ... sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die + cd "${S}" || die cmake_src_prepare } @@ -56,5 +63,6 @@ src_configure() { filter-lto use debug || append-cxxflags "-DNDEBUG" + cmake_src_configure } diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest index a17121abc8e8..2dff3cf638a9 100644 --- a/dev-libs/roct-thunk-interface/Manifest +++ b/dev-libs/roct-thunk-interface/Manifest @@ -1,9 +1,12 @@ AUX kfdtest-6.1.0-libpath.patch 431 BLAKE2B ba078dda302bddc7431ce8016271d895e0104f3779681ec2d89756f2b43679a7085bd9477868283b127ebed8a40dcf406f8c2a70369e470ebd52d6affd9a3e9f SHA512 b86538013763552963b7667657a3b2d0c946d5b989bf73523308c191b48902deda6c7a097dbc53851e979fcd72e150dc38ded0ed9c1e22f16e1466becb456217 AUX kfdtest-6.1.0-linklibLLVM.patch 1087 BLAKE2B d0d8bea523995a1bd82f813e09958875806eabba78c54daf299df9cc129fd043377241896ce5e829676c6ba2fe3055b0eebb76478b6c9c80d8f76ebfb745159b SHA512 3c5ed615c2e3a6abc45fb931f25596d6d5d83de096f1057f24cdac2d7efbbfea58d369eb0b1eefa93fa67efb46600d8df20be4924efac3a73cd8fcec1cbcd491 AUX kfdtest-6.1.0-skipIPCtest.patch 955 BLAKE2B af2c2f59acf24415746bf6d4179589b7c2e3e4c6292fccd2b2ebd9400f76543da8cc6d963a5e0fb62c407710d9c39fcd8f5a7d086eeb57a3c34ce8048a1e3bbe SHA512 286b0226a2e75de5a2d882c85bd9a4e5014683a5a95c11a9ee9d06f075af1ce15b276e570d2bd02e3ba9a572ae8f8bbea2fbeda9804312218cc2f34ccb636b58 +AUX kfdtest-6.2.4-fix-llvm-header.patch 412 BLAKE2B 9d42a7115431d8b57d3ff7a928bbc67dd1d8b0e4b320def5b9cde1b57d3ea391a5f3605ef0984d7981479466a8c56d3f61a925f59ddd5a697d14a9e88221a7b8 SHA512 66ac66ac7aeb82d8b83268db98493df025d0318f9dfe3c2219ac45c6756a2415c09f8f281d53eb2559d5162a7e0a63b639a5e2f99b90dd0233ceb477ebd78a3a AUX roct-thunk-interface-5.7.0-functions.patch 335 BLAKE2B 590ee1b8f412836c9fae0e10d7acd91842f6dd9aa87dd40a7a8ea48596dc2a1aabf2dea69cc2924fa0b4467d8238bde42c58ac95415fc0324133ea4389f413a8 SHA512 a1961fb2d0636bdb1720abdf433ef4d0f5f69f48784efc45ed77dc8cdd7bc2433dc9aaec0ef9105db12e4d6a8a57d50ee1ffa7b0d42990be1d88ff668f7b15ba AUX roct-thunk-interface-5.7.1-musl.patch 1878 BLAKE2B c2103b5b8d76e3a637b79bb701308d7c1b2f6def76206e5a1e3841c12e92bec19a6e9a596238709ee4413072530dd984f7910be6bfc394622b34a93ad5cf1c9e SHA512 b5da199e15eb01a087bbc3600a7df5971029594a778ebfc71185320a662f0681a65fd55ad71ba3089e6a72745dfa1de5f637cb96fe8ab3510869e9fb272f5819 AUX roct-thunk-interface-6.1.0-visibility.patch 868 BLAKE2B d32fcc6a230af549b73db30183fcb2339fcd3bc68dfbf1f7dce0e35361a674f77cba58ef485c3212de43e95c5eabf517386c6b7a289e57ed38b5d6e21e191939 SHA512 6c540e70c53a602477943ff9a26d5eab3d02d8a3c8577b1e39d5baf5a3703de70073e1d0db5083d03460bdd1e2d2fff2cf6356e57d7e392ce4d4dac6bae74900 +AUX roct-thunk-interface-6.3.0-functions.patch 293 BLAKE2B e89c9f91f7b14578be5215fe02f8efe3beaf83ffdb3904a8b5211921c6fa8f38459b948da68118c9bcadd5694b4af3b37ce95f6c1221abfd8b7ec8a9c23326ba SHA512 085fd2179b203a2efb65e782036906a89e70cd490bf5acb79fe5b720a009e335b739a4df2922069d4352f4c45cbc40208dc4d360bb2527ea89bf6343842ac0c9 +AUX roct-thunk-interface-6.3.0-musl.patch 2488 BLAKE2B 98677f7bd7906fa7804203564241cd9eb6c4588d97db58c9f7a1934a9ce9eaf610ceee7439d85e0956aa60d583946fa2016e9bb1a42b1e9a8b2f43b4debdca95 SHA512 3015afed7b5055f46b1ec638d3ad406f7bac15fb0ad1f249b640558fc627fac6594f3b1dccfe20e3855c65bd75ed1ccbf390f5b73abacc20a35938397f538c78 DIST roct-thunk-interface-5.1.3.tar.gz 3178689 BLAKE2B c46af7bc60772beaa9a214a86a634290cfd7952589f70736c0c2544c0459eb4fdcc65030d897dbb67bfbaae545f529ac647397df3fcfeddeb5d5e05a283cfd6b SHA512 746a04e667ce242160d6e2519594fc93b205520dae28678859fbd40c3c641082aa6219c04c8e2b58289763a5244dd6336b56c2e2016ba671c5e5a6fb9ca5caea DIST roct-thunk-interface-5.3.3.tar.gz 646773 BLAKE2B 48632cad576ceccede0ee62663f226cbedba8374d8962028fd729a7b8e7eb75bebcb2f8ce06a838de15a388caea3d6dcb150db80f8d45a91675997b4f80625e6 SHA512 4a8730d16a0d240a43d5e22092325b0731d133733af0aac6c6893763d1ffb1a04a0c045d988835079581e097fc7c9e383f41ba84daa105c032d3a653b6b2c6b0 DIST roct-thunk-interface-5.4.3.tar.gz 648897 BLAKE2B 9eefc5f417280a98c7c6b6d611d0d87fa52abca94f67bf5ecc10d84bb86433b5ff502f76aa6724245c7cf9d82b5c16c10943275e8d41f0053484765df5a901db SHA512 1787526515ec708edc398cdba308a8dfa32c2579524a6856a6f336cb7bfee8f9a00d67f1b489993c7454d1d88885032ce85ac752b4a15aaedef910f147aed3b5 @@ -11,13 +14,13 @@ DIST roct-thunk-interface-5.5.1.tar.gz 649617 BLAKE2B 54ecae486e5d8b99363947a93b DIST roct-thunk-interface-5.7.1.tar.gz 665529 BLAKE2B 407601d45976ad66e85999c53bcaa62fefa2ea823e1d3296a9aabe8b6a9c915776344de4499fcf6f9ee80193201308b27b387a7225aca5d2cc7e294143eefacd SHA512 c0dc449c8b713ac543f6cd6c876ea0f160dcb1a5c4a52a2b1364fcae0039e9fe195e4223a2644d7d3a7fbc2a48166e798d15b9088e2097b65974e2ba5e48bdcf DIST roct-thunk-interface-6.1.1.tar.gz 666377 BLAKE2B b30d733fb769f7169e97b8a28eaa61c84205aec06b55d662d24f159a3c84190f3252f090413769e56eb621abc789fae521cb7b26d7cdac952ff1e4e120707bc9 SHA512 2c579606d2ced9f8b5e32841db745819771b7d6ce0cef90b818e3710470e30c7715540125d99ed5ea13c4e672d5af6d8ad2dd5975ef76cab7ba993d86cf74eb4 DIST roct-thunk-interface-6.1.2.tar.gz 666380 BLAKE2B ffff2405bbb95a6908670a23cf6090147a5669f8ab0c999047203731c99c511738a33ac8d3fc0f0e5432e3744e948ec3fe658d6a578ecc63606c8a5662025b0a SHA512 083b1a865608016f78c094a27ece3858072e72d80e1322e7cef22261222a0f868d3b72ebfcd80a11e4719e90d3d3fc7b0c683aed77714f54f520bb126b13ab7c -DIST roct-thunk-interface-6.2.4.tar.gz 674228 BLAKE2B d1e13cd4d772a2118c6af973893be077b205a197a7fbfc2c6b8ca616d079bfbd1edab788fe170980c3d746afee409dca00f267f6c5c481a7eb1320faafbf4145 SHA512 2df159af277be9834ff7fc60094fdeefdae029099e9208426d0efc817e8b88d74c40a75b36a774ab06d638ce37aef68483d2c7b8d77be96a4f76a160e1cd1bf7 +DIST roct-thunk-interface-6.3.0.tar.gz 2258605 BLAKE2B 53b43a8bc4a327c2138e39db20f5217b2def6866d1b52e48017c41e6c3c8541e6bdce76f5a7669cdffccfb34a4cfa863e56e0ce4058d23c5f38d9d0900903751 SHA512 451e74d88875b8d0a1f21d95c543fd93610d966e69258b50fe4b8796381c58f5ea381384e199e5bcf01a80369a59e5a093d8f318fbe2ed1ca6a97dc915060f7a EBUILD roct-thunk-interface-5.1.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f EBUILD roct-thunk-interface-5.3.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f EBUILD roct-thunk-interface-5.4.3.ebuild 1107 BLAKE2B c5523fd9ba5475faf5b8bb4ea35a100f4049a8b008c3dec048e03b8e14b394f28b8b5515f7b93c94774c75304e2df7ef745e9538eae5309c6faa569748d32551 SHA512 dfc0e032b61667c9171900f36bc7f18df0e67635e8988d91a8041c298053d9c977adf123af2326e7986bbe00f45ea3ec3e3630ff0993279cfd7becbb5492fc36 EBUILD roct-thunk-interface-5.5.1.ebuild 1055 BLAKE2B a2341ff457f5ee2754ee8cb63a68b90ee67074946d39ab064fa8838b8fa5d0239f330b2751d233c3038b3988a40486d9df7715df0fd26a6677c5789982679c1f SHA512 49819d214fde8e77f8ca051d9dc44af03472a17e0509aa92812a416bff9008577d3a5bbf96fed12315ce3bd1655641f71ac721d2440b7031927e883475c648fe EBUILD roct-thunk-interface-5.7.1-r1.ebuild 1149 BLAKE2B 31bacc1a1123eac6afe14c9dacf150cf64c8ac85b46e7f4ad386b9e3d8b06b6a2264210f021123218c42c74c87a849f34327baeb648ffd5269276f31302a7151 SHA512 f58abcb15dcbf13d0ef5c148430e2de70345831ad693fa2c2fca2e586e5625a8252c6a57f9ec0d2a75c4f92ba7267acffd985cbc91d8ba157a3e13a952fecf76 EBUILD roct-thunk-interface-6.1.1.ebuild 1865 BLAKE2B f663ba72e647989b8504b0abd4914f183ced60b420cf9fec2688513db5d86d88037674c47901233704755d743703aece1241ae3b756fec291e4dc38b87feb292 SHA512 4f7d9270828b5c478842dc1cf0ca186bd126fa517fc36588df8a44efb57b73e8e97bc52f4a14bde14684f62c2127e386ff2e62ea7ad7e754543dabe14ef505c8 -EBUILD roct-thunk-interface-6.1.2.ebuild 1865 BLAKE2B f663ba72e647989b8504b0abd4914f183ced60b420cf9fec2688513db5d86d88037674c47901233704755d743703aece1241ae3b756fec291e4dc38b87feb292 SHA512 4f7d9270828b5c478842dc1cf0ca186bd126fa517fc36588df8a44efb57b73e8e97bc52f4a14bde14684f62c2127e386ff2e62ea7ad7e754543dabe14ef505c8 -EBUILD roct-thunk-interface-6.2.4.ebuild 1633 BLAKE2B a1f35c759dff41bb36d0946a707de6a6895ba8f8b9d3a25b8298117938cc6abe27998f60e347d3ea0cb1628b657d6bc5fb21fbcbe1ce4c8d42c6803f69c030e2 SHA512 75e689889dbfe854f6a3a92622df1f7d46a41f0e3f236d15a643027ae8abfebda34bfb54e45d2558609f17348986362335e07cb32cc6349d1b92c5af05f6dba2 +EBUILD roct-thunk-interface-6.1.2.ebuild 1988 BLAKE2B 711a69796383d964849f321735e21780ae91a77a16952f7998f68f8cbd14093e112fba762310c130af47a5c05958f1be24b62542a8281ee89fb7a72e8e72dae9 SHA512 70ff633b89ae06481ca6631f0b9ef67fbb4367b9bd30a239233fee9eafce2ba4c25faa862a8681d9711b4cae55919a75644a734d297424ca51de29258b1e3456 +EBUILD roct-thunk-interface-6.3.0.ebuild 2133 BLAKE2B e994105066495ee3fcf71eba82328f462252b0ff00cf6344502b50bdbf1c2accdf15fbadee58c3bfa4f5a34d12afb276cf06bdd69bcc655f46405896e73f3a82 SHA512 afd8fdef7aeb966bd906482bd20b698ea4c683050f89775c10f67a82c6dc220f770d415bf0b0d93b6cb2d8bcc4e0ca345f34b6f0cb0f7f7b50b81914bc484809 MISC metadata.xml 661 BLAKE2B c019c853506c550339b18a7f1ab57fd5f2876309823bab923ef07f7f997d820c2664ae5c0c1d2e29c2ccdf613f96cdaf85d92a3734aeb105c392847aed73c76b SHA512 194cdad18f2be9fb4d895ff75b4ce9c6a59443caad443061ea70a8cc4778ec13ca35273c8018ac1d00c7ecd146302ee4bf856ad653a174a1ad281d235b6e12e9 diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.2.4-fix-llvm-header.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.2.4-fix-llvm-header.patch new file mode 100644 index 000000000000..30515c2d12f8 --- /dev/null +++ b/dev-libs/roct-thunk-interface/files/kfdtest-6.2.4-fix-llvm-header.patch @@ -0,0 +1,14 @@ +Add header for llvm_shutdown. +Backports https://github.com/ROCm/ROCT-Thunk-Interface/commit/8bb5764ee1c4e3a8dc7588b597831389b4481345 +--- a/tests/kfdtest/src/Assemble.cpp ++++ b/tests/kfdtest/src/Assemble.cpp +@@ -69,6 +69,9 @@ + #else + #include <llvm/Support/TargetRegistry.h> + #endif ++#if LLVM_VERSION_MAJOR > 18 ++#include "llvm/Support/ManagedStatic.h" ++#endif + + #include <linux/elf.h> + #include "OSWrapper.hpp" diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-functions.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-functions.patch new file mode 100644 index 000000000000..3b6c2623bd7a --- /dev/null +++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-functions.patch @@ -0,0 +1,12 @@ +https://github.com/ROCm/ROCR-Runtime/issues/263 +--- a/src/libhsakmt.ver ++++ b/src/libhsakmt.ver +@@ -89,6 +89,8 @@ hsaKmtPcSamplingDestroy; + hsaKmtPcSamplingStart; + hsaKmtPcSamplingStop; + hsaKmtPcSamplingSupport; ++hsaKmtCreateQueueExt; ++hsaKmtRegisterGraphicsHandleToNodesExt; + local: *; + }; + diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-musl.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-musl.patch new file mode 100644 index 000000000000..f1a117050c9a --- /dev/null +++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-musl.patch @@ -0,0 +1,71 @@ +Fix error: 'hsakmt_page_size' undeclared (musl-only) +Upstream bug: https://github.com/ROCm/ROCR-Runtime/issues/267 +--- a/src/libhsakmt.h ++++ b/src/libhsakmt.h +@@ -64,14 +64,15 @@ extern HsaVersionInfo hsakmt_kfd_version_info; + do { if ((minor) > hsakmt_kfd_version_info.KernelInterfaceMinorVersion)\ + return HSAKMT_STATUS_NOT_SUPPORTED; } while (0) + ++extern int hsakmt_page_size; ++extern int hsakmt_page_shift; ++ + /* Might be defined in limits.h on platforms where it is constant (used by musl) */ + /* See also: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html */ + #ifndef PAGE_SIZE +-extern int hsakmt_page_size; + #define PAGE_SIZE hsakmt_page_size + #endif + #ifndef PAGE_SHIFT +-extern int hsakmt_page_shift; + #define PAGE_SHIFT hsakmt_page_shift + #endif + +--- a/tests/kfdtest/src/KFDTestUtilQueue.cpp ++++ b/tests/kfdtest/src/KFDTestUtilQueue.cpp +@@ -57,13 +57,13 @@ class AsyncMPSQ { + void PlacePacketOnNode(PacketList &packetList, int node, TSPattern tsp); + + /* Run the packets placed on nodes and return immediately.*/ +- void Submit(void) { ASSERT_NE((HSAuint64)m_queue, NULL); m_queue->SubmitPacket(); } ++ void Submit(void) { ASSERT_NE(m_queue, nullptr); m_queue->SubmitPacket(); } + + /* Return only when all packets are consumed. + * If there is any packet issues some IO operations, wait these IO to complete too. + */ + void Wait(void) { +- ASSERT_NE((HSAuint64)m_queue, NULL); ++ ASSERT_NE(m_queue, nullptr); + m_queue->Wait4PacketConsumption(m_event, std::max((unsigned int)6000, g_TestTimeOut)); + } + +@@ -244,7 +244,7 @@ HSAuint64 AsyncMPSQ::Report(int indexOfPacket, HSAuint64 &begin, HSAuint64 &end) + if (m_ts_pattern == HEAD_TAIL) + indexOfPacket = 0; + +- EXPECT_NE((HSAuint64)m_ts, NULL) ++ EXPECT_NE(m_ts, nullptr) + << " Error " << ++error << ": No timestamp buf!" << std::endl; + /* m_ts_count is equal to packets count + 1, see PlacePacketOnNode(). + * So the max index of a packet is m_ts_count - 2. +--- a/tests/kfdtest/src/OSWrapper.hpp ++++ b/tests/kfdtest/src/OSWrapper.hpp +@@ -23,6 +23,8 @@ + + #include <stdlib.h> + #include <stdint.h> ++#include <limits.h> ++#include <sys/user.h> + #include <string> + + #include "KFDTestFlags.hpp" +@@ -33,10 +35,8 @@ + + #ifndef PAGE_SIZE + #define PAGE_SIZE (1<<12) +-#define PAGE_SHIFT (12) + #endif + #ifndef PAGE_SHIFT +-#define PAGE_SIZE (1<<12) + #define PAGE_SHIFT (12) + #endif + diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.2.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.2.ebuild index 1dbc511d8147..371100384195 100644 --- a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.2.ebuild +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.2.ebuild @@ -3,8 +3,9 @@ EAPI=8 +LLVM_COMPAT=( 18 ) ROCM_SKIP_GLOBALS=1 -inherit cmake linux-info rocm +inherit cmake linux-info llvm-r1 rocm if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/ROCm/ROCT-Thunk-Interface/" @@ -24,8 +25,10 @@ SLOT="0/$(ver_cut 1-2)" RDEPEND="sys-process/numactl x11-libs/libdrm[video_cards_amdgpu]" DEPEND="${RDEPEND} - test? ( llvm-core/llvm - dev-cpp/gtest )" + test? ( + $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}') + dev-cpp/gtest + )" IUSE="test" RESTRICT="!test? ( test )" @@ -62,6 +65,9 @@ src_configure() { if use test; then export LIBHSAKMT_PATH="${BUILD_DIR}" + local mycmakeargs=( + -DLLVM_DIR="$(get_llvm_prefix)" + ) test_wrapper "${S}/tests/kfdtest" cmake_src_configure fi } diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.2.4.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.3.0.ebuild index cb766e9f4d95..575bf9d7254d 100644 --- a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.2.4.ebuild +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.3.0.ebuild @@ -3,20 +3,22 @@ EAPI=8 +LLVM_COMPAT=( 19 ) ROCM_SKIP_GLOBALS=1 -inherit cmake linux-info rocm +inherit cmake linux-info llvm-r1 rocm if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/ROCm/ROCT-Thunk-Interface/" + EGIT_REPO_URI="https://github.com/ROCm/ROCR-Runtime/" inherit git-r3 + S="${WORKDIR}/${P}/libhsakmt" else - SRC_URI="https://github.com/ROCm/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}" + SRC_URI="https://github.com/ROCm/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/libhsakmt" KEYWORDS="~amd64" fi DESCRIPTION="Radeon Open Compute Thunk Interface" -HOMEPAGE="https://github.com/ROCm/ROCT-Thunk-Interface" +HOMEPAGE="https://github.com/ROCm/ROCR-Runtime/tree/amd-staging/libhsakmt" CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR" LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" @@ -24,14 +26,23 @@ SLOT="0/$(ver_cut 1-2)" RDEPEND="sys-process/numactl x11-libs/libdrm[video_cards_amdgpu]" DEPEND="${RDEPEND} - test? ( llvm-core/llvm - dev-cpp/gtest )" + test? ( + $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}') + dev-cpp/gtest + )" IUSE="test" RESTRICT="!test? ( test )" CMAKE_BUILD_TYPE=Release +PATCHES=( + "${FILESDIR}/${PN}-6.3.0-functions.patch" + "${FILESDIR}/${PN}-6.3.0-musl.patch" + "${FILESDIR}/kfdtest-6.1.0-skipIPCtest.patch" + "${FILESDIR}/kfdtest-6.2.4-fix-llvm-header.patch" +) + test_wrapper() { local S="$1" shift 1 @@ -42,18 +53,26 @@ test_wrapper() { } src_prepare() { - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die + sed -e "s/get_version ( \"1.0.0\" )/get_version ( \"${PV}\" )/" -i CMakeLists.txt || die + + # https://github.com/ROCm/ROCR-Runtime/issues/263 + sed -e "s/\${HSAKMT_TARGET} STATIC/\${HSAKMT_TARGET}/" -i CMakeLists.txt || die + cmake_src_prepare } src_configure() { local mycmakeargs=( - -DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DBUILD_SHARED_LIBS=ON ) cmake_src_configure if use test; then export LIBHSAKMT_PATH="${BUILD_DIR}" + local mycmakeargs=( + -DLLVM_DIR="$(get_llvm_prefix)" + ) test_wrapper "${S}/tests/kfdtest" cmake_src_configure fi } |