· 8 years ago · Mar 07, 2018, 03:16 PM
1diff --git a/.SRCINFO b/.SRCINFO
2index e59c902..ac6866a 100644
3--- a/.SRCINFO
4+++ b/.SRCINFO
5@@ -1,8 +1,6 @@
6-# Generated by mksrcinfo v8
7-# Tue Feb 27 12:42:48 UTC 2018
8 pkgbase = amdvlk-git
9 pkgdesc = AMD's standalone Vulkan driver
10- pkgver = r18.0eb7396
11+ pkgver = r20.d62dbcc
12 pkgrel = 1
13 url = https://github.com/GPUOpen-Drivers
14 arch = x86_64
15@@ -15,20 +13,16 @@ pkgbase = amdvlk-git
16 depends = vulkan-icd-loader
17 provides = vulkan-amdvlk
18 conflicts = vulkan-amdvlk
19- source = llvm::git+https://github.com/GPUOpen-Drivers/llvm.git#branch=amd-vulkan-master
20+ source = llvm::git+https://github.com/GPUOpen-Drivers/llvm.git#branch=amd-vulkan-dev
21 source = git+https://github.com/GPUOpen-Drivers/xgl.git#branch=dev
22 source = git+https://github.com/GPUOpen-Drivers/pal.git#branch=dev
23 source = git+https://github.com/GPUOpen-Drivers/AMDVLK.git#branch=dev
24- source = 0001-remove-linking-with-whole-archive-v2.patch
25 source = amdPalSettings.cfg
26- source = amd_icd64.json
27 sha256sums = SKIP
28 sha256sums = SKIP
29 sha256sums = SKIP
30 sha256sums = SKIP
31- sha256sums = 268528bf2c6e855707635e65ece19b179135fa8823c1a9cc01746fd9235b8139
32 sha256sums = 5f798911bf1cbbe5a83f5ae4886107ef0d02be5753450753ae2d3fc6f80e7012
33- sha256sums = 39c26b6d91a8c5b42818a6cc3529b3803aba8f3a759d8eb6b682ecb027f4762c
34
35 pkgname = amdvlk-git
36
37diff --git a/0001-fix-compile-error-on-clang.patch b/0001-fix-compile-error-on-clang.patch
38deleted file mode 100644
39index 1065b2e..0000000
40--- a/0001-fix-compile-error-on-clang.patch
41+++ /dev/null
42@@ -1,27 +0,0 @@
43-From d51507637e29281152b47ef30a3488c29c2a0955 Mon Sep 17 00:00:00 2001
44-From: Christoph Haag <haagch@frickel.club>
45-Date: Fri, 22 Dec 2017 13:03:43 +0100
46-Subject: [PATCH] fix compile error on clang
47-
48-xgl/icd/api/llpc/util/llpcDebug.cpp:116:10: error: reference to scoped enumeration must use 'enum' not 'enum class'
49- enum class ResourceMappingNodeType type) // Resource map node type
50----
51- icd/api/llpc/util/llpcDebug.cpp | 2 +-
52- 1 file changed, 1 insertion(+), 1 deletion(-)
53-
54-diff --git a/icd/api/llpc/util/llpcDebug.cpp b/icd/api/llpc/util/llpcDebug.cpp
55-index 1273cd6..847786e 100644
56---- a/icd/api/llpc/util/llpcDebug.cpp
57-+++ b/icd/api/llpc/util/llpcDebug.cpp
58-@@ -113,7 +113,7 @@ bool EnableErrs()
59- // Translates enum "ResourceMappingNodeType" to string and output to ostream.
60- raw_ostream& operator<<(
61- raw_ostream& out, // [out] Output stream
62-- enum class ResourceMappingNodeType type) // Resource map node type
63-+ enum ResourceMappingNodeType type) // Resource map node type
64- {
65- const char* pString = nullptr;
66- switch (type)
67---
68-2.15.1
69-
70diff --git a/0001-remove-linking-with-whole-archive-v2.patch b/0001-remove-linking-with-whole-archive-v2.patch
71deleted file mode 100644
72index 92d0aea..0000000
73--- a/0001-remove-linking-with-whole-archive-v2.patch
74+++ /dev/null
75@@ -1,28 +0,0 @@
76-From ab357c76493b0285f3fca0502085b3766e8e9be1 Mon Sep 17 00:00:00 2001
77-From: Laurent Carlier <lordheavym@gmail.com>
78-Date: Thu, 28 Dec 2017 13:23:36 +0100
79-Subject: [PATCH] remove linking with --whole-archive (v2)
80-
81-it breaks the build by linking pal twice and duplicating its symbols
82-
83-v2: update the patch
84----
85- icd/CMakeLists.txt | 2 +-
86- 1 file changed, 1 insertion(+), 1 deletion(-)
87-
88-diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
89-index fbc125e..0384859 100644
90---- a/icd/CMakeLists.txt
91-+++ b/icd/CMakeLists.txt
92-@@ -293,7 +293,7 @@ if (UNIX)
93-
94- if(CMAKE_BUILD_TYPE_RELEASE)
95- execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
96-- if (GCC_VERSION VERSION_GREATER 5.3 OR GCC_VERSION VERSION_EQUAL 5.3)
97-+ if ((GCC_VERSION VERSION_GREATER 5.3 OR GCC_VERSION VERSION_EQUAL 5.3) AND GCC_VERSION VERSION_LESS 7.0)
98- target_link_libraries(xgl PRIVATE -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/src/libpal.a -Wl,--no-whole-archive)
99- target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/metrohash/libmetrohash.a -Wl,--no-whole-archive)
100- target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/gpuopen/libgpuopen.a -Wl,--no-whole-archive)
101---
102-2.15.1
103-
104diff --git a/0001-remove-linking-with-whole-archive.patch b/0001-remove-linking-with-whole-archive.patch
105deleted file mode 100644
106index be99d00..0000000
107--- a/0001-remove-linking-with-whole-archive.patch
108+++ /dev/null
109@@ -1,46 +0,0 @@
110-From d56190445766f1b8ff7ddeb46f88c3609bd6dea7 Mon Sep 17 00:00:00 2001
111-From: Christoph Haag <haagch@frickel.club>
112-Date: Fri, 22 Dec 2017 13:46:09 +0100
113-Subject: [PATCH] remove linking with --whole-archive
114-
115-it breaks the build by linking pal twice and duplicating its symbols
116----
117- icd/CMakeLists.txt | 22 +++++++++++-----------
118- 1 file changed, 11 insertions(+), 11 deletions(-)
119-
120-diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
121-index 4e4d669..372783a 100644
122---- a/icd/CMakeLists.txt
123-+++ b/icd/CMakeLists.txt
124-@@ -530,17 +530,17 @@ if (UNIX)
125-
126- # CMAKE-TODO: What is whole-archive used for?
127- #target_link_libraries(xgl -Wl,--whole-archive ${ICD_LIBS} -Wl,--no-whole-archive)
128-- if(CMAKE_BUILD_TYPE_RELEASE)
129-- execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
130-- if (GCC_VERSION VERSION_GREATER 5.3 OR GCC_VERSION VERSION_EQUAL 5.3)
131-- target_link_libraries(xgl PRIVATE -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/src/libpal.a -Wl,--no-whole-archive)
132-- target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/metrohash/libmetrohash.a -Wl,--no-whole-archive)
133-- target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/gpuopen/libgpuopen.a -Wl,--no-whole-archive)
134-- target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/vam/libvam.a -Wl,--no-whole-archive)
135-- target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/addrlib/libaddrlib.a -Wl,--no-whole-archive)
136-- target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/jemalloc/libjemalloc.a -Wl,--no-whole-archive)
137-- endif()
138-- endif()
139-+# if(CMAKE_BUILD_TYPE_RELEASE)
140-+# execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
141-+# if (GCC_VERSION VERSION_GREATER 5.3 OR GCC_VERSION VERSION_EQUAL 5.3)
142-+# target_link_libraries(xgl PRIVATE -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/src/libpal.a -Wl,--no-whole-archive)
143-+# target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/metrohash/libmetrohash.a -Wl,--no-whole-archive)
144-+# target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/gpuopen/libgpuopen.a -Wl,--no-whole-archive)
145-+# target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/vam/libvam.a -Wl,--no-whole-archive)
146-+# target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/addrlib/libaddrlib.a -Wl,--no-whole-archive)
147-+# target_link_libraries(xgl PUBLIC -Wl,--whole-archive ${PROJECT_BINARY_DIR}/pal/jemalloc/libjemalloc.a -Wl,--no-whole-archive)
148-+# endif()
149-+# endif()
150-
151- #${ICD_TARGET}.so${SO_VERSION_NUMBER} : ${filter-out -Wl%,$(LLLIBS})
152-
153---
154-2.15.1
155-
156diff --git a/0001-workaround-remove-invalid-constexpr-modifier.patch b/0001-workaround-remove-invalid-constexpr-modifier.patch
157deleted file mode 100644
158index 8bebe73..0000000
159--- a/0001-workaround-remove-invalid-constexpr-modifier.patch
160+++ /dev/null
161@@ -1,43 +0,0 @@
162-From f6eeea01b0f25c887fab451af151e43a4c1c65d0 Mon Sep 17 00:00:00 2001
163-From: Christoph Haag <haagch@frickel.club>
164-Date: Fri, 22 Dec 2017 12:56:32 +0100
165-Subject: [PATCH] workaround: remove invalid constexpr modifier
166-
167----
168- src/util/math.cpp | 6 +++---
169- 1 file changed, 3 insertions(+), 3 deletions(-)
170-
171-diff --git a/src/util/math.cpp b/src/util/math.cpp
172-index 46e9ede..3af4259 100644
173---- a/src/util/math.cpp
174-+++ b/src/util/math.cpp
175-@@ -54,7 +54,7 @@ static uint32 Float32ToFloatN(float f, const NBitFloatInfo& info);
176- static float FloatNToFloat32(uint32 fBits, const NBitFloatInfo& info);
177-
178- // Initialize the descriptors for various N-bit floating point representations:
179--static constexpr NBitFloatInfo Float16Info =
180-+static NBitFloatInfo Float16Info =
181- {
182- 16, // numBits
183- 10, // numFracBits
184-@@ -72,7 +72,7 @@ static constexpr NBitFloatInfo Float16Info =
185- (23 - 10), // fracBitsDiff
186- };
187-
188--static constexpr NBitFloatInfo Float11Info =
189-+static NBitFloatInfo Float11Info =
190- {
191- 11, // numBits
192- 6, // numFracBits
193-@@ -90,7 +90,7 @@ static constexpr NBitFloatInfo Float11Info =
194- 23 - 6, // fracBitsDiff
195- };
196-
197--static constexpr NBitFloatInfo Float10Info =
198-+static NBitFloatInfo Float10Info =
199- {
200- 10, // numBits
201- 5, // numFracBits
202---
203-2.15.1
204-
205diff --git a/PKGBUILD b/PKGBUILD
206index 09d3859..af2d78e 100644
207--- a/PKGBUILD
208+++ b/PKGBUILD
209@@ -1,8 +1,9 @@
210 # Maintainer: Christoph Haag <haagch@studi.informatik.uni-stuttgart.de>
211 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
212+# Contributor: Adrià Cereto i Massagué <ssorgatem at gmail.com>
213
214 pkgname=amdvlk-git
215-pkgver=r18.0eb7396
216+pkgver=r20.d62dbcc
217 pkgrel=1
218 pkgdesc="AMD's standalone Vulkan driver"
219 arch=(x86_64)
220@@ -12,20 +13,18 @@ depends=('vulkan-icd-loader')
221 provides=('vulkan-amdvlk')
222 conflicts=('vulkan-amdvlk')
223 makedepends=('dri2proto' 'xorg-server-devel' 'cmake' 'python' 'git')
224-source=('llvm::git+https://github.com/GPUOpen-Drivers/llvm.git#branch=amd-vulkan-master'
225+source=('llvm::git+https://github.com/GPUOpen-Drivers/llvm.git#branch=amd-vulkan-dev'
226 'git+https://github.com/GPUOpen-Drivers/xgl.git#branch=dev'
227 'git+https://github.com/GPUOpen-Drivers/pal.git#branch=dev'
228 'git+https://github.com/GPUOpen-Drivers/AMDVLK.git#branch=dev'
229- '0001-remove-linking-with-whole-archive-v2.patch'
230 'amdPalSettings.cfg'
231- 'amd_icd64.json')
232+ )
233 sha256sums=('SKIP'
234 'SKIP'
235 'SKIP'
236 'SKIP'
237- '268528bf2c6e855707635e65ece19b179135fa8823c1a9cc01746fd9235b8139'
238 '5f798911bf1cbbe5a83f5ae4886107ef0d02be5753450753ae2d3fc6f80e7012'
239- '39c26b6d91a8c5b42818a6cc3529b3803aba8f3a759d8eb6b682ecb027f4762c')
240+ )
241
242 pkgver() {
243 XGL_VER=$(cd xgl; printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
244@@ -35,7 +34,6 @@ pkgver() {
245
246 prepare() {
247 cd xgl
248- #patch -Np1 -i ${srcdir}/0001-remove-linking-with-whole-archive-v2.patch
249 }
250
251 build() {
252@@ -44,7 +42,7 @@ build() {
253 cmake -H. -Bbuilds/Release64 -DCMAKE_BUILD_TYPE=Release
254 cd builds/Release64
255 make
256- msg "bulding xgl finished!"
257+ msg "building xgl finished!"
258 }
259
260 package() {
261@@ -54,7 +52,7 @@ package() {
262 install -m755 -d "${pkgdir}"/etc/amd
263
264 install xgl/builds/Release64/icd/amdvlk64.so "${pkgdir}"/usr/lib/
265- install amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
266+ install AMDVLK/json/Ubuntu/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
267 install AMDVLK/LICENSE.txt "${pkgdir}"/usr/share/licenses/amdvlk-git/
268 install amdPalSettings.cfg "${pkgdir}"/etc/amd/
269 }
270diff --git a/amd_icd64.json b/amd_icd64.json
271deleted file mode 100644
272index 4af6b89..0000000
273--- a/amd_icd64.json
274+++ /dev/null
275@@ -1,8 +0,0 @@
276-{
277- "file_format_version": "1.0.0",
278- "ICD": {
279- "library_path": "/usr/lib/amdvlk64.so",
280- "abi_versions": "0.9.0"
281- }
282-}
283-