snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

goxel: fix build w/ gcc-8.2.0 

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2018-08-23 11:34:08 +02:00
parent bb58eb00f3
commit 3281deafc9
No known key found for this signature in database
GPG Key ID: 6764EC32352D0647
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
srcpkgs/goxel/patches/util_sseb.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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<size_t i0, size_t i1, size_t i2, size_t i3> __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 ) {

18
srcpkgs/goxel/template
View File

@ -1,7 +1,7 @@
# Template file for 'goxel'
pkgname=goxel
version=0.8.0
revision=1
revision=2
build_style=scons
make_build_args="debug=0 werror=0"
hostmakedepends="pkg-config"
@ -13,17 +13,21 @@ homepage="https://guillaumechereau.github.io/goxel/"
distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
checksum=2fb9328e27b4f24f2ddff9e79f01832661fd626b52fa0079039cbb64a3e704ca
if [ "$CROSS_BUILD" ];then
pre_build() {
sed -i -e "/conf = env.Configure()/ a env.Replace(CC = \"$CC\")\nenv.Replace(CXX = \"$CXX\")" SConstruct
}
fi
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone";;
i686*) make_build_args+=" cycles=0";;
esac
pre_build() {
if [ "$CROSS_BUILD" ];then
sed -i SConstruct \
-e "/conf = env.Configure()/ a env.Replace(CC = \"$CC\")" \
-e "/conf = env.Configure()/ a env.Replace(CXX = \"$CXX\")"
fi
sed -i Makefile \
-e "s;scons debug=0;& werror=0;"
}
do_install() {
sed -i 's|${SNAP}/icon.png|goxel.png|' snap/gui/goxel.desktop
vbin goxel