[gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/ - gentoo-commits

From:	Denis Reva <denis7774@×××××.com>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/
Date:	Thu, 22 Sep 2022 05:28:32
Message-Id:	`1663824503.53f88efa2406c4a025836264a8f7cb7cd2ee2474.RarogCmex@gentoo`

1

commit:     53f88efa2406c4a025836264a8f7cb7cd2ee2474

2

Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>

3

AuthorDate: Thu Sep 22 05:28:14 2022 +0000

4

Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>

5

CommitDate: Thu Sep 22 05:28:23 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=53f88efa

7

8

media-libs/amdvlk: 2022.3.4 is experimental version, still not ready

9

10

Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>

11

12

 media-libs/amdvlk/Manifest                         |  8 ++

13

 media-libs/amdvlk/amdvlk-2021.4.2.ebuild           | 28 +++----

14

 ...dvlk-2021.4.2.ebuild => amdvlk-2022.3.4.ebuild} | 96 ++++++++++++----------

15

 3 files changed, 73 insertions(+), 59 deletions(-)

16

17

diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest

18

index 4aca432ad..e6a1fe5a9 100644

19

--- a/media-libs/amdvlk/Manifest

20

+++ b/media-libs/amdvlk/Manifest

21

@@ -9,10 +9,18 @@ DIST AMDVLK-v-2021.Q4.2-spvgen-0aa19873514a8272dfdc5cb8861859a52f5de503.tar.gz 2

22

 DIST AMDVLK-v-2021.Q4.2-xgl-da1a583a51c69c115f9144b68ec2bdf5b6519056.tar.gz 960709 BLAKE2B 825e7d349da18e8a0beb42c4125bb208bd2e62780d97d5131e76e9ddc08dc6d60b2d78455aa245bb4172bb7ee7d64084307e48df2c18598cee638911fce8074c SHA512 a626459503b50a511ac04f4973036468336e9d55baecda5a84165f7209d867291ef35a9292734f38a53d13aaf70cd46fc8e3068fc3748d80278fcf3c5f8a54bb

23

 DIST AMDVLK-v-2021.Q4.2.tar.gz 30012 BLAKE2B 27d11126d54df299ce702adb7c66bd0aa8a905074dac0e2cd8560f2fa9c39deafd16885c15ae9df4f70f4008a446d8e90e1dcc50514afa7ab0a874d12b2e5334 SHA512 15fb89bb78039c36435fb9534588f08e0e0e6e6099d5e803e9bacafef8b5e81eedc19e0fcc7cd7ca7dad919397cab8b87b30b22950ae32945a5465da542d6d99

24

 DIST AMDVLK-v-2022.Q3.1.tar.gz 30017 BLAKE2B 4abbdb709d6d61331185f7cef3e78228a9a7ad633ddf96e4ca18870fb9f7b04c1dd393864d6f85e349c56d20bffded81d95556f6625d7a8be7dc2ef6ed78de10 SHA512 e8a1662e14861fbb90ca4bad3dcff15932ce0e43b27e2fc0bfefd5f7eff359e1c46acedb6e168583646237e030da6948ef8640fe6b4ff1693f9a7ba16f1081a4

25

+DIST AMDVLK-v-2022.Q3.4.tar.gz 29752 BLAKE2B a20c33d06034337a1786f0701a5798416e33e008c1b3f49f069f12352647635a62053d40eafe847e8bc0b2917cc59d10fdd843b7283a229725249616c4b15bfc SHA512 cbc161d1ab88cd43fd98b7c73244f53d838935cd7255a97b5fd5b01f02c9c014f763324363f379cc1fd1cf17151955186f01b1209a880aea9e463ef5e7be3916

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 amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc

31

+DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9

32

+DIST amdvlk-gpurt-c1df7354336aba18d54c0e32a95b58eac0d44c07.tar.gz 273130 BLAKE2B ae88ac12ab34f6f9934bb5f151812a5f4a8c055e0f3665754608344fba85c4fc2fd743eb9d770f741ebb4392b364ca8bcd57d43a35ab0710bca52c92c437f46b SHA512 078cc01979c4b8944f6a4196317ab6de7d8aea24df6b7882d258e72fbf85559a2260042eb65e82143e3af41ee154adb5fe54e767b074d46d302d82fa88fa07e4

33

+DIST amdvlk-llpc-58214602f9bc8583795d60c21bf2f122df02d6b5.tar.gz 2444994 BLAKE2B 941ec7e7e4538dfe84ff14382389b20757276105f6d3d1744b55beb6ab5af809a525b77be14087f28797ca5ba623e65d18fe3d6db738c1276ea7559cae6ee9cc SHA512 f27a5cc61121d61cfc58b4e0c28435d678c9dc1e0b9839462ee746ef4089d49aa599ad852b2f5df01746db38589e306fb029e098f4dd60cf74e021362c4243a2

