commit: 7dac5c2206c41dd7855db2b5ef9830d7ee297c62 Author: Denis Reva <denis7774 <AT> gmail <DOT> com> AuthorDate: Thu Dec 16 08:47:25 2021 +0000 Commit: Denis Reva <denis7774 <AT> gmail <DOT> com> CommitDate: Thu Dec 16 08:47:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7dac5c22
media-libs/amdvlk: See #665590 I've burned out trying to make it buildable https://bugs.gentoo.org/665590#c73 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Denis Reva <denis7774 <AT> gmail.com> media-libs/amdvlk/Manifest | 14 ++++--- ...dvlk-2021.1.2.ebuild => amdvlk-2021.4.2.ebuild} | 44 +++++++++++----------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest index 9e894294b..e329dd756 100644 --- a/media-libs/amdvlk/Manifest +++ b/media-libs/amdvlk/Manifest @@ -1,19 +1,21 @@ DIST AMDVLK-v-2020.Q4.5.tar.gz 32258 BLAKE2B e2acdbb87c0a53b45cbbceeda0b7a6432db5713891dc35d9c3c3932e20799fe0ab219de9f2d042ebd403c1904c5a1b0bdf23f8d1a033b7c6d7a17e7c65132373 SHA512 98158c82c08657d130d462f1e5e70f6c77749eb0f139c3b392984c1b44eed0828aab71c580747799a734fa0d581720c5b70779c4c5f5bd3dc269b128df95cec8 DIST AMDVLK-v-2020.Q4.6.tar.gz 32275 BLAKE2B f7bb0e5df49df9fe5d0a2f5bb169a2fdec7c36548f53c5bd23702465373a754aa43659a2fc7c4b57882ffe64be4438911dcda3766cba26d5a9c08a4e5816e66f SHA512 be8b28ef15e9e7941c97296342393a645095617b96f189939be3885f1e430d7ee683868ec0b1aa6c9642f2572aa066f638b3f770bc425dcb5b284dbf655b32f3 -DIST AMDVLK-v-2021.Q1.2.tar.gz 32689 BLAKE2B 13269d8cf77c4dd808c160cce50b03160c6f639a65fe69bafb654f2e5045b595a17c8dc0e6e8a5e4801bcfa1818d0b4a4f3099ba4475ff627b2ec01c625e32fd SHA512 5f3a3cc408b18a5b6f94f816e0af14b499367097888bc28acd17f9ef4630f7f7fe9753d43855b4f9615f0bd73c0101151b2983174db73fe2b3477408ebce5dd2 +DIST AMDVLK-v-2021.Q4.2-CWPack-39f8940199e60c44d4211cf8165dfd12876316fa.tar.gz 39581 BLAKE2B a3cf15d6525a886f5b95e7c3de7d283d4c637266c36312d7b44b7e240aa1b970ea1ee59e421e0fed4ad581ffcf5796cf91cf92162ac380b4fea9532e5c0ca28c SHA512 d642e693856df0808f499e34f36204b748eb969d6eb5a51138d7f894d78f92c955b89b743fde3b8f28904e407e7694a6092b85f3a91fc68c37477c57e1b59d3c +DIST AMDVLK-v-2021.Q4.2-MetroHash-3c566dd9cda44ca7fd97659e0b53ac953f9037d2.tar.gz 11804 BLAKE2B 683ca8a9e4b93a945dc455c5cb78a2c6dd9dbdf22432ea9f447a6d2d1b05399cc57b621d1e304dc5695ab936a212a2df110e47ec9141764f4eaa2b184a01f4ba SHA512 ae4fcf09a097ceddfcc9f0b721cae0018fff8a0360d8fbbb195d2a8c2809cf8f3c01090ba8129593d89fe1c041224e42a49e7a1c66f20e60958a5373f6d9027f +DIST AMDVLK-v-2021.Q4.2-llpc-80b124752f5f689b21d46a3fd459b2df659de187.tar.gz 2259366 BLAKE2B a304f87ddbfd3dbc9a5599ffa43c85b2615b185368543bb82672239a1834ea3ecc919f7b7ed34718229a93e3983dc09e5530e6449f128bf53b5eba14365b8699 SHA512 3307846069f17478daeb4174377cf37d1e490137cdfaf738d5b15a4ce017b102699bad004bb17ce9e9efeb89190693f2fd24b73f64d81b43a89de9082e4fcb6e +DIST AMDVLK-v-2021.Q4.2-llvm-project-63581e1504f3854df7d1ea7aab6af935da1b515d.tar.gz 150625232 BLAKE2B 07b7a6ad6f0a7443ba81d029191bbd8a8f94abf3445697f96a65df0ba17bcc2b21af1bcad669210e6049e8371da9e0908032f8490d00ba11a06045b86ba21ada SHA512 651267c622e8e9d52a4732d7e7414e8c5b94ba98cd7d1ab59a5e36e69a26afbad98bd36c0cfd9a71c9b5e354a255c9807ebfe11d2105a1992402e576c18f7128 +DIST AMDVLK-v-2021.Q4.2-pal-61409c1cea19a2ca5ad00461b1e75b3ab46c4389.tar.gz 8773968 BLAKE2B e79dda192865235831f07069deafe7b17113f415436026cff81ecae45192e725c45ea8d65ee910a08f3c23fc74be0915f19e43b9b9580d5d4a91a624b6b5c344 SHA512 3a56fa25c10c9b99aa77d3a5bef09817c48ef62d9b03bac0d7216099404120496b7fb13d979e6ded5b406ad59b1472d54729d75f6025b4469aa8343de8604c1c +DIST AMDVLK-v-2021.Q4.2-spvgen-0aa19873514a8272dfdc5cb8861859a52f5de503.tar.gz 20466 BLAKE2B 7cce36d8f5a6952b4eb49a5c7bc7b5e5ffac268d6ba6e852f5a959004f5626d27f06db6ae3d318a12ca164406d042db09df610f09e664de358aadf3e20b6d604 SHA512 1cc221f8665ed35b4ea867ee0b1059f81d9b7009b847e4795d10817f2e357330b07e254118f73392f4bf6ee74e9b61f8961719564203cf43ee9917006aa0b802 +DIST AMDVLK-v-2021.Q4.2-xgl-da1a583a51c69c115f9144b68ec2bdf5b6519056.tar.gz 960709 BLAKE2B 825e7d349da18e8a0beb42c4125bb208bd2e62780d97d5131e76e9ddc08dc6d60b2d78455aa245bb4172bb7ee7d64084307e48df2c18598cee638911fce8074c SHA512 a626459503b50a511ac04f4973036468336e9d55baecda5a84165f7209d867291ef35a9292734f38a53d13aaf70cd46fc8e3068fc3748d80278fcf3c5f8a54bb +DIST AMDVLK-v-2021.Q4.2.tar.gz 30012 BLAKE2B 27d11126d54df299ce702adb7c66bd0aa8a905074dac0e2cd8560f2fa9c39deafd16885c15ae9df4f70f4008a446d8e90e1dcc50514afa7ab0a874d12b2e5334 SHA512 15fb89bb78039c36435fb9534588f08e0e0e6e6099d5e803e9bacafef8b5e81eedc19e0fcc7cd7ca7dad919397cab8b87b30b22950ae32945a5465da542d6d99 DIST CWPack-7387247eb9889ddcabbc1053b9c2052e253b088e.tar.gz 24538 BLAKE2B 76c4da32ea06df355f7e8f77a14c185b2ccab2ce2762988f04a04d65b674e089d4fc27206e744f89b4bd84c9d7226d324414a31941303290e7f574e9d64756cf SHA512 38378ef325e42a7356511c2fc06b6c896581968079e85c4b924a1768d895feecaf1eb8fd65afb59bed0f66e0547104d67c2deb9f82a86f4b9fa65b36e57cd47d DIST MetroHash-3c566dd9cda44ca7fd97659e0b53ac953f9037d2.tar.gz 11804 BLAKE2B 683ca8a9e4b93a945dc455c5cb78a2c6dd9dbdf22432ea9f447a6d2d1b05399cc57b621d1e304dc5695ab936a212a2df110e47ec9141764f4eaa2b184a01f4ba SHA512 ae4fcf09a097ceddfcc9f0b721cae0018fff8a0360d8fbbb195d2a8c2809cf8f3c01090ba8129593d89fe1c041224e42a49e7a1c66f20e60958a5373f6d9027f DIST llpc-38dcb76aadf729b67cabe15c2cc07a784020f704.tar.gz 2079177 BLAKE2B eb3f594b195af82faeeb9e9f5d73cc294d8178d7390183c083b4231f17a8382f0e72480f3e883b7d3e3b1f7a654974efd4d2dec1c60f6d9ae019696f467f296a SHA512 599ea375fc87621d0085bc9a1d68f00bbde42408c1b9f745ea7da8658c041cdc24722b763e53981a2ad844efa042348be7df939cee4459503ab66d462403ce32 -DIST llpc-86ed348f405120042a2540ec3157e28baf45dc81.tar.gz 2138674 BLAKE2B fc29be141042803de90ca1402bd3cc94ac465889ec139fb0bc39946b4798ec1c145e451938c1e3a28961d2d0d453774722ea23838b6a9cc55a7bf427ae3db49d SHA512 f814d1f084e22b5316fb47499ac2b48e389cb01e50083e2b0b7c531d9d2d22dc27aa3f525f9f3cb20b6cfdc85e1791f67415c2b90fd847828ea8229a0de67102 DIST llpc-e2d38b0c8042efbc435e51696aba5c1abd256c88.tar.gz 2091062 BLAKE2B 64dbba4f1a9c1739e56015b149143ece3795022f81eb28cb05930a1b86e505789d474ab5e6483e9700f3dba07d30a21591417564e630b2fc0e4827ab7f61a0e3 SHA512 04c3f12e6c89cae9b44703bca545e824e9f6ccb6bd88d3be80efe5edc29956fa3b8368bf79f026a691f916567f12643cf7f38a09265db656457d34600a7fe6e6 -DIST llvm-project-1551e626ea6b19f81928d2e4eddab657eb82af9b.tar.gz 132456009 BLAKE2B eb17a949da39dafa46c9ff8de0e7e994a39167919981a0bc5c5281cb6c65100a4bc76dd5bdcfbef4a05b7cc0606a8f29c8c25775a722e8842950a730a81641e9 SHA512 1b5ebd367e5a978b3f39b203d5497862d57921ab2027239da798fdab92e7dccf1ecdc8ee80b8f3ec49474097576bcc2ab9b0cfb6660cd56ba1f87adb564addfe DIST llvm-project-7ff363c8283c1d41ecbdcdc45c8b724b52312d67.tar.gz 128585110 BLAKE2B 2902b68f08f6a978a08061a145e93d0cbea57e4c47431b0249a06ae986e739d9fbb749b2e59996abcc25834cff59ab2dc837debc7acc7ee12c3ec488cb300cab SHA512 b8e4a6858f1c4ffb26206e545095e64641fef4cee47188d5481d14780f6b8276f70b5c485da1fc26025ee42b6b984c2901caf85ade1599f1a6aa73e0ab190087 DIST llvm-project-a0777f49050191c9e215a4880c855395ba805508.tar.gz 129045563 BLAKE2B 1234834158b43c7609037cf8eadbc2564dd432eae476f6993383c48164dc4718f450616c35fbddd451a01382ad633c2980c81d27c57b1275dd72a7afc22fe437 SHA512 952843621edfa2f60c08f4c934091acfaed50463f59c24e18821a0023f383840a7346d250e56d1df3ac40fb573957357d4f61f155a2e747508b3748ceaa4df25 -DIST pal-57cd977c79e4321c28dcb1a18a4aa23880aa48f4.tar.gz 8097698 BLAKE2B c3a644c61b9448155158333e870eac484bf1e529984306d9717e1e2a17d1f3acd7118a4ab794066303b4262759a7c8b58b4eb790c94ee19b610f85ef4e80b701 SHA512 610e9aa8f76dc7a9b1d742ce03551ba74dc35bd2e8e4428fc64d88d7daf406606af6006a0f227d4aed9ea2e14b86caf104630ada35f3cb98543db158646099e4 DIST pal-b1e752d402592628f61eb7e1aa2a802a205de798.tar.gz 8029839 BLAKE2B 776b85c0d5780a3b6a5a50d04609a20f1552a0afa0caff090013c2506bc9f97592b42f69941ac29697f3dced45e4619ca8be918e1b68fabd5c651893ba689d35 SHA512 5d98bcf1631d70620bb56a380c7b510f6f517d48e1cc0b2f7007687b929fc36af69d7478984756bf84e2f7e6934034c10f7bfce24b83df812de93e3a6b9b9faa DIST pal-f92844ecbba39be3d2663717ad69c3dffc282211.tar.gz 8049042 BLAKE2B a11b40deb3d9645b88861f9bb3ed198fab07baace72ee5c9566601d71b0cda94178161ea59d4ba09384b3c9f88fb40a956243aacbc5ccc3e1b6b58bc053ab98f SHA512 bc2bcfbfc6d1d39ae3ed0f409e9708c9ef7fe01c83d4941f68f3afd4936c014b143a82c65c4d59714c24d85c8dde4338de426ad3b48d68fb4077d0d08382a33c -DIST spvgen-6b84106b7e107173428647850b4ba93a75b23d84.tar.gz 19676 BLAKE2B 93560bdb1810685d36e1f9d42e95b5b7b4c5c22740c46178be5c05d6d5055000b1c01a71403f89d2091339e13ab2083ad02f24e7a3c687794eb34f1e1c557a78 SHA512 01f2012bb5c894e0ae4f267d903b835f5197699ce00a55b249f7525146da036dee1ac195df6d4e3f67e9e222b826458595e4d1fb2c8f9b2c05749bf2c98d1136 DIST spvgen-fb798cb760a436e9496dbaab8827e4d183b74744.tar.gz 19475 BLAKE2B ace1afe0f9b129fdf3079341a09f0e761b1604a415412a3ea33325e770cecb62e67945a5d83b3248a29222b2dca86ad63c4c7d89e250851edc37d22543e75f20 SHA512 2c4f72518e6f1fbefebfe51d6e7d14187bad99b036b26f131ed726d0525244b33017549f5a56a4f7770239eaa411ff93561be53072458c6f491452ae496ee156 DIST xgl-86f61a31988a626371131a1633547b0d0ebfcfcb.tar.gz 818497 BLAKE2B 17973a57d15c96568107f6b27096f275a59405c97465f7788876282d1082e1d30f20a48b8a2c83553ec5ff0a7ba36c8a89885596386a8788192ed4a476035554 SHA512 028336666bc83a9df29b090852cfd1781a4dca70b477d8ddeb29e2347f01ff50c457f2da3ea9ad8880e6223451543cd8d695bd99108e2240b63e3b176a120536 -DIST xgl-88a4f8c5657824f93790eefe3c9e078806c2a768.tar.gz 804535 BLAKE2B 6cf6db041857f3f32cd35766611871c739b0b7c6eed8c05c63e54c9cd210cce05f9e9dc4f5fe9bbdf028de3336f525b886afe8df39f215a78dff15412448309b SHA512 c37846c53850a4c5c5c7021e837f9dcc6bac94dca49a9eaa48663ada8e32de02aebaab3cbca7d99c1d38f39c9f7d2eadcb52fa52a12de8310b7e3e3bbd591211 DIST xgl-fc11e79aab63337702d8efc05e5433dec9efdf06.tar.gz 810567 BLAKE2B 452a9264df787d42f18618e8d49cad9fb79f4a6ece505d238f5a09652505886555db892c8c6f4f6139c28cf7db6efc387330f101e32c1262f00fc5c6e1c17e74 SHA512 db50fcdac279eb17b977f47ca66397c7194d021dd4db9b4e34e4a0eccb6fdbda5222a57c306ac8fba8eec2986703596a5cb1b2130d8a1bcf81c30f69be0f2808 diff --git a/media-libs/amdvlk/amdvlk-2021.1.2.ebuild b/media-libs/amdvlk/amdvlk-2021.4.2.ebuild similarity index 71% rename from media-libs/amdvlk/amdvlk-2021.1.2.ebuild rename to media-libs/amdvlk/amdvlk-2021.4.2.ebuild index eca5dccd5..a4b9ef85d 100644 --- a/media-libs/amdvlk/amdvlk-2021.1.2.ebuild +++ b/media-libs/amdvlk/amdvlk-2021.4.2.ebuild @@ -1,37 +1,35 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) -CMAKE_ECLASS=cmake inherit cmake-multilib check-reqs -#inherit cmake-multilib and cmake-utils build doesn't support https://github.com/GPUOpen-Drivers/AMDVLK/issues/151 DESCRIPTION="AMD Open Source Driver for Vulkan" HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"; LICENSE="MIT" SLOT="0" -KEYWORDS="" +KEYWORDS="" # Package is broken: https://github.com/GPUOpen-Drivers/llpc/issues/1594 IUSE="debug wayland" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" ###DEPENDS BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - ${BUNDLED_LLVM_DEPEND} - >=dev-util/vulkan-headers-1.2.162" + ${BUNDLED_LLVM_DEPEND}" BDEPEND="${BUNDLED_LLVM_DEPEND} dev-util/cmake" RDEPEND=" ${DEPEND} + dev-util/vulkan-headers x11-libs/libdrm[${MULTILIB_USEDEP}] x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libxcb[${MULTILIB_USEDEP}] x11-libs/libxshmfence[${MULTILIB_USEDEP}] - >=media-libs/vulkan-loader-1.2.162[${MULTILIB_USEDEP}]" + media-libs/vulkan-loader[${MULTILIB_USEDEP}]" -CHECKREQS_MEMORY="4G" -CHECKREQS_DISK_BUILD="2G" +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="4G" S="${WORKDIR}" CMAKE_USE_DIR="${S}/xgl" @@ -40,24 +38,24 @@ FETCH_URI="https://github.com/GPUOpen-Drivers"; CORRECT_AMDVLK_PV="v-$(ver_rs 1 '.Q')" #Works only for amdvlk source code: transforming version 2019.2.2 to v-2019.Q2.2. Any other commits should be updated manually ##For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/master/default.xml ##and place commits in the desired variables -## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07" +## PSEUDOEXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07" ## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..." -XGL_COMMIT="88a4f8c5657824f93790eefe3c9e078806c2a768" -PAL_COMMIT="57cd977c79e4321c28dcb1a18a4aa23880aa48f4" -LLPC_COMMIT="86ed348f405120042a2540ec3157e28baf45dc81" -SPVGEN_COMMIT="6b84106b7e107173428647850b4ba93a75b23d84" -LLVM_PROJECT_COMMIT="1551e626ea6b19f81928d2e4eddab657eb82af9b" +XGL_COMMIT="da1a583a51c69c115f9144b68ec2bdf5b6519056" +PAL_COMMIT="61409c1cea19a2ca5ad00461b1e75b3ab46c4389" +LLPC_COMMIT="80b124752f5f689b21d46a3fd459b2df659de187" +SPVGEN_COMMIT="0aa19873514a8272dfdc5cb8861859a52f5de503" +LLVM_PROJECT_COMMIT="63581e1504f3854df7d1ea7aab6af935da1b515d" METROHASH_COMMIT="3c566dd9cda44ca7fd97659e0b53ac953f9037d2" -CWPACK_COMMIT="7387247eb9889ddcabbc1053b9c2052e253b088e" +CWPACK_COMMIT="39f8940199e60c44d4211cf8165dfd12876316fa" ## SRC_URI SRC_URI=" ${FETCH_URI}/AMDVLK/archive/${CORRECT_AMDVLK_PV}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}.tar.gz -${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> xgl-${XGL_COMMIT}.tar.gz -${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> pal-${PAL_COMMIT}.tar.gz -${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> llpc-${LLPC_COMMIT}.tar.gz -${FETCH_URI}/spvgen/archive/${SPVGEN_COMMIT}.tar.gz -> spvgen-${SPVGEN_COMMIT}.tar.gz -${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz -${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> MetroHash-${METROHASH_COMMIT}.tar.gz -${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> CWPack-${CWPACK_COMMIT}.tar.gz" +${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-xgl-${XGL_COMMIT}.tar.gz +${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-pal-${PAL_COMMIT}.tar.gz +${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-llpc-${LLPC_COMMIT}.tar.gz +${FETCH_URI}/spvgen/archive/${SPVGEN_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-spvgen-${SPVGEN_COMMIT}.tar.gz +${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz +${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-MetroHash-${METROHASH_COMMIT}.tar.gz +${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-CWPack-${CWPACK_COMMIT}.tar.gz" ###EBUILD FUNCTIONS src_prepare() {
