gentoo resync : 18.08.2019

4 files changed, 86 insertions, 6 deletions

diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index b669943141e8..bfb9028c89bc 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -1,5 +1,6 @@
+AUX 0.4.29-test-rounding.patch 2746 BLAKE2B 6d46b4ac43f24c67d34fc12acb179348d4490079f0f3d09bd2abbf9ba05a4809ffae6edf1475d8eac8f810d70c4dbf832431787d221885e9aa02abbdf0ea7c5b SHA512 a7a3236a7b83989f364a0ae101257eec7df0ae54d0d0c51d8c0403d2a3f700913160c2761a9dc65403fcf8f1baf41a4b7afc5c9d5339bc0d38483f1003e2b251
 DIST orc-0.4.28.tar.xz 469460 BLAKE2B 86fa2d10a33fbffbb2b96827adbddaa81d0baa8135fe21fba338cbcd25a1c1e853873ec1c4ef5c0a32d66ba95f855f1f16ddbc32f68a89e5a98c75b9b0261aa7 SHA512 2ae3100e7d0c03eba9a8a10a8924da4d729e1967b63e5dfdf88c4aee907d7ece82c782d74f4cb7e28a366dd74ce5e1ddc6e2b971e5a2f879b0501cc313b93410
 DIST orc-0.4.29.tar.xz 465076 BLAKE2B f7c81429d95af7031f190a4c3d52959eda1835d3092493e3fa15e4b6719290c1c1f23459448f7c499ba4085ad8d7b9f49e687521d76823a1e8ce6d3916b39a37 SHA512 57aa75bbefa9ba9ffcce97affd504c13c57612e2409863c011555bed6ff6ba224d38ed66b715bf103679a8ee28ddae427db3d78c7b4a2ddfa7dbd72a4fa81726
-EBUILD orc-0.4.28-r1.ebuild 2193 BLAKE2B bac3f7d982f8b488c4668963bcd98cf5d079792c7814e28681072f909da2ebcf553243b206bacff7d777c859d787f5eeaeb8017fbe206066dc3352845f73c705 SHA512 5c975b44e2e2933eb5945336dffbc8ec06f9f0ef65ef89af61ea188bc7029273f8b5ab70b3c2559ea9712c1b5bfcc4878bda2853a5c9f72cdd5a3e1c5681fd03
-EBUILD orc-0.4.29.ebuild 2194 BLAKE2B 5a0640eb9e242ca431331a57fd18bcc9d2696cb33a5c565d5e32db4e9647d42888655e884ae32f4a1b03ee25b0c3baa84ff20f534564c72e079abba933655cd8 SHA512 ba1ad3885150fd3d55d8357c5624e31e34e96ca40b2e5e4a907ed3978caf8f9c4bc2a925124f6bf037229ddac5f2fba40ef5a3b337fcd2cacdd265ed7f0e5845
+EBUILD orc-0.4.28-r1.ebuild 2189 BLAKE2B e54abd5d4002b1587b5cd1010771f8b3787a445018bca3a2e0ffbf0cb3be3411ba22371881021d325d784659197249c02c1d7fa64b878eb52b6afc35e6ee139e SHA512 d462dc9f50f9bca1c202041ed068735a773b76d3f868516c5bb1c684f1fb20a9e32af7f95cde1caed62035a65f58a660d814094d19bf80047903499d8a7ab7c7
+EBUILD orc-0.4.29.ebuild 2404 BLAKE2B 61f9cd0aa19237ee347092e614e8734f3776ee833ea7f4a4d8b8b51b6abacb5c9f355cec535bd8184d455f9817da00b8f5c2e8c6195bbaff58c4edc74c3641f2 SHA512 f80a511043453b0c2b13411ad029fc076a793b26b5234aa2dbac9ec091197c8ebe9180289a9593aabe6f86bec899a5c2628a3dd4488cdc6e572295ad4884d492
 MISC metadata.xml 354 BLAKE2B b24bce431d7ad10e9231e89b522e67de16192ee4e48281b8a17f002692632449ab676cb9df6ff5a22563d6f9657ee6be11e452bac41f8a537c598822efab85d1 SHA512 4f17c4c3faa3f2c5feaefe4727b3500360f7cc5486c794e9a34608c3e437b4e2cc266bc9e0e2b3824952a8da62421fda59e9bc5140ee88898f8f7bdde402762f