34

+DIST amdvlk-llvm-project-f5023e507645c8178128891b96bf463f9a1a81a0.tar.gz 165884582 BLAKE2B d59d58ef37526690bf691f84915ab8353277c14241d097af82fddb225a37fd664c67711d572d02ab17eb9222e53d000f1e7e73a53db9afeefe65f42a705e3764 SHA512 57a48854b118a8204b06c7bd48417856708353eee36a6bdf0b7b98111a7fd5f6e6650f7a4e81d1646c6c12ba0e26bbb1fbcd2b477e17f16db35054400392b446

35

+DIST amdvlk-pal-9078fd5c95e2afd5331b414c07464efd37e4e0fb.tar.gz 11671512 BLAKE2B 2b796a10869cdb22b31944912866b01dfde49cf97446ab9711f98a6028caf54f7a16c88a173c57c57c5538e29d21a572852cc663b59633abc8f9aaab0e707791 SHA512 aefda31b77afdda11e8e0f8597fb159b5701a7f56f25a5b865185e81238fa45a7426af49ebfad57c0b3ec299cda417bd2a570d04e8c6f8e0d493d7c71a46bbea

36

+DIST amdvlk-xgl-6a26878147ab246a8885ab5b4b8897626870c1cd.tar.gz 1177671 BLAKE2B 30b857230adf2174d6c51367ffb407bd347e3d8299d56e902dddc3129514376b564f48f06f4659ed558f5631d3f4c83d00d3e423f9d7aacd88578511b9c634a8 SHA512 06600624542ca549892fde15286102d8cdcbe0cb9bdba5b83da2ab19c05774b62990d73fae6a29ce623a7ce54d2bf4ab248743cbd3f41ee899bde941b71c5d79

37

 DIST llpc-38dcb76aadf729b67cabe15c2cc07a784020f704.tar.gz 2079177 BLAKE2B eb3f594b195af82faeeb9e9f5d73cc294d8178d7390183c083b4231f17a8382f0e72480f3e883b7d3e3b1f7a654974efd4d2dec1c60f6d9ae019696f467f296a SHA512 599ea375fc87621d0085bc9a1d68f00bbde42408c1b9f745ea7da8658c041cdc24722b763e53981a2ad844efa042348be7df939cee4459503ab66d462403ce32

38

 DIST llpc-d4763a9dcab538955bc5ad4b5c6e0139d8fe8949.tar.gz 2344266 BLAKE2B 30243cef585f77a9a7edaa162696926c5f4ee0c9612e0339b2e28d06968f57760f3ab31ddfd028bab8d0f4c78e3e46cc23a1139b244f21860af067c3a363e2af SHA512 51e17e92ab6ed9ba10d974326f9c25cd9bb994a305c781851c48cca48a868eb5977f5b733f5bd57ee22863a93a695fab2a527badf9eb46b7e16c284bdfa98b3d

39

 DIST llpc-e2d38b0c8042efbc435e51696aba5c1abd256c88.tar.gz 2091062 BLAKE2B 64dbba4f1a9c1739e56015b149143ece3795022f81eb28cb05930a1b86e505789d474ab5e6483e9700f3dba07d30a21591417564e630b2fc0e4827ab7f61a0e3 SHA512 04c3f12e6c89cae9b44703bca545e824e9f6ccb6bd88d3be80efe5edc29956fa3b8368bf79f026a691f916567f12643cf7f38a09265db656457d34600a7fe6e6

40

41

diff --git a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild b/media-libs/amdvlk/amdvlk-2021.4.2.ebuild

42

index a4b9ef85d..29a40e23e 100644

43

--- a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild

44

+++ b/media-libs/amdvlk/amdvlk-2021.4.2.ebuild

45

@@ -81,20 +81,20 @@ multilib_src_configure() {

46

 	cmake_src_configure

47

}

48

49

-multilib_src_install() {

50

-	cmake_src_install

51

-	if use abi_x86_64 && multilib_is_native_abi; then

52

-		mkdir -p "${D}/usr/lib64/"

53

-		mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"

54

-		insinto /usr/share/vulkan/icd.d

55

-		doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"

56

-	else

57

-		mkdir -p "${D}/usr/lib/"

58

-		mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"

59

-		insinto /usr/share/vulkan/icd.d

60

-		doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"

61

-	fi

62

-}

63

+# multilib_src_install() {

64

+# 	cmake_src_install

65

