From 3281deafc934c04c3fe7b65d23b88671de7f2324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 23 Aug 2018 11:34:08 +0200
Subject: [PATCH] goxel: fix build w/ gcc-8.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
---
 srcpkgs/goxel/patches/util_sseb.patch | 11 +++++++++++
 srcpkgs/goxel/template                | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/goxel/patches/util_sseb.patch

diff --git a/srcpkgs/goxel/patches/util_sseb.patch b/srcpkgs/goxel/patches/util_sseb.patch
new file mode 100644
index 00000000000..8b989d1a65e
--- /dev/null
+++ b/srcpkgs/goxel/patches/util_sseb.patch
@@ -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 ) {
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 86bfc033030..77c38903785 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -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