Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/amdvlk/
Date: Thu, 24 Dec 2020 10:30:18
Message-Id: 1608724921.6f92fd911f30ea7f7206209fa4ee44bd16f9da9a.andrewammerlaan@gentoo
1 commit: 6f92fd911f30ea7f7206209fa4ee44bd16f9da9a
2 Author: Denis Reva <denis7774 <AT> gmail <DOT> com>
3 AuthorDate: Wed Dec 23 12:01:51 2020 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Wed Dec 23 12:02:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6f92fd91
7
8 media-libs/amdvlk: new version 2020.4.6
9
10 2020-12-14 update. Upstream changes:
11
12 New feature and improvement
13 Update Vulkan API version to 1.2.162
14 Performance tuning for Shadow of the Tomb Raider on Navi21
15 Enable extension VK_EXT_shader_terminate_invocation
16 Enable extension VK_KHR_fragment_shading_rate
17
18 Package-Manager: Portage-3.0.9, Repoman-3.0.2
19 Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>
20
21 media-libs/amdvlk/Manifest | 5 ++
22 media-libs/amdvlk/amdvlk-2020.4.6.ebuild | 113 +++++++++++++++++++++++++++++++
23 2 files changed, 118 insertions(+)
24
25 diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
26 index 26ae47c1..24db624c 100644
27 --- a/media-libs/amdvlk/Manifest
28 +++ b/media-libs/amdvlk/Manifest
29 @@ -1,8 +1,13 @@
30 DIST AMDVLK-v-2020.Q4.5.tar.gz 32258 BLAKE2B e2acdbb87c0a53b45cbbceeda0b7a6432db5713891dc35d9c3c3932e20799fe0ab219de9f2d042ebd403c1904c5a1b0bdf23f8d1a033b7c6d7a17e7c65132373 SHA512 98158c82c08657d130d462f1e5e70f6c77749eb0f139c3b392984c1b44eed0828aab71c580747799a734fa0d581720c5b70779c4c5f5bd3dc269b128df95cec8
31 +DIST AMDVLK-v-2020.Q4.6.tar.gz 32275 BLAKE2B f7bb0e5df49df9fe5d0a2f5bb169a2fdec7c36548f53c5bd23702465373a754aa43659a2fc7c4b57882ffe64be4438911dcda3766cba26d5a9c08a4e5816e66f SHA512 be8b28ef15e9e7941c97296342393a645095617b96f189939be3885f1e430d7ee683868ec0b1aa6c9642f2572aa066f638b3f770bc425dcb5b284dbf655b32f3
32 DIST CWPack-7387247eb9889ddcabbc1053b9c2052e253b088e.tar.gz 24538 BLAKE2B 76c4da32ea06df355f7e8f77a14c185b2ccab2ce2762988f04a04d65b674e089d4fc27206e744f89b4bd84c9d7226d324414a31941303290e7f574e9d64756cf SHA512 38378ef325e42a7356511c2fc06b6c896581968079e85c4b924a1768d895feecaf1eb8fd65afb59bed0f66e0547104d67c2deb9f82a86f4b9fa65b36e57cd47d
33 DIST MetroHash-3c566dd9cda44ca7fd97659e0b53ac953f9037d2.tar.gz 11804 BLAKE2B 683ca8a9e4b93a945dc455c5cb78a2c6dd9dbdf22432ea9f447a6d2d1b05399cc57b621d1e304dc5695ab936a212a2df110e47ec9141764f4eaa2b184a01f4ba SHA512 ae4fcf09a097ceddfcc9f0b721cae0018fff8a0360d8fbbb195d2a8c2809cf8f3c01090ba8129593d89fe1c041224e42a49e7a1c66f20e60958a5373f6d9027f
34 DIST llpc-38dcb76aadf729b67cabe15c2cc07a784020f704.tar.gz 2079177 BLAKE2B eb3f594b195af82faeeb9e9f5d73cc294d8178d7390183c083b4231f17a8382f0e72480f3e883b7d3e3b1f7a654974efd4d2dec1c60f6d9ae019696f467f296a SHA512 599ea375fc87621d0085bc9a1d68f00bbde42408c1b9f745ea7da8658c041cdc24722b763e53981a2ad844efa042348be7df939cee4459503ab66d462403ce32
35 +DIST llpc-e2d38b0c8042efbc435e51696aba5c1abd256c88.tar.gz 2091062 BLAKE2B 64dbba4f1a9c1739e56015b149143ece3795022f81eb28cb05930a1b86e505789d474ab5e6483e9700f3dba07d30a21591417564e630b2fc0e4827ab7f61a0e3 SHA512 04c3f12e6c89cae9b44703bca545e824e9f6ccb6bd88d3be80efe5edc29956fa3b8368bf79f026a691f916567f12643cf7f38a09265db656457d34600a7fe6e6
36 DIST llvm-project-7ff363c8283c1d41ecbdcdc45c8b724b52312d67.tar.gz 128585110 BLAKE2B 2902b68f08f6a978a08061a145e93d0cbea57e4c47431b0249a06ae986e739d9fbb749b2e59996abcc25834cff59ab2dc837debc7acc7ee12c3ec488cb300cab SHA512 b8e4a6858f1c4ffb26206e545095e64641fef4cee47188d5481d14780f6b8276f70b5c485da1fc26025ee42b6b984c2901caf85ade1599f1a6aa73e0ab190087
37 +DIST llvm-project-a0777f49050191c9e215a4880c855395ba805508.tar.gz 129045563 BLAKE2B 1234834158b43c7609037cf8eadbc2564dd432eae476f6993383c48164dc4718f450616c35fbddd451a01382ad633c2980c81d27c57b1275dd72a7afc22fe437 SHA512 952843621edfa2f60c08f4c934091acfaed50463f59c24e18821a0023f383840a7346d250e56d1df3ac40fb573957357d4f61f155a2e747508b3748ceaa4df25
38 DIST pal-b1e752d402592628f61eb7e1aa2a802a205de798.tar.gz 8029839 BLAKE2B 776b85c0d5780a3b6a5a50d04609a20f1552a0afa0caff090013c2506bc9f97592b42f69941ac29697f3dced45e4619ca8be918e1b68fabd5c651893ba689d35 SHA512 5d98bcf1631d70620bb56a380c7b510f6f517d48e1cc0b2f7007687b929fc36af69d7478984756bf84e2f7e6934034c10f7bfce24b83df812de93e3a6b9b9faa
39 +DIST pal-f92844ecbba39be3d2663717ad69c3dffc282211.tar.gz 8049042 BLAKE2B a11b40deb3d9645b88861f9bb3ed198fab07baace72ee5c9566601d71b0cda94178161ea59d4ba09384b3c9f88fb40a956243aacbc5ccc3e1b6b58bc053ab98f SHA512 bc2bcfbfc6d1d39ae3ed0f409e9708c9ef7fe01c83d4941f68f3afd4936c014b143a82c65c4d59714c24d85c8dde4338de426ad3b48d68fb4077d0d08382a33c
40 DIST spvgen-fb798cb760a436e9496dbaab8827e4d183b74744.tar.gz 19475 BLAKE2B ace1afe0f9b129fdf3079341a09f0e761b1604a415412a3ea33325e770cecb62e67945a5d83b3248a29222b2dca86ad63c4c7d89e250851edc37d22543e75f20 SHA512 2c4f72518e6f1fbefebfe51d6e7d14187bad99b036b26f131ed726d0525244b33017549f5a56a4f7770239eaa411ff93561be53072458c6f491452ae496ee156
41 +DIST xgl-86f61a31988a626371131a1633547b0d0ebfcfcb.tar.gz 818497 BLAKE2B 17973a57d15c96568107f6b27096f275a59405c97465f7788876282d1082e1d30f20a48b8a2c83553ec5ff0a7ba36c8a89885596386a8788192ed4a476035554 SHA512 028336666bc83a9df29b090852cfd1781a4dca70b477d8ddeb29e2347f01ff50c457f2da3ea9ad8880e6223451543cd8d695bd99108e2240b63e3b176a120536
42 DIST xgl-fc11e79aab63337702d8efc05e5433dec9efdf06.tar.gz 810567 BLAKE2B 452a9264df787d42f18618e8d49cad9fb79f4a6ece505d238f5a09652505886555db892c8c6f4f6139c28cf7db6efc387330f101e32c1262f00fc5c6e1c17e74 SHA512 db50fcdac279eb17b977f47ca66397c7194d021dd4db9b4e34e4a0eccb6fdbda5222a57c306ac8fba8eec2986703596a5cb1b2130d8a1bcf81c30f69be0f2808
43
44 diff --git a/media-libs/amdvlk/amdvlk-2020.4.6.ebuild b/media-libs/amdvlk/amdvlk-2020.4.6.ebuild
45 new file mode 100644
46 index 00000000..f8984567
47 --- /dev/null
48 +++ b/media-libs/amdvlk/amdvlk-2020.4.6.ebuild
49 @@ -0,0 +1,113 @@
50 +# Copyright 1999-2020 Gentoo Authors
51 +# Distributed under the terms of the GNU General Public License v2
52 +
53 +EAPI=7
54 +
55 +MULTILIB_COMPAT=( abi_x86_{32,64} )
56 +
57 +inherit multilib-minimal check-reqs
58 +
59 +#inherit cmake-multilib and cmake-utils build doesn't support https://github.com/GPUOpen-Drivers/AMDVLK/issues/151
60 +DESCRIPTION="AMD Open Source Driver for Vulkan"
61 +HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
62 +LICENSE="MIT"
63 +SLOT="0"
64 +KEYWORDS="~amd64 ~x86"
65 +IUSE="debug wayland"
66 +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
67 +###DEPENDS
68 +BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
69 +DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
70 + ${BUNDLED_LLVM_DEPEND}
71 + >=dev-util/vulkan-headers-1.2.162"
72 +BDEPEND="${BUNDLED_LLVM_DEPEND}
73 + dev-util/cmake"
74 +RDEPEND=" ${DEPEND}
75 + x11-libs/libdrm[${MULTILIB_USEDEP}]
76 + x11-libs/libXrandr[${MULTILIB_USEDEP}]
77 + x11-libs/libxcb[${MULTILIB_USEDEP}]
78 + x11-libs/libxshmfence[${MULTILIB_USEDEP}]
79 + >=media-libs/vulkan-loader-1.2.162[${MULTILIB_USEDEP}]"
80 +
81 +CHECKREQS_MEMORY="4G"
82 +CHECKREQS_DISK_BUILD="2G"
83 +S="${WORKDIR}"
84 +CMAKE_USE_DIR="${S}/xgl"
85 +
86 +###SOURCE CODE VARIABLES
87 +FETCH_URI="https://github.com/GPUOpen-Drivers"
88 +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
89 +##For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/master/default.xml
90 +##and place commits in the desired variables
91 +## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
92 +## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
93 +XGL_COMMIT="86f61a31988a626371131a1633547b0d0ebfcfcb"
94 +PAL_COMMIT="f92844ecbba39be3d2663717ad69c3dffc282211"
95 +LLPC_COMMIT="e2d38b0c8042efbc435e51696aba5c1abd256c88"
96 +SPVGEN_COMMIT="fb798cb760a436e9496dbaab8827e4d183b74744"
97 +LLVM_PROJECT_COMMIT="a0777f49050191c9e215a4880c855395ba805508"
98 +METROHASH_COMMIT="3c566dd9cda44ca7fd97659e0b53ac953f9037d2"
99 +CWPACK_COMMIT="7387247eb9889ddcabbc1053b9c2052e253b088e"
100 +## SRC_URI
101 +SRC_URI=" ${FETCH_URI}/AMDVLK/archive/${CORRECT_AMDVLK_PV}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}.tar.gz
102 +${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> xgl-${XGL_COMMIT}.tar.gz
103 +${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> pal-${PAL_COMMIT}.tar.gz
104 +${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> llpc-${LLPC_COMMIT}.tar.gz
105 +${FETCH_URI}/spvgen/archive/${SPVGEN_COMMIT}.tar.gz -> spvgen-${SPVGEN_COMMIT}.tar.gz
106 +${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
107 +${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> MetroHash-${METROHASH_COMMIT}.tar.gz
108 +${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> CWPack-${CWPACK_COMMIT}.tar.gz"
109 +
110 +###EBUILD FUNCTIONS
111 +src_prepare() {
112 + ##moving src to proper directories
113 + mkdir -p "${S}"
114 + mkdir -p "${S}/third_party"
115 + mv AMDVLK-${CORRECT_AMDVLK_PV}/ "${S}/AMDVLK"
116 + mv xgl-${XGL_COMMIT}/ "${S}/xgl"
117 + mv pal-${PAL_COMMIT}/ "${S}/pal"
118 + mv llpc-${LLPC_COMMIT}/ "${S}/llpc"
119 + mv spvgen-${SPVGEN_COMMIT}/ "${S}/spvgen"
120 + mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project"
121 + mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash"
122 + mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack"
123 + cd "${S}/xgl"
124 + default
125 +}
126 +
127 +multilib_src_configure() {
128 + local mycmakeargs=(
129 + -DBUILD_WAYLAND_SUPPORT=$(usex wayland )
130 + -DCMAKE_BUILD_TYPE="$(usex debug "Debug" "Release")"
131 + -B"${BUILD_DIR}" )
132 + cd "${S}"/xgl
133 + cmake -H. "${mycmakeargs[@]}"
134 +}
135 +
136 +multilib_src_install() {
137 + if use abi_x86_64 && multilib_is_native_abi; then
138 + mkdir -p "${D}/usr/lib64/"
139 + mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"
140 + insinto /usr/share/vulkan/icd.d
141 + doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"
142 + else
143 + mkdir -p "${D}/usr/lib/"
144 + mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"
145 + insinto /usr/share/vulkan/icd.d
146 + doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"
147 + fi
148 +}
149 +
150 +pkg_postinst() {
151 + elog "More information about the configuration can be found here:"
152 + elog " https://github.com/GPUOpen-Drivers/AMDVLK"
153 + ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
154 + ewarn "| Driver \"modesetting\""
155 + ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
156 + ewarn "Else AMDVLK breaks things"
157 + ewarn "With some games AMDVLK is still not stable. Use it at you own risk"
158 + elog "You may want to disable default vulkan mesa provider in package.use \"media-libs/mesa -vulkan\""
159 + elog "or perform export in /etc/env.d/ variable VK_ICD_FILENAMES=vulkanprovidername:vulkanprovidername2 "
160 + elog "exampe| VK_ICD_FILENAMES=\"/usr/share/vulkan/icd.d/amd_icd64.json:/usr/share/vulkan/icd.d/amd_icd64.json\""
161 + elog "For DXVK: use DXVK_FILTER_DEVICE_NAME= variable"
162 +}