+# 	if use abi_x86_64 && multilib_is_native_abi; then

66

+# 		mkdir -p "${D}/usr/lib64/"

67

+# 		mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"

68

+# 		insinto /usr/share/vulkan/icd.d

69

+# 		doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"

70

+# 	else

71

+# 		mkdir -p "${D}/usr/lib/"

72

+# 		mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"

73

+# 		insinto /usr/share/vulkan/icd.d

74

+# 		doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"

75

+# 	fi

76

+# }

77

78

 pkg_postinst() {

79

 	elog "More information about the configuration can be found here:"

80

81

diff --git a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild b/media-libs/amdvlk/amdvlk-2022.3.4.ebuild

82

similarity index 52%

83

copy from media-libs/amdvlk/amdvlk-2021.4.2.ebuild

84

copy to media-libs/amdvlk/amdvlk-2022.3.4.ebuild

85

index a4b9ef85d..5294089ea 100644

86

--- a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild

87

+++ b/media-libs/amdvlk/amdvlk-2022.3.4.ebuild

88

@@ -1,4 +1,4 @@

89

-# Copyright 1999-2021 Gentoo Authors

90

+# Copyright 1999-2022 Gentoo Authors

91

 # Distributed under the terms of the GNU General Public License v2

92

93

 EAPI=8

94

@@ -11,62 +11,63 @@ DESCRIPTION="AMD Open Source Driver for Vulkan"

95

 HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"

96

 LICENSE="MIT"

97

 SLOT="0"

98

-KEYWORDS="" # Package is broken: https://github.com/GPUOpen-Drivers/llpc/issues/1594

99

-IUSE="debug wayland"

100

+KEYWORDS=""

101

+IUSE="wayland"

102

 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"

103

 ###DEPENDS

104

 BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"

105

 DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )

106

-	${BUNDLED_LLVM_DEPEND}"

107

+	${BUNDLED_LLVM_DEPEND}

108

+	>=dev-util/vulkan-headers-1.3.224"

109

 BDEPEND="${BUNDLED_LLVM_DEPEND}

110

 	dev-util/cmake"

111

 RDEPEND=" ${DEPEND}

112

-	dev-util/vulkan-headers

113

 	x11-libs/libdrm[${MULTILIB_USEDEP}]

114

 	x11-libs/libXrandr[${MULTILIB_USEDEP}]

115

 	x11-libs/libxcb[${MULTILIB_USEDEP}]

116

 	x11-libs/libxshmfence[${MULTILIB_USEDEP}]

117

-	media-libs/vulkan-loader[${MULTILIB_USEDEP}]"

118

+	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]

119

+	dev-util/glslang

120

+	dev-util/DirectXShaderCompiler"

121

122

-CHECKREQS_MEMORY="8G"

123

+CHECKREQS_MEMORY="16G"

124

 CHECKREQS_DISK_BUILD="4G"

125

 S="${WORKDIR}"

126

 CMAKE_USE_DIR="${S}/xgl"

127

128

-###SOURCE CODE VARIABLES

129

+###SOURCE CODE PER_VERSION VARIABLES

130

 FETCH_URI="https://github.com/GPUOpen-Drivers"

131

 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

132

 ##For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/master/default.xml

133

 ##and place commits in the desired variables

134

-## PSEUDOEXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"

135

+## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"

136

 ## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."

137

-XGL_COMMIT="da1a583a51c69c115f9144b68ec2bdf5b6519056"

138

-PAL_COMMIT="61409c1cea19a2ca5ad00461b1e75b3ab46c4389"

139

-LLPC_COMMIT="80b124752f5f689b21d46a3fd459b2df659de187"

140

-SPVGEN_COMMIT="0aa19873514a8272dfdc5cb8861859a52f5de503"

141

-LLVM_PROJECT_COMMIT="63581e1504f3854df7d1ea7aab6af935da1b515d"

142

-METROHASH_COMMIT="3c566dd9cda44ca7fd97659e0b53ac953f9037d2"

143

-CWPACK_COMMIT="39f8940199e60c44d4211cf8165dfd12876316fa"

144

-## SRC_URI

145

+XGL_COMMIT="6a26878147ab246a8885ab5b4b8897626870c1cd"

146

+PAL_COMMIT="9078fd5c95e2afd5331b414c07464efd37e4e0fb"

147

+LLPC_COMMIT="58214602f9bc8583795d60c21bf2f122df02d6b5"

148

+GPURT_COMMIT="c1df7354336aba18d54c0e32a95b58eac0d44c07"

149

+LLVM_PROJECT_COMMIT="f5023e507645c8178128891b96bf463f9a1a81a0"