diff --git a/dev-lang/orc/files/0.4.29-test-rounding.patch b/dev-lang/orc/files/0.4.29-test-rounding.patch
new file mode 100644
index 000000000000..653132fcb8e0
--- /dev/null
+++ b/dev-lang/orc/files/0.4.29-test-rounding.patch
@@ -0,0 +1,73 @@
+From 73986d82e1ae60b224b401143cd4ce2c452bf326 Mon Sep 17 00:00:00 2001
+From: Doug Nazar <nazard@nazar.ca>
+Date: Wed, 7 Aug 2019 00:11:35 -0400
+Subject: [PATCH] orctest: Switch nearby float comparison to ULP method
+
+---
+ orc-test/orcarray.c | 7 ++-----
+ orc-test/orctest.c  | 8 ++++----
+ 2 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/orc-test/orcarray.c b/orc-test/orcarray.c
+index c0666c5..b27a1f9 100644
+--- a/orc-test/orcarray.c
++++ b/orc-test/orcarray.c
+@@ -211,9 +211,6 @@ orc_array_set_pattern_2 (OrcArray *array, OrcRandomContext *context,
+   }
+ }
+ 
+-#define MIN_NONDENORMAL (1.1754944909521339405e-38)
+-#define MIN_NONDENORMAL_D (2.2250738585072014e-308)
+-
+ int
+ orc_array_compare (OrcArray *array1, OrcArray *array2, int flags)
+ {
+@@ -230,7 +227,7 @@ orc_array_compare (OrcArray *array1, OrcArray *array2, int flags)
+         for (i=0;i<array1->n;i++){
+           if (isnan(a[i]) && isnan(b[i])) continue;
+           if (a[i] == b[i]) continue;
+-          if (fabs(a[i] - b[i]) < MIN_NONDENORMAL) continue;
++          if ((a[i] < 0.0) == (b[i] < 0.0) && abs(*(orc_uint32 *)&a[i] - *(orc_uint32 *)&b[i]) <= 2) continue;
+           return FALSE;
+         }
+       }
+@@ -247,7 +244,7 @@ orc_array_compare (OrcArray *array1, OrcArray *array2, int flags)
+         for (i=0;i<array1->n;i++){
+           if (isnan(a[i]) && isnan(b[i])) continue;
+           if (a[i] == b[i]) continue;
+-          if (fabs(a[i] - b[i]) < MIN_NONDENORMAL_D) continue;
++          if ((a[i] < 0.0) == (b[i] < 0.0) && abs(*(orc_uint64 *)&a[i] - *(orc_uint64 *)&b[i]) <= 2) continue;
+           return FALSE;
+         }
+       }
+diff --git a/orc-test/orctest.c b/orc-test/orctest.c
+index 9f0e942..54658bc 100644
+--- a/orc-test/orctest.c
++++ b/orc-test/orctest.c
+@@ -44,8 +44,6 @@
+ #define snprintf _snprintf
+ #endif
+ 
+-#define MIN_NONDENORMAL (1.1754944909521339405e-38)
+-
+ void _orc_profile_init(void);
+ 
+ OrcRandomContext rand_context;
+@@ -527,10 +525,12 @@ float_compare (OrcArray *array1, OrcArray *array2, int i, int j)
+     case 4:
+       if (isnan(*(float *)ptr1) && isnan(*(float *)ptr2)) return TRUE;
+       if (*(float *)ptr1 == *(float *)ptr2) return TRUE;
+-      if (fabs(*(float *)ptr1 - *(float *)ptr2) < MIN_NONDENORMAL) return TRUE;
++      if ((*(float *)ptr1 < 0.0) == (*(float *)ptr2 < 0.0) && abs(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2) <= 2) return TRUE;
+       return FALSE;
+     case 8:
+-      /* FIXME */
++      if (isnan(*(double *)ptr1) && isnan(*(double *)ptr2)) return TRUE;
++      if (*(double *)ptr1 == *(double *)ptr2) return TRUE;
++      if ((*(double *)ptr1 < 0.0) == (*(double *)ptr2 < 0.0) && abs(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2) <= 2) return TRUE;
+       return FALSE;
+   }
+   return FALSE;
+-- 
+2.21.0
+
diff --git a/dev-lang/orc/orc-0.4.28-r1.ebuild b/dev-lang/orc/orc-0.4.28-r1.ebuild
index f3c0d8f6779d..08b0162607cb 100644
--- a/dev-lang/orc/orc-0.4.28-r1.ebuild
+++ b/dev-lang/orc/orc-0.4.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ DOCS=( README RELEASE )
 src_prepare() {
 	default
 
-	# Do not build examples	
+	# Do not build examples
 	sed -e '/SUBDIRS/ s:examples::' \
 		-i Makefile.am Makefile.in || die
 }
diff --git a/dev-lang/orc/orc-0.4.29.ebuild b/dev-lang/orc/orc-0.4.29.ebuild
index 974ea15e13d4..9c9f219b028d 100644
--- a/dev-lang/orc/orc-0.4.29.ebuild
+++ b/dev-lang/orc/orc-0.4.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples pax_kernel static-libs"
 
 RDEPEND=""
@@ -22,10 +22,16 @@ DEPEND="${RDEPEND}
 
 DOCS=( README RELEASE )
 
+PATCHES=(
+	# Fixes some tests on various platforms (AMD Phenom, ARM, etc) with more suitable
+	# float comparison - https://gitlab.freedesktop.org/gstreamer/orc/issues/18
+	"${FILESDIR}"/${PV}-test-rounding.patch
+)
+
 src_prepare() {
 	default
 
-	# Do not build examples	
+	# Do not build examples
 	sed -e '/SUBDIRS/ s:examples::' \
 		-i Makefile.am Makefile.in || die
 }