moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

pioneer: add patch for i686

Browse source
This commit is contained in:
John 2020-02-06 15:52:24 +01:00
parent 7229456e28
commit e9f3004514
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
srcpkgs/pioneer/patches/i686-alignof.patch Normal file
View file

@ -0,0 +1,23 @@
https://github.com/pioneerspacesim/pioneer/issues/4691
---
--- src/scenegraph/Serializer.orig.h 2019-10-09 13:49:04.000000000 +0200
+++ src/scenegraph/Serializer.h 2019-10-09 18:47:05.238671730 +0200
@@ -23,14 +23,14 @@
// where possible, prefer serializing state information via JSON instead.
namespace Serializer {
static_assert((sizeof(Uint32) == 4 && alignof(Uint32) == 4), "Int32 is sized differently on this platform and will not serialize properly.");
- static_assert((sizeof(Uint64) == 8 && alignof(Uint64) == 8), "Int64 is sized differently on this platform and will not serialize properly.");
+ static_assert((sizeof(Uint64) == 8 && alignof(Uint64) <= 8), "Int64 is sized differently on this platform and will not serialize properly.");
static_assert((sizeof(Color) == 4 && alignof(Color) == 1), "Color is padded differently on this platform and will not serialize properly.");
static_assert((sizeof(vector2f) == 8 && alignof(vector2f) == 4), "Vector2f is padded differently on this platform and will not serialize properly.");
- static_assert((sizeof(vector2d) == 16 && alignof(vector2d) == 8), "Vector2d is padded differently on this platform and will not serialize properly.");
+ static_assert((sizeof(vector2d) == 16 && alignof(vector2d) <= 8), "Vector2d is padded differently on this platform and will not serialize properly.");
static_assert((sizeof(vector3f) == 12 && alignof(vector3f) == 4), "Vector3f is padded differently on this platform and will not serialize properly.");
- static_assert((sizeof(vector3d) == 24 && alignof(vector3d) == 8), "Vector3d is padded differently on this platform and will not serialize properly.");
+ static_assert((sizeof(vector3d) == 24 && alignof(vector3d) <= 8), "Vector3d is padded differently on this platform and will not serialize properly.");
static_assert((sizeof(Quaternionf) == 16 && alignof(Quaternionf) == 4), "Quaternionf is padded differently on this platform and will not serialize properly.");
- static_assert((sizeof(Aabb) == 56 && alignof(Aabb) == 8), "Aabb is padded differently on this platform and will not serialize properly.");
+ static_assert((sizeof(Aabb) == 56 && alignof(Aabb) <= 8), "Aabb is padded differently on this platform and will not serialize properly.");
class Writer {
public:

4
srcpkgs/pioneer/template
View file

@ -16,10 +16,6 @@ homepage="https://pioneerspacesim.net"
distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz" distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
checksum=3055d63c1bd3377c3794eee830a8adbd650b178bad9e927531e38cb5d5838694 checksum=3055d63c1bd3377c3794eee830a8adbd650b178bad9e927531e38cb5d5838694
case "$XBPS_TARGET_MACHINE" in
i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/22891/steps/shell_3/logs/stdio" ;;
esac
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" pioneer-modelcompiler" hostmakedepends+=" pioneer-modelcompiler"
fi fi