150

+METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"

151

+CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"

152

+# end

153

 SRC_URI=" ${FETCH_URI}/AMDVLK/archive/${CORRECT_AMDVLK_PV}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}.tar.gz

154

-${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-xgl-${XGL_COMMIT}.tar.gz

155

-${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-pal-${PAL_COMMIT}.tar.gz

156

-${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-llpc-${LLPC_COMMIT}.tar.gz

157

-${FETCH_URI}/spvgen/archive/${SPVGEN_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-spvgen-${SPVGEN_COMMIT}.tar.gz

158

-${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz

159

-${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-MetroHash-${METROHASH_COMMIT}.tar.gz

160

-${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-CWPack-${CWPACK_COMMIT}.tar.gz"

161

+${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz

162

+${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz

163

+${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz

164

+${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz

165

+${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz

166

+${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz

167

+${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz"

168

169

-###EBUILD FUNCTIONS

170

 src_prepare() {

171

-	##moving src to proper directories

172

+	einfo "moving src to proper directories"

173

 	mkdir -p "${S}"

174

 	mkdir -p "${S}/third_party"

175

 	mv AMDVLK-${CORRECT_AMDVLK_PV}/ "${S}/AMDVLK"

176

 	mv xgl-${XGL_COMMIT}/ "${S}/xgl"

177

 	mv pal-${PAL_COMMIT}/ "${S}/pal"

178

 	mv llpc-${LLPC_COMMIT}/ "${S}/llpc"

179

-	mv spvgen-${SPVGEN_COMMIT}/ "${S}/spvgen"

180

+	mv gpurt-${GPURT_COMMIT}/ "${S}/gpurt"

181

 	mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project"

182

 	mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash"

183

 	mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack"

184

@@ -75,32 +76,33 @@ src_prepare() {

185

186

 multilib_src_configure() {

187

 	local mycmakeargs=(

188

-			-DBUILD_WAYLAND_SUPPORT=$(usex wayland )

189

+			-DBUILD_WAYLAND_SUPPORT=$(usex wayland)

190

)

191

-	CMAKE_BUILD_TYPE=$(usex debug "Debug" "Release")

192

 	cmake_src_configure

193

}

194

-

195

-multilib_src_install() {

196

-	cmake_src_install

197

-	if use abi_x86_64 && multilib_is_native_abi; then

198

-		mkdir -p "${D}/usr/lib64/"

199

-		mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"

200

-		insinto /usr/share/vulkan/icd.d

201

-		doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"

202

-	else

203

-		mkdir -p "${D}/usr/lib/"

204

-		mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"

205

-		insinto /usr/share/vulkan/icd.d

206

-		doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"

207

-	fi

208

-}

209

+# multilib_src_install() {

210

+# 	if use abi_x86_64 && multilib_is_native_abi; then

211

+# 		mkdir -p "${D}/usr/lib64/"

212

+# 		cp "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"

213

+# 		insinto /usr/share/vulkan/icd.d

214

+# 		doins "${S}/build-abi_x86_64.amd64/icd/amd_icd64.json"

215

+# 		insinto /usr/share/vulkan/implicit_layer.d

216

+# 		doins "${S}/build-abi_x86_64.amd64/icd/amd_icd64.json"

217

+# 	else

218

+# 		mkdir -p "${D}/usr/lib/"

219

+# 		cp "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"

220

+# 		insinto /usr/share/vulkan/icd.d

221

+# 		doins "${S}/build-abi_x86_32.x86/icd/amd_icd32.json"

222

+# 		insinto /usr/share/vulkan/implicit_layer.d

223

+# 		doins "${S}/build-abi_x86_32.x86/icd/amd_icd32.json"

224

+# 	fi

225

+# }

226

227

 pkg_postinst() {

228

 	elog "More information about the configuration can be found here:"

229

 	elog " https://github.com/GPUOpen-Drivers/AMDVLK"

230

 	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"

231

-	ewarn "| Driver      \"modesetting\""

232

+	ewarn "| Driver	  \"modesetting\""

233

 	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"

234

 	ewarn "Else AMDVLK breaks things"

235

 	ewarn "With some games AMDVLK is still not stable. Use it at you own risk"

236

@@ -108,4 +110,8 @@ pkg_postinst() {

237

 	elog "or perform export in /etc/env.d/ variable VK_ICD_FILENAMES=vulkanprovidername:vulkanprovidername2 "

238

 	elog "exampe| VK_ICD_FILENAMES=\"/usr/share/vulkan/icd.d/amd_icd64.json:/usr/share/vulkan/icd.d/amd_icd64.json\""

239

 	elog "For DXVK: use DXVK_FILTER_DEVICE_NAME= variable"

240

+	elog ""

241

+	elog "You can also use AMD_VULKAN_ICD to switch to the required driver."

242

+	elog "AMD_VULKAN_ICD=RADV application   - for using radv."

243

+	elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."

244

}

1	commit: 53f88efa2406c4a025836264a8f7cb7cd2ee2474
2	Author: Denis Reva <denis7774 <AT> gmail <DOT> com>
3	AuthorDate: Thu Sep 22 05:28:14 2022 +0000
4	Commit: Denis Reva <denis7774 <AT> gmail <DOT> com>
5	CommitDate: Thu Sep 22 05:28:23 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=53f88efa
7
8	media-libs/amdvlk: 2022.3.4 is experimental version, still not ready
9
10	Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>
11
12	media-libs/amdvlk/Manifest \| 8 ++
13	media-libs/amdvlk/amdvlk-2021.4.2.ebuild \| 28 +++----
14	...dvlk-2021.4.2.ebuild => amdvlk-2022.3.4.ebuild} \| 96 ++++++++++++----------
15	3 files changed, 73 insertions(+), 59 deletions(-)
16
17	diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest
18	index 4aca432ad..e6a1fe5a9 100644
19	--- a/media-libs/amdvlk/Manifest
20	+++ b/media-libs/amdvlk/Manifest
21	@@ -9,10 +9,18 @@ DIST AMDVLK-v-2021.Q4.2-spvgen-0aa19873514a8272dfdc5cb8861859a52f5de503.tar.gz 2
22	DIST AMDVLK-v-2021.Q4.2-xgl-da1a583a51c69c115f9144b68ec2bdf5b6519056.tar.gz 960709 BLAKE2B 825e7d349da18e8a0beb42c4125bb208bd2e62780d97d5131e76e9ddc08dc6d60b2d78455aa245bb4172bb7ee7d64084307e48df2c18598cee638911fce8074c SHA512 a626459503b50a511ac04f4973036468336e9d55baecda5a84165f7209d867291ef35a9292734f38a53d13aaf70cd46fc8e3068fc3748d80278fcf3c5f8a54bb
23	DIST AMDVLK-v-2021.Q4.2.tar.gz 30012 BLAKE2B 27d11126d54df299ce702adb7c66bd0aa8a905074dac0e2cd8560f2fa9c39deafd16885c15ae9df4f70f4008a446d8e90e1dcc50514afa7ab0a874d12b2e5334 SHA512 15fb89bb78039c36435fb9534588f08e0e0e6e6099d5e803e9bacafef8b5e81eedc19e0fcc7cd7ca7dad919397cab8b87b30b22950ae32945a5465da542d6d99
24	DIST AMDVLK-v-2022.Q3.1.tar.gz 30017 BLAKE2B 4abbdb709d6d61331185f7cef3e78228a9a7ad633ddf96e4ca18870fb9f7b04c1dd393864d6f85e349c56d20bffded81d95556f6625d7a8be7dc2ef6ed78de10 SHA512 e8a1662e14861fbb90ca4bad3dcff15932ce0e43b27e2fc0bfefd5f7eff359e1c46acedb6e168583646237e030da6948ef8640fe6b4ff1693f9a7ba16f1081a4
25	+DIST AMDVLK-v-2022.Q3.4.tar.gz 29752 BLAKE2B a20c33d06034337a1786f0701a5798416e33e008c1b3f49f069f12352647635a62053d40eafe847e8bc0b2917cc59d10fdd843b7283a229725249616c4b15bfc SHA512 cbc161d1ab88cd43fd98b7c73244f53d838935cd7255a97b5fd5b01f02c9c014f763324363f379cc1fd1cf17151955186f01b1209a880aea9e463ef5e7be3916
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 amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
31	+DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
32	+DIST amdvlk-gpurt-c1df7354336aba18d54c0e32a95b58eac0d44c07.tar.gz 273130 BLAKE2B ae88ac12ab34f6f9934bb5f151812a5f4a8c055e0f3665754608344fba85c4fc2fd743eb9d770f741ebb4392b364ca8bcd57d43a35ab0710bca52c92c437f46b SHA512 078cc01979c4b8944f6a4196317ab6de7d8aea24df6b7882d258e72fbf85559a2260042eb65e82143e3af41ee154adb5fe54e767b074d46d302d82fa88fa07e4
33	+DIST amdvlk-llpc-58214602f9bc8583795d60c21bf2f122df02d6b5.tar.gz 2444994 BLAKE2B 941ec7e7e4538dfe84ff14382389b20757276105f6d3d1744b55beb6ab5af809a525b77be14087f28797ca5ba623e65d18fe3d6db738c1276ea7559cae6ee9cc SHA512 f27a5cc61121d61cfc58b4e0c28435d678c9dc1e0b9839462ee746ef4089d49aa599ad852b2f5df01746db38589e306fb029e098f4dd60cf74e021362c4243a2
34	+DIST amdvlk-llvm-project-f5023e507645c8178128891b96bf463f9a1a81a0.tar.gz 165884582 BLAKE2B d59d58ef37526690bf691f84915ab8353277c14241d097af82fddb225a37fd664c67711d572d02ab17eb9222e53d000f1e7e73a53db9afeefe65f42a705e3764 SHA512 57a48854b118a8204b06c7bd48417856708353eee36a6bdf0b7b98111a7fd5f6e6650f7a4e81d1646c6c12ba0e26bbb1fbcd2b477e17f16db35054400392b446
35	+DIST amdvlk-pal-9078fd5c95e2afd5331b414c07464efd37e4e0fb.tar.gz 11671512 BLAKE2B 2b796a10869cdb22b31944912866b01dfde49cf97446ab9711f98a6028caf54f7a16c88a173c57c57c5538e29d21a572852cc663b59633abc8f9aaab0e707791 SHA512 aefda31b77afdda11e8e0f8597fb159b5701a7f56f25a5b865185e81238fa45a7426af49ebfad57c0b3ec299cda417bd2a570d04e8c6f8e0d493d7c71a46bbea
36	+DIST amdvlk-xgl-6a26878147ab246a8885ab5b4b8897626870c1cd.tar.gz 1177671 BLAKE2B 30b857230adf2174d6c51367ffb407bd347e3d8299d56e902dddc3129514376b564f48f06f4659ed558f5631d3f4c83d00d3e423f9d7aacd88578511b9c634a8 SHA512 06600624542ca549892fde15286102d8cdcbe0cb9bdba5b83da2ab19c05774b62990d73fae6a29ce623a7ce54d2bf4ab248743cbd3f41ee899bde941b71c5d79
37	DIST llpc-38dcb76aadf729b67cabe15c2cc07a784020f704.tar.gz 2079177 BLAKE2B eb3f594b195af82faeeb9e9f5d73cc294d8178d7390183c083b4231f17a8382f0e72480f3e883b7d3e3b1f7a654974efd4d2dec1c60f6d9ae019696f467f296a SHA512 599ea375fc87621d0085bc9a1d68f00bbde42408c1b9f745ea7da8658c041cdc24722b763e53981a2ad844efa042348be7df939cee4459503ab66d462403ce32
38	DIST llpc-d4763a9dcab538955bc5ad4b5c6e0139d8fe8949.tar.gz 2344266 BLAKE2B 30243cef585f77a9a7edaa162696926c5f4ee0c9612e0339b2e28d06968f57760f3ab31ddfd028bab8d0f4c78e3e46cc23a1139b244f21860af067c3a363e2af SHA512 51e17e92ab6ed9ba10d974326f9c25cd9bb994a305c781851c48cca48a868eb5977f5b733f5bd57ee22863a93a695fab2a527badf9eb46b7e16c284bdfa98b3d
39	DIST llpc-e2d38b0c8042efbc435e51696aba5c1abd256c88.tar.gz 2091062 BLAKE2B 64dbba4f1a9c1739e56015b149143ece3795022f81eb28cb05930a1b86e505789d474ab5e6483e9700f3dba07d30a21591417564e630b2fc0e4827ab7f61a0e3 SHA512 04c3f12e6c89cae9b44703bca545e824e9f6ccb6bd88d3be80efe5edc29956fa3b8368bf79f026a691f916567f12643cf7f38a09265db656457d34600a7fe6e6
40
41	diff --git a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild b/media-libs/amdvlk/amdvlk-2021.4.2.ebuild
42	index a4b9ef85d..29a40e23e 100644
43	--- a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild
44	+++ b/media-libs/amdvlk/amdvlk-2021.4.2.ebuild
45	@@ -81,20 +81,20 @@ multilib_src_configure() {
46	cmake_src_configure
47	}
48
49	-multilib_src_install() {
50	- cmake_src_install
51	- if use abi_x86_64 && multilib_is_native_abi; then
52	- mkdir -p "${D}/usr/lib64/"
53	- mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"
54	- insinto /usr/share/vulkan/icd.d
55	- doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"
56	- else
57	- mkdir -p "${D}/usr/lib/"
58	- mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"
59	- insinto /usr/share/vulkan/icd.d
60	- doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"
61	- fi
62	-}
63	+# multilib_src_install() {
64	+# cmake_src_install
65	+# if use abi_x86_64 && multilib_is_native_abi; then
66	+# mkdir -p "${D}/usr/lib64/"
67	+# mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"
68	+# insinto /usr/share/vulkan/icd.d
69	+# doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"
70	+# else
71	+# mkdir -p "${D}/usr/lib/"
72	+# mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"
73	+# insinto /usr/share/vulkan/icd.d
74	+# doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"
75	+# fi
76	+# }
77
78	pkg_postinst() {
79	elog "More information about the configuration can be found here:"
80
81	diff --git a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild b/media-libs/amdvlk/amdvlk-2022.3.4.ebuild
82	similarity index 52%
83	copy from media-libs/amdvlk/amdvlk-2021.4.2.ebuild
84	copy to media-libs/amdvlk/amdvlk-2022.3.4.ebuild
85	index a4b9ef85d..5294089ea 100644
86	--- a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild
87	+++ b/media-libs/amdvlk/amdvlk-2022.3.4.ebuild
88	@@ -1,4 +1,4 @@
89	-# Copyright 1999-2021 Gentoo Authors
90	+# Copyright 1999-2022 Gentoo Authors
91	# Distributed under the terms of the GNU General Public License v2
92
93	EAPI=8
94	@@ -11,62 +11,63 @@ DESCRIPTION="AMD Open Source Driver for Vulkan"
95	HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
96	LICENSE="MIT"
97	SLOT="0"
98	-KEYWORDS="" # Package is broken: https://github.com/GPUOpen-Drivers/llpc/issues/1594
99	-IUSE="debug wayland"
100	+KEYWORDS=""
101	+IUSE="wayland"
102	REQUIRED_USE="\|\| ( abi_x86_32 abi_x86_64 )"
103	###DEPENDS
104	BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
105	DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
106	- ${BUNDLED_LLVM_DEPEND}"
107	+ ${BUNDLED_LLVM_DEPEND}
108	+ >=dev-util/vulkan-headers-1.3.224"
109	BDEPEND="${BUNDLED_LLVM_DEPEND}
110	dev-util/cmake"
111	RDEPEND=" ${DEPEND}
112	- dev-util/vulkan-headers
113	x11-libs/libdrm[${MULTILIB_USEDEP}]
114	x11-libs/libXrandr[${MULTILIB_USEDEP}]
115	x11-libs/libxcb[${MULTILIB_USEDEP}]
116	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
117	- media-libs/vulkan-loader[${MULTILIB_USEDEP}]"
118	+ >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
119	+ dev-util/glslang
120	+ dev-util/DirectXShaderCompiler"
121
122	-CHECKREQS_MEMORY="8G"
123	+CHECKREQS_MEMORY="16G"
124	CHECKREQS_DISK_BUILD="4G"
125	S="${WORKDIR}"
126	CMAKE_USE_DIR="${S}/xgl"
127
128	-###SOURCE CODE VARIABLES
129	+###SOURCE CODE PER_VERSION VARIABLES
130	FETCH_URI="https://github.com/GPUOpen-Drivers"
131	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
132	##For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/master/default.xml
133	##and place commits in the desired variables
134	-## PSEUDOEXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
135	+## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
136	## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
137	-XGL_COMMIT="da1a583a51c69c115f9144b68ec2bdf5b6519056"
138	-PAL_COMMIT="61409c1cea19a2ca5ad00461b1e75b3ab46c4389"
139	-LLPC_COMMIT="80b124752f5f689b21d46a3fd459b2df659de187"
140	-SPVGEN_COMMIT="0aa19873514a8272dfdc5cb8861859a52f5de503"
141	-LLVM_PROJECT_COMMIT="63581e1504f3854df7d1ea7aab6af935da1b515d"
142	-METROHASH_COMMIT="3c566dd9cda44ca7fd97659e0b53ac953f9037d2"
143	-CWPACK_COMMIT="39f8940199e60c44d4211cf8165dfd12876316fa"
144	-## SRC_URI
145	+XGL_COMMIT="6a26878147ab246a8885ab5b4b8897626870c1cd"
146	+PAL_COMMIT="9078fd5c95e2afd5331b414c07464efd37e4e0fb"
147	+LLPC_COMMIT="58214602f9bc8583795d60c21bf2f122df02d6b5"
148	+GPURT_COMMIT="c1df7354336aba18d54c0e32a95b58eac0d44c07"
149	+LLVM_PROJECT_COMMIT="f5023e507645c8178128891b96bf463f9a1a81a0"
150	+METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
151	+CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
152	+# end
153	SRC_URI=" ${FETCH_URI}/AMDVLK/archive/${CORRECT_AMDVLK_PV}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}.tar.gz
154	-${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-xgl-${XGL_COMMIT}.tar.gz
155	-${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-pal-${PAL_COMMIT}.tar.gz
156	-${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-llpc-${LLPC_COMMIT}.tar.gz
157	-${FETCH_URI}/spvgen/archive/${SPVGEN_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-spvgen-${SPVGEN_COMMIT}.tar.gz
158	-${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
159	-${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-MetroHash-${METROHASH_COMMIT}.tar.gz
160	-${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}-CWPack-${CWPACK_COMMIT}.tar.gz"
161	+${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz
162	+${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz
163	+${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz
164	+${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz
165	+${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
166	+${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz
167	+${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz"
168
169	-###EBUILD FUNCTIONS
170	src_prepare() {
171	- ##moving src to proper directories
172	+ einfo "moving src to proper directories"
173	mkdir -p "${S}"
174	mkdir -p "${S}/third_party"
175	mv AMDVLK-${CORRECT_AMDVLK_PV}/ "${S}/AMDVLK"
176	mv xgl-${XGL_COMMIT}/ "${S}/xgl"
177	mv pal-${PAL_COMMIT}/ "${S}/pal"
178	mv llpc-${LLPC_COMMIT}/ "${S}/llpc"
179	- mv spvgen-${SPVGEN_COMMIT}/ "${S}/spvgen"
180	+ mv gpurt-${GPURT_COMMIT}/ "${S}/gpurt"
181	mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project"
182	mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash"
183	mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack"
184	@@ -75,32 +76,33 @@ src_prepare() {
185
186	multilib_src_configure() {
187	local mycmakeargs=(
188	- -DBUILD_WAYLAND_SUPPORT=$(usex wayland )
189	+ -DBUILD_WAYLAND_SUPPORT=$(usex wayland)
190	)
191	- CMAKE_BUILD_TYPE=$(usex debug "Debug" "Release")
192	cmake_src_configure
193	}
194	-
195	-multilib_src_install() {
196	- cmake_src_install
197	- if use abi_x86_64 && multilib_is_native_abi; then
198	- mkdir -p "${D}/usr/lib64/"
199	- mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"
200	- insinto /usr/share/vulkan/icd.d
201	- doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"
202	- else
203	- mkdir -p "${D}/usr/lib/"
204	- mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"
205	- insinto /usr/share/vulkan/icd.d
206	- doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"
207	- fi
208	-}
209	+# multilib_src_install() {
210	+# if use abi_x86_64 && multilib_is_native_abi; then
211	+# mkdir -p "${D}/usr/lib64/"
212	+# cp "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"
213	+# insinto /usr/share/vulkan/icd.d
214	+# doins "${S}/build-abi_x86_64.amd64/icd/amd_icd64.json"
215	+# insinto /usr/share/vulkan/implicit_layer.d
216	+# doins "${S}/build-abi_x86_64.amd64/icd/amd_icd64.json"
217	+# else
218	+# mkdir -p "${D}/usr/lib/"
219	+# cp "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"
220	+# insinto /usr/share/vulkan/icd.d
221	+# doins "${S}/build-abi_x86_32.x86/icd/amd_icd32.json"
222	+# insinto /usr/share/vulkan/implicit_layer.d
223	+# doins "${S}/build-abi_x86_32.x86/icd/amd_icd32.json"
224	+# fi
225	+# }
226
227	pkg_postinst() {
228	elog "More information about the configuration can be found here:"
229	elog " https://github.com/GPUOpen-Drivers/AMDVLK"
230	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
231	- ewarn "\| Driver \"modesetting\""
232	+ ewarn "\| Driver \"modesetting\""
233	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
234	ewarn "Else AMDVLK breaks things"
235	ewarn "With some games AMDVLK is still not stable. Use it at you own risk"
236	@@ -108,4 +110,8 @@ pkg_postinst() {
237	elog "or perform export in /etc/env.d/ variable VK_ICD_FILENAMES=vulkanprovidername:vulkanprovidername2 "
238	elog "exampe\| VK_ICD_FILENAMES=\"/usr/share/vulkan/icd.d/amd_icd64.json:/usr/share/vulkan/icd.d/amd_icd64.json\""
239	elog "For DXVK: use DXVK_FILTER_DEVICE_NAME= variable"
240	+ elog ""
241	+ elog "You can also use AMD_VULKAN_ICD to switch to the required driver."
242	+ elog "AMD_VULKAN_ICD=RADV application - for using radv."
243	+ elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
244	}

Gentoo Archives: gentoo-commits