[arch-commits] Commit in 0ad/trunk (3 files)

[Evangelos Foutras]

    Date: Tuesday, January 28, 2020 @ 06:11:02
  Author: foutrelis
Revision: 557365

Add missing includes and refresh Zen 2 workaround

Added:
  0ad/trunk/missing-includes.patch
  0ad/trunk/zen2-workaround.patch
Modified:
  0ad/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    9 ++++++---
 missing-includes.patch |   23 +++++++++++++++++++++++
 zen2-workaround.patch  |   29 +++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-28 06:07:06 UTC (rev 557364)
+++ PKGBUILD	2020-01-28 06:11:02 UTC (rev 557365)
@@ -14,15 +14,18 @@
          'gloox' 'miniupnpc' 'libminiupnpc.so' 'icu' 'nspr' 'libsodium')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
 source=("https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
-        "https://code.wildfiregames.com/file/data/3fjmeh3urwrljudvr5jt/PHID-FILE-aas5xivla4iia52w5i2d/D2353.diff")
+        zen2-workaround.patch
+        missing-includes.patch)
 sha512sums=('82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135'
-            '8d6134ee8a5fe3e2a3de44ae1a7e80712d11f7de965b744d04abff0968438624c9862d19e8e738cb8cbac6b2ee4bd8c5f55778249992ffa2112cf913f2932659')
+            '1aaab2a71b363b0acbb6beb724bbb4c4b3a8fc607c7958f65e9653e29dedfc502f84262955d1b5ba5dc54b2c97a3882809967e74dfd3de54ae09ee6b08816a90'
+            '4cd709847f50de291a7eb5f2049e06f6725799a793d845ac40b1ffdd8f3674d426736dc7ea226dc9f261e8edc3c68972edc704f4aa42b05ed37f6866b5680ddd')
 
 prepare() {
   cd "$srcdir/$pkgname-$_pkgver/"
   sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen
 
-  patch -Np0 -i "$srcdir"/D2353.diff
+  patch -Np0 -i "$srcdir"/zen2-workaround.patch
+  patch -Np1 -i "$srcdir"/missing-includes.patch
 }
 
 build() {

Added: missing-includes.patch
===================================================================
--- missing-includes.patch	                        (rev 0)
+++ missing-includes.patch	2020-01-28 06:11:02 UTC (rev 557365)
@@ -0,0 +1,23 @@
+diff -upr 0ad-0.0.23b-alpha.orig/source/ps/CLogger.h 0ad-0.0.23b-alpha/source/ps/CLogger.h
+--- 0ad-0.0.23b-alpha.orig/source/ps/CLogger.h	2016-11-23 13:18:37.000000000 +0200
++++ 0ad-0.0.23b-alpha/source/ps/CLogger.h	2020-01-28 07:37:03.437447311 +0200
+@@ -22,6 +22,7 @@
+ #include <string>
+ #include <set>
+ #include <sstream>
++#include <deque>
+ 
+ #include "ps/ThreadUtil.h"
+ #include "third_party/cppformat/format.h"
+diff -upr 0ad-0.0.23b-alpha.orig/source/ps/Profiler2GPU.cpp 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp
+--- 0ad-0.0.23b-alpha.orig/source/ps/Profiler2GPU.cpp	2018-03-10 11:58:53.000000000 +0200
++++ 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp	2020-01-28 07:54:47.144787893 +0200
+@@ -20,6 +20,8 @@
+  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  */
+ 
++#include <stack>
++
+ #include "precompiled.h"
+ 
+ #include "Profiler2GPU.h"

Added: zen2-workaround.patch
===================================================================
--- zen2-workaround.patch	                        (rev 0)
+++ zen2-workaround.patch	2020-01-28 06:11:02 UTC (rev 557365)
@@ -0,0 +1,29 @@
+------------------------------------------------------------------------
+r23262 | Imarok | 2019-12-19 18:52:47 +0200 (Thu, 19 Dec 2019) | 9 lines
+
+Workaround for L3 cache detection of Ryzen 3000
+
+This code is planned to get refactored or removed anyway, so just do a cheap workaround.
+
+Reviewed by: Imarok
+Fixes: #4360
+Differential Revision: https://code.wildfiregames.com/D2353
+
+
+
+Index: source/lib/sysdep/arch/x86_x64/cache.cpp
+===================================================================
+--- source/lib/sysdep/arch/x86_x64/cache.cpp	(revision 23261)
++++ source/lib/sysdep/arch/x86_x64/cache.cpp	(revision 23262)
+@@ -89,7 +89,8 @@
+ static const size_t associativityTable[16] =
+ {
+ 	0, 1, 2, 0, 4, 0, 8, 0,
+-	16, 0, 32, 48, 64, 96, 128, x86_x64::Cache::fullyAssociative
++	// TODO: The second '16' does not obey to the specifications and is only a workaround. For a correct implementation please look here: https://community.amd.com/thread/244207
++	16, 16, 32, 48, 64, 96, 128, x86_x64::Cache::fullyAssociative
+ };
+ 
+ static x86_x64::Cache L2Cache(u32 reg, x86_x64::Cache::Type type)
+
+------------------------------------------------------------------------