[arch-commits] Commit in 0ad/repos/community-x86_64 (7 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Sun May 17 23:40:10 UTC 2020


    Date: Sunday, May 17, 2020 @ 23:40:09
  Author: svenstaro
Revision: 629146

archrelease: copy trunk to community-x86_64

Added:
  0ad/repos/community-x86_64/0ad-fcollada.patch
    (from rev 629144, 0ad/trunk/0ad-fcollada.patch)
  0ad/repos/community-x86_64/PKGBUILD
    (from rev 629145, 0ad/trunk/PKGBUILD)
  0ad/repos/community-x86_64/missing-includes.patch
    (from rev 629145, 0ad/trunk/missing-includes.patch)
  0ad/repos/community-x86_64/zen2-workaround.patch
    (from rev 629145, 0ad/trunk/zen2-workaround.patch)
Deleted:
  0ad/repos/community-x86_64/PKGBUILD
  0ad/repos/community-x86_64/missing-includes.patch
  0ad/repos/community-x86_64/zen2-workaround.patch

------------------------+
 0ad-fcollada.patch     |   41 ++++++++++++++
 PKGBUILD               |  132 ++++++++++++++++++++++++-----------------------
 missing-includes.patch |   46 ++++++++--------
 zen2-workaround.patch  |   58 ++++++++++----------
 4 files changed, 162 insertions(+), 115 deletions(-)

Copied: 0ad/repos/community-x86_64/0ad-fcollada.patch (from rev 629144, 0ad/trunk/0ad-fcollada.patch)
===================================================================
--- 0ad-fcollada.patch	                        (rev 0)
+++ 0ad-fcollada.patch	2020-05-17 23:40:09 UTC (rev 629146)
@@ -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	2020-05-17 23:40:04 UTC (rev 629145)
+++ PKGBUILD	2020-05-17 23:40:09 UTC (rev 629146)
@@ -1,63 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
-# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
-pkgname=0ad
-pkgver=a23.1
-_pkgver=0.0.23b-alpha
-pkgrel=9
-pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
-arch=('x86_64')
-url="http://play0ad.com/"
-license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
-         'libxml2' 'openal' 'sdl2' 'wxgtk' '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)
-sha512sums=('82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135'
-            '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"/zen2-workaround.patch
-  patch -Np1 -i "$srcdir"/missing-includes.patch
-}
-
-build() {
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
-
-  unset CPPFLAGS # for le spidermonkey
-
-  # http://site.icu-project.org/download/61#TOC-Migration-Issues
-  CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
-
-  export SDL2_CONFIG="pkg-config sdl2"
-  ./update-workspaces.sh \
-      --without-pch \
-      --bindir=/usr/bin \
-      --libdir=/usr/lib/0ad \
-      --datadir=/usr/share/0ad/data
-
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
-  verbose=1 make
-}
-
-package() {
-  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"
-
-  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 629145, 0ad/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-17 23:40:09 UTC (rev 629146)
@@ -0,0 +1,69 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
+pkgname=0ad
+pkgver=a23.1
+_pkgver=0.0.23b-alpha
+pkgrel=10
+pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
+arch=('x86_64')
+url="http://play0ad.com/"
+license=('GPL2' 'CCPL')
+depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
+         '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
+        0ad-fcollada.patch)
+sha512sums=('82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135'
+            '1aaab2a71b363b0acbb6beb724bbb4c4b3a8fc607c7958f65e9653e29dedfc502f84262955d1b5ba5dc54b2c97a3882809967e74dfd3de54ae09ee6b08816a90'
+            '4cd709847f50de291a7eb5f2049e06f6725799a793d845ac40b1ffdd8f3674d426736dc7ea226dc9f261e8edc3c68972edc704f4aa42b05ed37f6866b5680ddd'
+            '06b0641698c89bb0331f5af0254f0e224877580e196fc030bbe37140926c93d5392512f129dfd5922fcc588a28cad1832e94f36a523027678880b5b0522cff34')
+
+prepare() {
+  cd "$srcdir/$pkgname-$_pkgver/"
+  sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen
+
+  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() {
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
+
+  unset CPPFLAGS # for le spidermonkey
+
+  # http://site.icu-project.org/download/61#TOC-Migration-Issues
+  CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
+  export SDL2_CONFIG="pkg-config sdl2"
+  export WX_CONFIG="wx-config-gtk3"
+  ./update-workspaces.sh \
+      --without-pch \
+      --bindir=/usr/bin \
+      --libdir=/usr/lib/0ad \
+      --datadir=/usr/share/0ad/data
+
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
+
+  verbose=1 make
+}
+
+package() {
+  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"
+
+  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: missing-includes.patch
===================================================================
--- missing-includes.patch	2020-05-17 23:40:04 UTC (rev 629145)
+++ missing-includes.patch	2020-05-17 23:40:09 UTC (rev 629146)
@@ -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 629145, 0ad/trunk/missing-includes.patch)
===================================================================
--- missing-includes.patch	                        (rev 0)
+++ missing-includes.patch	2020-05-17 23:40:09 UTC (rev 629146)
@@ -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	2020-05-17 23:40:04 UTC (rev 629145)
+++ zen2-workaround.patch	2020-05-17 23:40:09 UTC (rev 629146)
@@ -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 629145, 0ad/trunk/zen2-workaround.patch)
===================================================================
--- zen2-workaround.patch	                        (rev 0)
+++ zen2-workaround.patch	2020-05-17 23:40:09 UTC (rev 629146)
@@ -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)
+
+------------------------------------------------------------------------


More information about the arch-commits mailing list