Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/
Date: Wed, 21 Sep 2022 19:44:06
Message-Id: 1663583127.9b98861fd042989de5f76e21561a96e76039c62c.flow@gentoo
1 commit: 9b98861fd042989de5f76e21561a96e76039c62c
2 Author: Denis Reva <denis7774 <AT> gmail <DOT> com>
3 AuthorDate: Mon Sep 19 10:25:01 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 19 10:25:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9b98861f
7
8 media-libs/amdvlk: Version from gentoo bug
9
10 Bug: https://bugs.gentoo.org/665590
11 Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>
12
13 media-libs/amdvlk/Manifest | 8 ++
14 media-libs/amdvlk/amdvlk-2022.3.1.ebuild | 121 +++++++++++++++++++++++++++++++
15 2 files changed, 129 insertions(+)
16
17 diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
18 index e329dd756..4aca432ad 100644
19 --- a/media-libs/amdvlk/Manifest
20 +++ b/media-libs/amdvlk/Manifest
21 @@ -8,14 +8,22 @@ DIST AMDVLK-v-2021.Q4.2-pal-61409c1cea19a2ca5ad00461b1e75b3ab46c4389.tar.gz 8773
22 DIST AMDVLK-v-2021.Q4.2-spvgen-0aa19873514a8272dfdc5cb8861859a52f5de503.tar.gz 20466 BLAKE2B 7cce36d8f5a6952b4eb49a5c7bc7b5e5ffac268d6ba6e852f5a959004f5626d27f06db6ae3d318a12ca164406d042db09df610f09e664de358aadf3e20b6d604 SHA512 1cc221f8665ed35b4ea867ee0b1059f81d9b7009b847e4795d10817f2e357330b07e254118f73392f4bf6ee74e9b61f8961719564203cf43ee9917006aa0b802
23 DIST AMDVLK-v-2021.Q4.2-xgl-da1a583a51c69c115f9144b68ec2bdf5b6519056.tar.gz 960709 BLAKE2B 825e7d349da18e8a0beb42c4125bb208bd2e62780d97d5131e76e9ddc08dc6d60b2d78455aa245bb4172bb7ee7d64084307e48df2c18598cee638911fce8074c SHA512 a626459503b50a511ac04f4973036468336e9d55baecda5a84165f7209d867291ef35a9292734f38a53d13aaf70cd46fc8e3068fc3748d80278fcf3c5f8a54bb
24 DIST AMDVLK-v-2021.Q4.2.tar.gz 30012 BLAKE2B 27d11126d54df299ce702adb7c66bd0aa8a905074dac0e2cd8560f2fa9c39deafd16885c15ae9df4f70f4008a446d8e90e1dcc50514afa7ab0a874d12b2e5334 SHA512 15fb89bb78039c36435fb9534588f08e0e0e6e6099d5e803e9bacafef8b5e81eedc19e0fcc7cd7ca7dad919397cab8b87b30b22950ae32945a5465da542d6d99
25 +DIST AMDVLK-v-2022.Q3.1.tar.gz 30017 BLAKE2B 4abbdb709d6d61331185f7cef3e78228a9a7ad633ddf96e4ca18870fb9f7b04c1dd393864d6f85e349c56d20bffded81d95556f6625d7a8be7dc2ef6ed78de10 SHA512 e8a1662e14861fbb90ca4bad3dcff15932ce0e43b27e2fc0bfefd5f7eff359e1c46acedb6e168583646237e030da6948ef8640fe6b4ff1693f9a7ba16f1081a4
26 +DIST CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
27 DIST CWPack-7387247eb9889ddcabbc1053b9c2052e253b088e.tar.gz 24538 BLAKE2B 76c4da32ea06df355f7e8f77a14c185b2ccab2ce2762988f04a04d65b674e089d4fc27206e744f89b4bd84c9d7226d324414a31941303290e7f574e9d64756cf SHA512 38378ef325e42a7356511c2fc06b6c896581968079e85c4b924a1768d895feecaf1eb8fd65afb59bed0f66e0547104d67c2deb9f82a86f4b9fa65b36e57cd47d
28 +DIST MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
29 DIST MetroHash-3c566dd9cda44ca7fd97659e0b53ac953f9037d2.tar.gz 11804 BLAKE2B 683ca8a9e4b93a945dc455c5cb78a2c6dd9dbdf22432ea9f447a6d2d1b05399cc57b621d1e304dc5695ab936a212a2df110e47ec9141764f4eaa2b184a01f4ba SHA512 ae4fcf09a097ceddfcc9f0b721cae0018fff8a0360d8fbbb195d2a8c2809cf8f3c01090ba8129593d89fe1c041224e42a49e7a1c66f20e60958a5373f6d9027f
30 DIST llpc-38dcb76aadf729b67cabe15c2cc07a784020f704.tar.gz 2079177 BLAKE2B eb3f594b195af82faeeb9e9f5d73cc294d8178d7390183c083b4231f17a8382f0e72480f3e883b7d3e3b1f7a654974efd4d2dec1c60f6d9ae019696f467f296a SHA512 599ea375fc87621d0085bc9a1d68f00bbde42408c1b9f745ea7da8658c041cdc24722b763e53981a2ad844efa042348be7df939cee4459503ab66d462403ce32
31 +DIST llpc-d4763a9dcab538955bc5ad4b5c6e0139d8fe8949.tar.gz 2344266 BLAKE2B 30243cef585f77a9a7edaa162696926c5f4ee0c9612e0339b2e28d06968f57760f3ab31ddfd028bab8d0f4c78e3e46cc23a1139b244f21860af067c3a363e2af SHA512 51e17e92ab6ed9ba10d974326f9c25cd9bb994a305c781851c48cca48a868eb5977f5b733f5bd57ee22863a93a695fab2a527badf9eb46b7e16c284bdfa98b3d
32 DIST llpc-e2d38b0c8042efbc435e51696aba5c1abd256c88.tar.gz 2091062 BLAKE2B 64dbba4f1a9c1739e56015b149143ece3795022f81eb28cb05930a1b86e505789d474ab5e6483e9700f3dba07d30a21591417564e630b2fc0e4827ab7f61a0e3 SHA512 04c3f12e6c89cae9b44703bca545e824e9f6ccb6bd88d3be80efe5edc29956fa3b8368bf79f026a691f916567f12643cf7f38a09265db656457d34600a7fe6e6
33 +DIST llvm-project-48f1931b2b7afd7e0800fa084b7c0c2176dabfd4.tar.gz 165520733 BLAKE2B a1cdcbf9fef341e50b640fd27f0c3c86b926df4fd165615a6c35462bb61cf42d5c559fde0d92569cf697e7346de9f080db479e85c27ead331a8cd2fe5d61b99f SHA512 92d68c73ef7bdec96fc1eff351019b95791240d3c7d1862888fa7f584106453dccdfe243d053e09128717cd1b0257956b4cdedb1fc53525f7bdbb88091e26ea9
34 DIST llvm-project-7ff363c8283c1d41ecbdcdc45c8b724b52312d67.tar.gz 128585110 BLAKE2B 2902b68f08f6a978a08061a145e93d0cbea57e4c47431b0249a06ae986e739d9fbb749b2e59996abcc25834cff59ab2dc837debc7acc7ee12c3ec488cb300cab SHA512 b8e4a6858f1c4ffb26206e545095e64641fef4cee47188d5481d14780f6b8276f70b5c485da1fc26025ee42b6b984c2901caf85ade1599f1a6aa73e0ab190087
35 DIST llvm-project-a0777f49050191c9e215a4880c855395ba805508.tar.gz 129045563 BLAKE2B 1234834158b43c7609037cf8eadbc2564dd432eae476f6993383c48164dc4718f450616c35fbddd451a01382ad633c2980c81d27c57b1275dd72a7afc22fe437 SHA512 952843621edfa2f60c08f4c934091acfaed50463f59c24e18821a0023f383840a7346d250e56d1df3ac40fb573957357d4f61f155a2e747508b3748ceaa4df25
36 +DIST pal-8a99ffaa533ee561af7075d413f6052ea37a1a04.tar.gz 9107352 BLAKE2B eef5aa21f9fa2b121362848f0ca21e7c0ac8455a75502d9b8e6eb0d608ea1a39c843f5a0af9e3726264f8abe98b03027de7d87a82fe5550ccad7366c3fbf8aa7 SHA512 edb9fba33ca8a75d9f9cc5e89ed36c9f4a7914dc8e04564e7bad12113faa2bbd773fc94a2f9d34dc52ff22f5595f0b30c59408f869a654aa819bee97720c71d8
37 DIST pal-b1e752d402592628f61eb7e1aa2a802a205de798.tar.gz 8029839 BLAKE2B 776b85c0d5780a3b6a5a50d04609a20f1552a0afa0caff090013c2506bc9f97592b42f69941ac29697f3dced45e4619ca8be918e1b68fabd5c651893ba689d35 SHA512 5d98bcf1631d70620bb56a380c7b510f6f517d48e1cc0b2f7007687b929fc36af69d7478984756bf84e2f7e6934034c10f7bfce24b83df812de93e3a6b9b9faa
38 DIST pal-f92844ecbba39be3d2663717ad69c3dffc282211.tar.gz 8049042 BLAKE2B a11b40deb3d9645b88861f9bb3ed198fab07baace72ee5c9566601d71b0cda94178161ea59d4ba09384b3c9f88fb40a956243aacbc5ccc3e1b6b58bc053ab98f SHA512 bc2bcfbfc6d1d39ae3ed0f409e9708c9ef7fe01c83d4941f68f3afd4936c014b143a82c65c4d59714c24d85c8dde4338de426ad3b48d68fb4077d0d08382a33c
39 +DIST spvgen-3b61d0ce836d3832e19931be198f6f619206de4c.tar.gz 19986 BLAKE2B 3719d480dcc7a9751fd6ed7d0cf50a206eafac5ce53159758f7363ce13571daa2d95b4c61c2ba04b5d2520824f392f735abe9237b19bfd0d3ab204a01af9e149 SHA512 b3d5c71a0d801f21864fdd8b558adfc6ef048c0fc7368586d956112e6ed11779e09a583c4c8cb4593e3242043ee15230b122711e8abe837a9032dc88d1f6e353
40 DIST spvgen-fb798cb760a436e9496dbaab8827e4d183b74744.tar.gz 19475 BLAKE2B ace1afe0f9b129fdf3079341a09f0e761b1604a415412a3ea33325e770cecb62e67945a5d83b3248a29222b2dca86ad63c4c7d89e250851edc37d22543e75f20 SHA512 2c4f72518e6f1fbefebfe51d6e7d14187bad99b036b26f131ed726d0525244b33017549f5a56a4f7770239eaa411ff93561be53072458c6f491452ae496ee156
41 +DIST xgl-394cbffcf388482354c7874a841a30d386d9abc8.tar.gz 1082157 BLAKE2B 956cf15de7a9027d954afa4ce43e7e68ec1cfae0bb0ed50250ea7bb73cf5ce2670591bc8963256b481ee08094177057caaaa4fba5350b3b211bc1081822c0e91 SHA512 88d867aa3a958206c3c1416ecde64dd1193f6b232d79e5f4658e9da13c8e2b5ef838ba5c56c79cfad4bfa43caee4abe5bd92b64448958e23ae7e856e54716089
42 DIST xgl-86f61a31988a626371131a1633547b0d0ebfcfcb.tar.gz 818497 BLAKE2B 17973a57d15c96568107f6b27096f275a59405c97465f7788876282d1082e1d30f20a48b8a2c83553ec5ff0a7ba36c8a89885596386a8788192ed4a476035554 SHA512 028336666bc83a9df29b090852cfd1781a4dca70b477d8ddeb29e2347f01ff50c457f2da3ea9ad8880e6223451543cd8d695bd99108e2240b63e3b176a120536
43 DIST xgl-fc11e79aab63337702d8efc05e5433dec9efdf06.tar.gz 810567 BLAKE2B 452a9264df787d42f18618e8d49cad9fb79f4a6ece505d238f5a09652505886555db892c8c6f4f6139c28cf7db6efc387330f101e32c1262f00fc5c6e1c17e74 SHA512 db50fcdac279eb17b977f47ca66397c7194d021dd4db9b4e34e4a0eccb6fdbda5222a57c306ac8fba8eec2986703596a5cb1b2130d8a1bcf81c30f69be0f2808
44
45 diff --git a/media-libs/amdvlk/amdvlk-2022.3.1.ebuild b/media-libs/amdvlk/amdvlk-2022.3.1.ebuild
46 new file mode 100644
47 index 000000000..5af901592
48 --- /dev/null
49 +++ b/media-libs/amdvlk/amdvlk-2022.3.1.ebuild
50 @@ -0,0 +1,121 @@
51 +# Copyright 1999-2022 Gentoo Authors
52 +# Distributed under the terms of the GNU General Public License v2
53 +
54 +EAPI=8
55 +
56 +MULTILIB_COMPAT=( abi_x86_{32,64} )
57 +
58 +inherit multilib-minimal check-reqs
59 +
60 +#inherit cmake-multilib and cmake-utils build doesn't support https://github.com/GPUOpen-Drivers/AMDVLK/issues/151
61 +DESCRIPTION="AMD Open Source Driver for Vulkan"
62 +HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
63 +LICENSE="MIT"
64 +SLOT="0"
65 +KEYWORDS="~amd64 ~x86"
66 +IUSE="debug wayland"
67 +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
68 +###DEPENDS
69 +BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
70 +DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
71 + ${BUNDLED_LLVM_DEPEND}
72 + >=dev-util/vulkan-headers-1.3.210"
73 +BDEPEND="${BUNDLED_LLVM_DEPEND}
74 + dev-util/cmake"
75 +RDEPEND=" ${DEPEND}
76 + x11-libs/libdrm[${MULTILIB_USEDEP}]
77 + x11-libs/libXrandr[${MULTILIB_USEDEP}]
78 + x11-libs/libxcb[${MULTILIB_USEDEP}]
79 + x11-libs/libxshmfence[${MULTILIB_USEDEP}]
80 + >=media-libs/vulkan-loader-1.3.210[${MULTILIB_USEDEP}]"
81 +
82 +CHECKREQS_MEMORY="4G"
83 +CHECKREQS_DISK_BUILD="2G"
84 +S="${WORKDIR}"
85 +CMAKE_USE_DIR="${S}/xgl"
86 +
87 +###SOURCE CODE VARIABLES
88 +FETCH_URI="https://github.com/GPUOpen-Drivers"
89 +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
90 +##For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/master/default.xml
91 +##and place commits in the desired variables
92 +## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
93 +## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
94 +XGL_COMMIT="394cbffcf388482354c7874a841a30d386d9abc8"
95 +PAL_COMMIT="8a99ffaa533ee561af7075d413f6052ea37a1a04"
96 +LLPC_COMMIT="d4763a9dcab538955bc5ad4b5c6e0139d8fe8949"
97 +SPVGEN_COMMIT="3b61d0ce836d3832e19931be198f6f619206de4c"
98 +LLVM_PROJECT_COMMIT="48f1931b2b7afd7e0800fa084b7c0c2176dabfd4"
99 +METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
100 +CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
101 +## SRC_URI
102 +SRC_URI=" ${FETCH_URI}/AMDVLK/archive/${CORRECT_AMDVLK_PV}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}.tar.gz
103 +${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> xgl-${XGL_COMMIT}.tar.gz
104 +${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> pal-${PAL_COMMIT}.tar.gz
105 +${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> llpc-${LLPC_COMMIT}.tar.gz
106 +${FETCH_URI}/spvgen/archive/${SPVGEN_COMMIT}.tar.gz -> spvgen-${SPVGEN_COMMIT}.tar.gz
107 +${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
108 +${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> MetroHash-${METROHASH_COMMIT}.tar.gz
109 +${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> CWPack-${CWPACK_COMMIT}.tar.gz"
110 +
111 +###EBUILD FUNCTIONS
112 +src_prepare() {
113 + ##moving src to proper directories
114 + mkdir -p "${S}"
115 + mkdir -p "${S}/third_party"
116 + mv AMDVLK-${CORRECT_AMDVLK_PV}/ "${S}/AMDVLK"
117 + mv xgl-${XGL_COMMIT}/ "${S}/xgl"
118 + mv pal-${PAL_COMMIT}/ "${S}/pal"
119 + mv llpc-${LLPC_COMMIT}/ "${S}/llpc"
120 + mv spvgen-${SPVGEN_COMMIT}/ "${S}/spvgen"
121 + mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project"
122 + mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash"
123 + mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack"
124 + cd "${S}/xgl"
125 + default
126 +}
127 +
128 +multilib_src_configure() {
129 + local mycmakeargs=(
130 + -DBUILD_WAYLAND_SUPPORT=$(usex wayland )
131 + -DCMAKE_BUILD_TYPE="$(usex debug "Debug" "Release")"
132 + -B"${BUILD_DIR}" )
133 + cd "${S}"/xgl
134 + cmake -H. "${mycmakeargs[@]}"
135 +}
136 +
137 +multilib_src_install() {
138 + if use abi_x86_64 && multilib_is_native_abi; then
139 + mkdir -p "${D}/usr/lib64/"
140 + cp "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"
141 + insinto /usr/share/vulkan/icd.d
142 + doins "${S}/build-abi_x86_64.amd64/icd/amd_icd64.json"
143 + insinto /usr/share/vulkan/implicit_layer.d
144 + doins "${S}/build-abi_x86_64.amd64/icd/amd_icd64.json"
145 + else
146 + mkdir -p "${D}/usr/lib/"
147 + cp "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"
148 + insinto /usr/share/vulkan/icd.d
149 + doins "${S}/build-abi_x86_32.x86/icd/amd_icd32.json"
150 + insinto /usr/share/vulkan/implicit_layer.d
151 + doins "${S}/build-abi_x86_32.x86/icd/amd_icd32.json"
152 + fi
153 +}
154 +
155 +pkg_postinst() {
156 + elog "More information about the configuration can be found here:"
157 + elog " https://github.com/GPUOpen-Drivers/AMDVLK"
158 + ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
159 + ewarn "| Driver \"modesetting\""
160 + ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
161 + ewarn "Else AMDVLK breaks things"
162 + ewarn "With some games AMDVLK is still not stable. Use it at you own risk"
163 + elog "You may want to disable default vulkan mesa provider in package.use \"media-libs/mesa -vulkan\""
164 + elog "or perform export in /etc/env.d/ variable VK_ICD_FILENAMES=vulkanprovidername:vulkanprovidername2 "
165 + elog "exampe| VK_ICD_FILENAMES=\"/usr/share/vulkan/icd.d/amd_icd64.json:/usr/share/vulkan/icd.d/amd_icd64.json\""
166 + elog "For DXVK: use DXVK_FILTER_DEVICE_NAME= variable"
167 + elog ""
168 + elog "You can also use AMD_VULKAN_ICD to switch to the required driver."
169 + elog "AMD_VULKAN_ICD=RADV application - for using radv."
170 + elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
171 +}