Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Feb 2020 18:29:51 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r527182 - head/emulators/dolphin-emu/files
Message-ID:  <202002261829.01QITpoj048974@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Feb 26 18:29:51 2020
New Revision: 527182
URL: https://svnweb.freebsd.org/changeset/ports/527182

Log:
  emulators/dolphin-emu: unbreak with Clang 10
  
  In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:35:
  In file included from Externals/glslang/glslang/GenericCodeGen/../Include/Common.h:107:
  Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator'
      void setAllocator(TPoolAllocator* a) { allocator = *a; }
                                             ~~~~~~~~~ ^ ~~
  Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:244:21: note: declared private here
      TPoolAllocator& operator=(const TPoolAllocator&);  // don't allow assignment operator
                      ^
  In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:36:
  In file included from Externals/glslang/glslang/GenericCodeGen/../Include/ShHandle.h:46:
  Externals/glslang/glslang/GenericCodeGen/../Include/../Public/ShaderLang.h:85:22: warning: '__fastcall__' calling convention is not supported for this target [-Wignored-attributes]
  SH_IMPORT_EXPORT int __fastcall ShFinalize();
                       ^
  
  Reported by:	antoine (via bug 244251 exp-run)

Added:
  head/emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h   (contents, props changed)

Added: head/emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Externals_glslang_glslang_Include_PoolAlloc.h	Wed Feb 26 18:29:51 2020	(r527182)
@@ -0,0 +1,26 @@
+https://github.com/KhronosGroup/glslang/commit/24b3e8384e93
+
+In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:35:
+In file included from Externals/glslang/glslang/GenericCodeGen/../Include/Common.h:107:
+Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator'
+    void setAllocator(TPoolAllocator* a) { allocator = *a; }
+                                           ~~~~~~~~~ ^ ~~
+Externals/glslang/glslang/GenericCodeGen/../Include/PoolAlloc.h:244:21: note: declared private here
+    TPoolAllocator& operator=(const TPoolAllocator&);  // don't allow assignment operator
+                    ^
+In file included from Externals/glslang/glslang/GenericCodeGen/CodeGen.cpp:36:
+In file included from Externals/glslang/glslang/GenericCodeGen/../Include/ShHandle.h:46:
+Externals/glslang/glslang/GenericCodeGen/../Include/../Public/ShaderLang.h:85:22: warning: '__fastcall__' calling convention is not supported for this target [-Wignored-attributes]
+SH_IMPORT_EXPORT int __fastcall ShFinalize();
+                     ^
+
+--- Externals/glslang/glslang/Include/PoolAlloc.h.orig	2019-10-07 00:46:03 UTC
++++ Externals/glslang/glslang/Include/PoolAlloc.h
+@@ -304,7 +304,6 @@ class pool_allocator { (public)
+     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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002261829.01QITpoj048974>