From 778138c15bce7ee7727b05541aa00bd52e2bccf4 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 5 Jun 2021 00:20:38 -0700 Subject: Updated to a24.b-4 --- 0ad-fcollada.patch | 41 --------------------------------- PKGBUILD | 61 ++++++++++++++++++-------------------------------- icu68.patch | 17 -------------- missing-includes.patch | 23 ------------------- zen2-workaround.patch | 29 ------------------------ 5 files changed, 22 insertions(+), 149 deletions(-) delete mode 100644 0ad-fcollada.patch delete mode 100644 icu68.patch delete mode 100644 missing-includes.patch delete mode 100644 zen2-workaround.patch diff --git a/0ad-fcollada.patch b/0ad-fcollada.patch deleted file mode 100644 index 1a5ba23..0000000 --- a/0ad-fcollada.patch +++ /dev/null @@ -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 -- static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT& value); -+ static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT& 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 --xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT& 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 --git a/PKGBUILD b/PKGBUILD index 542c24d..c8309ce 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,72 +7,55 @@ # Arch version lacks additional optimization and hardening flags pkgname=0ad -pkgver=a23.1 -_pkgver=0.0.23b-alpha -pkgrel=14 +pkgver=a24.b +_pkgver=0.0.24b-alpha +pkgrel=4 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('x86_64') url="https://play0ad.com/" license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' - 'libxml2' 'openal' 'sdl2' 'wxgtk3' 'zlib' 'libgl' '0ad-data' 'glu' +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' 'python2' 'libsm') -source=(https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz -icu68.patch - zen2-workaround.patch - missing-includes.patch - 0ad-fcollada.patch) -b2sums=('db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1' - 'e70955d4528184cb5f07fa90916a9caf7e7705a1f8587af5888895548c0115dd9e4e49eaeea6a8e152452b7d52077641a17d8d774e3b6f4c0c1dd9676b547358' - 'c3569351f855c2e528add0789261bfc4bc41a248af885db65b828027294932dd4ab20ef42f29a86401adaabc3c55809ed2e1c89c268719554444b5f73f56e0d8' - '0ec294936fbe185fc172d39813b2d11ea2c1958b022155fb43809731378bb6b8294ccb4648432f6a9cc9e615ecda9a414f01a6cce258c7ea49306f4fd6fc49c3' - '57b5cbb747669419586d9adb8b39f5678448c1c5c6df028f552256399a9a3f5b0fff61173a9dbe5d51274cc44399db23ce09a3d8797104a4f9b4d6faf00b12e4') +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/087a277e66c0456c2d6fdb7403d032ad09cbd18b.patch) +b2sums=('a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666' + '6b77253a0778c5923e1f1b7ce6102c846f2f85f013fc4cbced0b7e94da6daa776ce45c0d6dff93715648c0db5eed587b8cd77fb1162fa34a4cda4c40613ecea7') prepare() { - cd "$srcdir/$pkgname-$_pkgver/" - sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen - - patch -Np0 -i "$srcdir"/icu68.patch - patch -Np0 -i "$srcdir"/zen2-workaround.patch - patch -Np1 -i "$srcdir"/missing-includes.patch + cd "$pkgname-$_pkgver" + + patch -Np1 -i ../$pkgname-rust-1.50.patch - # https://trac.wildfiregames.com/ticket/5709 - patch -Np1 -i "$srcdir"/0ad-fcollada.patch } build() { - cd "$srcdir/$pkgname-$_pkgver/build/workspaces" - - unset CPPFLAGS # for le spidermonkey + cd "$pkgname-$_pkgver/build/workspaces" - # http://site.icu-project.org/download/61#TOC-Migration-Issues - CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1' - - # 0ad is prone to OOM, use 1 thread per 8GB ram + # rust is prone to OOM, use 1 thread per 2GB ram #export MAKEFLAGS="-j32" # -fPIE and -pie break compilation - export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=auto -fPIC" - export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=auto -fPIC" + # -flto=auto and -flto=1 break compilation since a24.b + export CFLAGS="$CFLAGS -O3 -fstack-protector-all -fPIC" + export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -fPIC" - export SDL2_CONFIG="pkg-config sdl2" export WX_CONFIG="wx-config-gtk3" - ./update-workspaces.sh \ + ./update-workspaces.sh $MAKEFLAGS \ --without-pch \ --bindir=/usr/bin \ --libdir=/usr/lib/0ad \ --datadir=/usr/share/0ad/data - cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc" + cd gcc - verbose=1 make + VERBOSE=1 make } package() { + cd "$pkgname-$_pkgver" install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data} - cd "$srcdir/$pkgname-$_pkgver" - install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin" install -Dm755 binaries/system/*.so "${pkgdir}/usr/lib/0ad" diff --git a/icu68.patch b/icu68.patch deleted file mode 100644 index 5e9199d..0000000 --- a/icu68.patch +++ /dev/null @@ -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(); diff --git a/missing-includes.patch b/missing-includes.patch deleted file mode 100644 index c1dea08..0000000 --- a/missing-includes.patch +++ /dev/null @@ -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 - #include - #include -+#include - - #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 -+ - #include "precompiled.h" - - #include "Profiler2GPU.h" diff --git a/zen2-workaround.patch b/zen2-workaround.patch deleted file mode 100644 index ff15362..0000000 --- a/zen2-workaround.patch +++ /dev/null @@ -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) - ------------------------------------------------------------------------- -- cgit v1.2.1