Date: Tuesday, May 18, 2021 @ 17:28:56
Author: svenstaro
Revision: 936274
upgpkg: 0ad a24.b-4: Rebuild using gcc11
Modified:
0ad/trunk/PKGBUILD
Deleted:
0ad/trunk/0ad-fcollada.patch
0ad/trunk/icu68.patch
0ad/trunk/missing-includes.patch
0ad/trunk/zen2-workaround.patch
------------------------+
0ad-fcollada.patch | 41 -----------------------------------------
PKGBUILD | 6 +++---
icu68.patch | 17 -----------------
missing-includes.patch | 23 -----------------------
zen2-workaround.patch | 29 -----------------------------
5 files changed, 3 insertions(+), 113 deletions(-)
Deleted: 0ad-fcollada.patch
===================================================================
--- 0ad-fcollada.patch 2021-05-18 16:48:34 UTC (rev 936273)
+++ 0ad-fcollada.patch 2021-05-18 17:28:56 UTC (rev 936274)
@@ -1,41 +0,0 @@
-diff -up
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
----
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig
2020-03-30 16:28:20.011982827 -0300
-+++
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
2020-03-31 11:43:27.669098382 -0300
-@@ -553,7 +553,16 @@ public:
-
- static void
WritePhysicsRigidBodyParameters(FCDPhysicsRigidBodyParameters*
physicsRigidBodyParameters, xmlNode* techniqueNode);
- template <class TYPE, int QUAL>
-- static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char*
name, FCDParameterAnimatableT<TYPE,QUAL>& value);
-+ static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char*
name, FCDParameterAnimatableT<TYPE,QUAL>& value) {
-+ xmlNode* paramNode = AddChild(parentNode, name);
-+ AddContent(paramNode, FUStringConversion::ToString((TYPE&)
value));
-+ if (value.IsAnimated())
-+ {
-+ const FCDAnimated* animated = value.GetAnimated();
-+ FArchiveXML::WriteAnimatedValue(animated, paramNode,
name);
-+ }
-+ return paramNode;
-+ }
-
-
- //
-diff -up
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
----
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig
2008-09-07 19:13:25.000000000 -0300
-+++
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
2020-03-31 11:43:24.577115067 -0300
-@@ -329,16 +329,3 @@ void FArchiveXML::WritePhysicsRigidBodyP
-
FArchiveXML::LetWriteObject(physicsRigidBodyParameters->GetPhysicsShape(i),
techniqueNode);
- }
- }
--
--template <class TYPE, int QUAL>
--xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char*
name, FCDParameterAnimatableT<TYPE,QUAL>& value)
--{
-- xmlNode* paramNode = AddChild(parentNode, name);
-- AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
-- if (value.IsAnimated())
-- {
-- const FCDAnimated* animated = value.GetAnimated();
-- FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
-- }
-- return paramNode;
--}
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-18 16:48:34 UTC (rev 936273)
+++ PKGBUILD 2021-05-18 17:28:56 UTC (rev 936274)
@@ -4,7 +4,7 @@
pkgname=0ad
pkgver=a24.b
_pkgver=0.0.24b-alpha
-pkgrel=3
+pkgrel=4
pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
arch=('x86_64')
url="http://play0ad.com/";
@@ -14,9 +14,9 @@
'gloox' 'miniupnpc' 'libminiupnpc.so' 'icu' 'nspr' 'libsodium')
makedepends=('boost' 'cmake' 'mesa' 'zip' 'libsm' 'rust')
source=("https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz";
-
$pkgname-rust-1.50.patch::https://github.com/0ad/0ad/commit/087a277e66c0.patch)
+
$pkgname-rust-1.50.patch::https://github.com/0ad/0ad/commit/087a277e66c0456c2d6fdb7403d032ad09cbd18b.patch)
sha512sums=('8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea'
-
'f865a514540549e6e96d5ce20c72e612de30a644547003de360c58865401db20e037ed65aa57fca56f8e113d16684430e57db5840570274089bb271d25ec90b1')
+
'2e2763333dc23b746c4943894f9f0b8f526b7d85de7b8d02faebf95d6d39a54de3511447a679d04c5863ab886a53d66cecd7cac0c2bffc5922084445249e9b48')
prepare() {
cd "$pkgname-$_pkgver"
Deleted: icu68.patch
===================================================================
--- icu68.patch 2021-05-18 16:48:34 UTC (rev 936273)
+++ icu68.patch 2021-05-18 17:28:56 UTC (rev 936274)
@@ -1,17 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-../../../source/i18n/L10n.cpp:208:82: error: use of undeclared identifier
'TRUE'
- currentLocaleIsOriginalGameLocale = (currentLocale ==
icu::Locale::getUS()) == TRUE;
-
^
-
---- source/i18n/L10n.cpp.orig 2018-04-10 18:13:32 UTC
-+++ source/i18n/L10n.cpp
-@@ -205,7 +205,7 @@ void L10n::ReevaluateCurrentLocaleAndReload()
- else
- {
- GetDictionaryLocale(locale, currentLocale);
-- currentLocaleIsOriginalGameLocale = (currentLocale ==
icu::Locale::getUS()) == TRUE;
-+ currentLocaleIsOriginalGameLocale = (currentLocale ==
icu::Locale::getUS()) == true;
- useLongStrings = false;
- }
- LoadDictionaryForCurrentLocale();
Deleted: missing-includes.patch
===================================================================
--- missing-includes.patch 2021-05-18 16:48:34 UTC (rev 936273)
+++ missing-includes.patch 2021-05-18 17:28:56 UTC (rev 936274)
@@ -1,23 +0,0 @@
-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"
Deleted: zen2-workaround.patch
===================================================================
--- zen2-workaround.patch 2021-05-18 16:48:34 UTC (rev 936273)
+++ zen2-workaround.patch 2021-05-18 17:28:56 UTC (rev 936274)
@@ -1,29 +0,0 @@
-------------------------------------------------------------------------
-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)
-
-------------------------------------------------------------------------
