diff options
-rw-r--r-- | 0ad-fcollada.patch | 41 | ||||
-rw-r--r-- | PKGBUILD | 18 |
2 files changed, 53 insertions, 6 deletions
diff --git a/0ad-fcollada.patch b/0ad-fcollada.patch new file mode 100644 index 0000000..1a5ba23 --- /dev/null +++ b/0ad-fcollada.patch @@ -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;
+-}
@@ -9,21 +9,23 @@ pkgname=0ad pkgver=a23.1 _pkgver=0.0.23b-alpha -pkgrel=9 +pkgrel=10 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' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' + 'libxml2' 'openal' 'sdl2' 'wxgtk3' 'zlib' 'libgl' '0ad-data' 'glu' '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 zen2-workaround.patch - missing-includes.patch) + missing-includes.patch + 0ad-fcollada.patch) b2sums=('db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1' 'c3569351f855c2e528add0789261bfc4bc41a248af885db65b828027294932dd4ab20ef42f29a86401adaabc3c55809ed2e1c89c268719554444b5f73f56e0d8' - '0ec294936fbe185fc172d39813b2d11ea2c1958b022155fb43809731378bb6b8294ccb4648432f6a9cc9e615ecda9a414f01a6cce258c7ea49306f4fd6fc49c3') + '0ec294936fbe185fc172d39813b2d11ea2c1958b022155fb43809731378bb6b8294ccb4648432f6a9cc9e615ecda9a414f01a6cce258c7ea49306f4fd6fc49c3' + '57b5cbb747669419586d9adb8b39f5678448c1c5c6df028f552256399a9a3f5b0fff61173a9dbe5d51274cc44399db23ce09a3d8797104a4f9b4d6faf00b12e4') prepare() { cd "$srcdir/$pkgname-$_pkgver/" @@ -31,6 +33,9 @@ prepare() { patch -Np0 -i "$srcdir"/zen2-workaround.patch patch -Np1 -i "$srcdir"/missing-includes.patch + + # https://trac.wildfiregames.com/ticket/5709 + patch -Np1 -i "$srcdir"/0ad-fcollada.patch } build() { @@ -42,10 +47,11 @@ build() { CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1' # -fPIE and -pie break compilation - export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=4 -fPIC" - export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=4 -fPIC" + export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=2 -fPIC" + export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=2 -fPIC" export SDL2_CONFIG="pkg-config sdl2" + export WX_CONFIG="wx-config-gtk3" ./update-workspaces.sh \ --without-pch \ --bindir=/usr/bin \ |