Date: Wednesday, February 24, 2021 @ 15:07:37
Author: svenstaro
Revision: 871519
archrelease: copy trunk to community-x86_64
Added:
0ad/repos/community-x86_64/0ad-fcollada.patch
(from rev 871517, 0ad/trunk/0ad-fcollada.patch)
0ad/repos/community-x86_64/PKGBUILD
(from rev 871517, 0ad/trunk/PKGBUILD)
0ad/repos/community-x86_64/icu68.patch
(from rev 871517, 0ad/trunk/icu68.patch)
0ad/repos/community-x86_64/missing-includes.patch
(from rev 871517, 0ad/trunk/missing-includes.patch)
0ad/repos/community-x86_64/zen2-workaround.patch
(from rev 871517, 0ad/trunk/zen2-workaround.patch)
Deleted:
0ad/repos/community-x86_64/0ad-fcollada.patch
0ad/repos/community-x86_64/PKGBUILD
0ad/repos/community-x86_64/icu68.patch
0ad/repos/community-x86_64/missing-includes.patch
0ad/repos/community-x86_64/zen2-workaround.patch
------------------------+
0ad-fcollada.patch | 82 ++++++++++++++++++------------------
PKGBUILD | 106 +++++++++++++++++++++++------------------------
icu68.patch | 34 +++++++--------
missing-includes.patch | 46 ++++++++++----------
zen2-workaround.patch | 58 ++++++++++++-------------
5 files changed, 163 insertions(+), 163 deletions(-)
Deleted: 0ad-fcollada.patch
===================================================================
--- 0ad-fcollada.patch 2021-02-24 15:07:37 UTC (rev 871518)
+++ 0ad-fcollada.patch 2021-02-24 15:07:37 UTC (rev 871519)
@@ -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;
--}
Copied: 0ad/repos/community-x86_64/0ad-fcollada.patch (from rev 871517,
0ad/trunk/0ad-fcollada.patch)
===================================================================
--- 0ad-fcollada.patch (rev 0)
+++ 0ad-fcollada.patch 2021-02-24 15:07:37 UTC (rev 871519)
@@ -0,0 +1,41 @@
+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;
+-}
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-24 15:07:37 UTC (rev 871518)
+++ PKGBUILD 2021-02-24 15:07:37 UTC (rev 871519)
@@ -1,53 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <[email protected]>
-# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
-# Contributor: Adrián Chaves Fernández (Gallaecio) <[email protected]>
-pkgname=0ad
-pkgver=a24.b
-_pkgver=0.0.24b-alpha
-pkgrel=1
-pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
-arch=('x86_64')
-url="http://play0ad.com/";
-license=('GPL2' 'CCPL')
-depends=('0ad-data' 'binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng'
'libvorbis'
- 'libxml2' 'openal' 'sdl2' 'wxgtk3' 'zlib' 'libgl' 'glu'
- 'gloox' 'miniupnpc' 'libminiupnpc.so' 'icu' 'nspr' 'libsodium')
-makedepends=('boost' 'cmake' 'mesa' 'zip' 'libsm' 'rust' 'fmt')
-source=("https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz";
-
https://code.wildfiregames.com/file/data/3urss4gcr6ctlswrvjmo/PHID-FILE-j3zreuum7vciwef3zolp/D3590.diff)
-sha512sums=('8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea'
-
'1e5b340ac8e00378fe794d86810c2f0e8c7e1b1d4a2beb28507ea2705bba3a44b8fa6fd15600245f2a5907b14af2c73a4d4e2722eab0177d8215a685db67767a')
-
-prepare() {
- cd "$pkgname-$_pkgver"
-
- patch -Np0 -i "$srcdir"/D3590.diff
-}
-
-build() {
- cd "$pkgname-$_pkgver/build/workspaces"
-
- export WX_CONFIG="wx-config-gtk3"
- ./update-workspaces.sh -j$(nproc) \
- --without-pch \
- --bindir=/usr/bin \
- --libdir=/usr/lib/0ad \
- --datadir=/usr/share/0ad/data
-
- cd gcc
-
- VERBOSE=1 make
-}
-
-package() {
- cd "$pkgname-$_pkgver"
- install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data}
- install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
- install -Dm755 binaries/system/*.so "${pkgdir}/usr/lib/0ad"
-
- cp -r binaries/data/l10n/ "${pkgdir}/usr/share/${pkgname}/data/"
-
- install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
- install -Dm644 build/resources/${pkgname}.desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -Dm644 build/resources/${pkgname}.png
"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}
Copied: 0ad/repos/community-x86_64/PKGBUILD (from rev 871517,
0ad/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-02-24 15:07:37 UTC (rev 871519)
@@ -0,0 +1,53 @@
+# Maintainer: Sven-Hendrik Haase <[email protected]>
+# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <[email protected]>
+pkgname=0ad
+pkgver=a24.b
+_pkgver=0.0.24b-alpha
+pkgrel=2
+pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
+arch=('x86_64')
+url="http://play0ad.com/";
+license=('GPL2' 'CCPL')
+depends=('0ad-data' 'binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng'
'libvorbis'
+ 'libxml2' 'openal' 'sdl2' 'wxgtk3' 'zlib' 'libgl' 'glu' 'fmt'
+ '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";
+
https://code.wildfiregames.com/file/data/3urss4gcr6ctlswrvjmo/PHID-FILE-j3zreuum7vciwef3zolp/D3590.diff)
+sha512sums=('8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea'
+
'1e5b340ac8e00378fe794d86810c2f0e8c7e1b1d4a2beb28507ea2705bba3a44b8fa6fd15600245f2a5907b14af2c73a4d4e2722eab0177d8215a685db67767a')
+
+prepare() {
+ cd "$pkgname-$_pkgver"
+
+ patch -Np0 -i "$srcdir"/D3590.diff
+}
+
+build() {
+ cd "$pkgname-$_pkgver/build/workspaces"
+
+ export WX_CONFIG="wx-config-gtk3"
+ ./update-workspaces.sh -j$(nproc) \
+ --without-pch \
+ --bindir=/usr/bin \
+ --libdir=/usr/lib/0ad \
+ --datadir=/usr/share/0ad/data
+
+ cd gcc
+
+ VERBOSE=1 make
+}
+
+package() {
+ cd "$pkgname-$_pkgver"
+ install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data}
+ install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
+ install -Dm755 binaries/system/*.so "${pkgdir}/usr/lib/0ad"
+
+ cp -r binaries/data/l10n/ "${pkgdir}/usr/share/${pkgname}/data/"
+
+ install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
+ install -Dm644 build/resources/${pkgname}.desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -Dm644 build/resources/${pkgname}.png
"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
Deleted: icu68.patch
===================================================================
--- icu68.patch 2021-02-24 15:07:37 UTC (rev 871518)
+++ icu68.patch 2021-02-24 15:07:37 UTC (rev 871519)
@@ -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();
Copied: 0ad/repos/community-x86_64/icu68.patch (from rev 871517,
0ad/trunk/icu68.patch)
===================================================================
--- icu68.patch (rev 0)
+++ icu68.patch 2021-02-24 15:07:37 UTC (rev 871519)
@@ -0,0 +1,17 @@
+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-02-24 15:07:37 UTC (rev 871518)
+++ missing-includes.patch 2021-02-24 15:07:37 UTC (rev 871519)
@@ -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"
Copied: 0ad/repos/community-x86_64/missing-includes.patch (from rev 871517,
0ad/trunk/missing-includes.patch)
===================================================================
--- missing-includes.patch (rev 0)
+++ missing-includes.patch 2021-02-24 15:07:37 UTC (rev 871519)
@@ -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"
Deleted: zen2-workaround.patch
===================================================================
--- zen2-workaround.patch 2021-02-24 15:07:37 UTC (rev 871518)
+++ zen2-workaround.patch 2021-02-24 15:07:37 UTC (rev 871519)
@@ -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)
-
-------------------------------------------------------------------------
Copied: 0ad/repos/community-x86_64/zen2-workaround.patch (from rev 871517,
0ad/trunk/zen2-workaround.patch)
===================================================================
--- zen2-workaround.patch (rev 0)
+++ zen2-workaround.patch 2021-02-24 15:07:37 UTC (rev 871519)
@@ -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)
+
+------------------------------------------------------------------------
