diff --git a/srcpkgs/goxel/patches/util_sseb.patch b/srcpkgs/goxel/patches/util_sseb.patch deleted file mode 100644 index 8b989d1a65e..00000000000 --- a/srcpkgs/goxel/patches/util_sseb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ext_src/cycles/src/util/util_sseb.h 2018-04-25 09:48:18.000000000 +0200 -+++ ext_src/cycles/src/util/util_sseb.h 2018-08-23 11:27:31.552028617 +0200 -@@ -119,7 +119,7 @@ - __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); } - - template __forceinline const sseb shuffle( const sseb& a ) { -- return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)); -+ return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0))); - } - - template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) { diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template index 604943b09cc..4269331402c 100644 --- a/srcpkgs/goxel/template +++ b/srcpkgs/goxel/template @@ -1,6 +1,6 @@ # Template file for 'goxel' pkgname=goxel -version=0.8.2 +version=0.8.3 revision=1 build_style=scons make_build_args="debug=0 werror=0" @@ -11,22 +11,29 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://guillaumechereau.github.io/goxel/" distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz" -checksum=4f8297560e356cb69469e0a23bcb4e9c4e8549766a0466ffeaa0c9cfb7a04049 +checksum=a99e92ae4812a57450ef853626c95bcdb9abfe68885ae68f5541c77f4952991c case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone";; - i686*) make_build_args+=" cycles=0";; +esac + +case "$XBPS_TARGET_MACHINE" in + armv6*) makedepends+=" libatomic-devel";; esac pre_build() { if [ "$CROSS_BUILD" ];then - sed -i SConstruct \ + vsed -i SConstruct \ -e "/conf = env.Configure()/ a env.Replace(CC = \"$CC\")" \ -e "/conf = env.Configure()/ a env.Replace(CXX = \"$CXX\")" fi case $XBPS_TAGET_MACHINE in x86_64*|i686*);; - *) sed -i SConstruct -e "s/-msse2 //";; + *) vsed -i SConstruct -e "s/-msse2 //";; + esac + case $XBPS_TARGET_MACHINE in + armv6*) vsed -i SConstruct \ + -e "/conf = env.Configure()/ a env.Append(LIBS='atomic')" esac }