Accepting request 511828 from home:scarabeus_iv:branches:graphics

- Add patch gd-rounding.patch
- Set again the cflags so other archs do not fail testsuite

OBS-URL: https://build.opensuse.org/request/show/511828
OBS-URL: https://build.opensuse.org/package/show/graphics/gd?expand=0&rev=38

gd.spec

@@ -33,8 +33,10 @@ Patch1:         gd-fontpath.patch
 Patch2:         gd-format.patch
 # could be upstreamed
 Patch3:         gd-aliasing.patch
-# PATCH-FIX-UPSTREAM:
+# PATCH-FIX-UPSTREAM: build with newer freetype
 Patch4:         gd-freetype.patch
+# PATCH-FIX-UPSTREAM: fix testfailure on 32b platforms
+Patch5:         gd-rounding.patch
 # needed for tests
 BuildRequires:  dejavu
 BuildRequires:  libjpeg-devel
@@ -95,8 +97,18 @@ the formats accepted for inline images by most browsers.
 %patch2
 %patch3
 %patch4 -p1
+%patch5 -p1
 
 %build
+# ADDITIONAL CFLAGS ARE NEEDED TO FIX TEST FAILURES IN CASE OF i586, BUT HARMLESS TO APPLY GENERALLY FOR ALL ix86
+%ifarch %{ix86}
+export CFLAGS="%{optflags} -msse -mfpmath=sse"
+%else
+%ifnarch x86_64
+export CFLAGS="%{optflags} -ffp-contract=off"
+%endif
+%endif
+
 # without-x -- useless switch which just mangles cflags
 %configure \
 	--disable-silent-rules \
@@ -114,6 +126,11 @@ the formats accepted for inline images by most browsers.
 make %{?_smp_mflags}
 
 %check
+%ifarch %{ix86}
+# See https://github.com/libgd/libgd/issues/359
+XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS"
+%endif
+export XFAIL_TESTS
 make check %{?_smp_mflags}
 
 %install