diff --git a/srcpkgs/pioneer/patches/i686-alignof.patch b/srcpkgs/pioneer/patches/i686-alignof.patch deleted file mode 100644 index a28367b8fe5..00000000000 --- a/srcpkgs/pioneer/patches/i686-alignof.patch +++ /dev/null @@ -1,23 +0,0 @@ -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: diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template index ad0f1955948..40812890ec7 100644 --- a/srcpkgs/pioneer/template +++ b/srcpkgs/pioneer/template @@ -1,8 +1,9 @@ # Template file for 'pioneer' pkgname=pioneer -version=20200203 -revision=2 +version=20210203 +revision=1 build_style=cmake +make_build_target="all build-data" configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer -DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON" hostmakedepends="automake pkg-config" @@ -14,7 +15,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://pioneerspacesim.net" distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz" -checksum=3055d63c1bd3377c3794eee830a8adbd650b178bad9e927531e38cb5d5838694 +checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" pioneer-modelcompiler"