[vlc-commits] contrib: glslang: Backport a patch to fix building with the newest clang

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Fri Dec  6 01:27:36 2019 +0200| [d16cfc9032d6b6b58b9004a0636159a7967be7a6] | committer: Martin Storsjö

contrib: glslang: Backport a patch to fix building with the newest clang

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d16cfc9032d6b6b58b9004a0636159a7967be7a6
---

 contrib/src/glslang/remove-broken-code.patch | 24 ++++++++++++++++++++++++
 contrib/src/glslang/rules.mak                |  1 +
 2 files changed, 25 insertions(+)

diff --git a/contrib/src/glslang/remove-broken-code.patch b/contrib/src/glslang/remove-broken-code.patch
new file mode 100644
index 0000000000..3931acef43
--- /dev/null
+++ b/contrib/src/glslang/remove-broken-code.patch
@@ -0,0 +1,24 @@
+From 24b3e8384e93f3e73b6aa14ea00a30574112f9ba Mon Sep 17 00:00:00 2001
+From: Reid Kleckner <rnk at google.com>
+Date: Wed, 4 Dec 2019 14:09:03 -0800
+Subject: [PATCH] Remove glslang::pool_allocator::setAllocator
+
+TPoolAllocator is not copy assignable, so this setter could never have
+been used. After a recent change (878a24ee2), new versions of Clang
+reject this code outright.
+---
+ glslang/Include/PoolAlloc.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/glslang/Include/PoolAlloc.h b/glslang/Include/PoolAlloc.h
+index 0e237a6a2..b8eccb883 100644
+--- a/glslang/Include/PoolAlloc.h
++++ b/glslang/Include/PoolAlloc.h
+@@ -304,7 +304,6 @@ class pool_allocator {
+     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
+     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
+ 
+-    void setAllocator(TPoolAllocator* a) { allocator = *a; }
+     TPoolAllocator& getAllocator() const { return allocator; }
+ 
+ protected:
diff --git a/contrib/src/glslang/rules.mak b/contrib/src/glslang/rules.mak
index 5b60a5ab1c..565f8c075d 100644
--- a/contrib/src/glslang/rules.mak
+++ b/contrib/src/glslang/rules.mak
@@ -21,6 +21,7 @@ glslang: glslang-$(GLSLANG_BASENAME).tar.xz .sum-glslang
 	mkdir -p $@-$(GLSLANG_BASENAME)
 	tar xvJf "$<" --strip-components=1 -C $@-$(GLSLANG_BASENAME)
 	$(APPLY) $(SRC)/glslang/glslang-win32.patch
+	$(APPLY) $(SRC)/glslang/remove-broken-code.patch
 	$(MOVE)
 
 .glslang: glslang toolchain.cmake