| 1 |
commit: bcdc0b042764a52730954c29fda8d3aa36674c24 |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Feb 5 22:19:31 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 5 22:21:25 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcdc0b04 |
| 7 |
|
| 8 |
media-video/mpv: fix float comparisons in tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/628252 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/7052 |
| 12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
...mpv-0.25.0-fix-float-comparisons-in-tests.patch | 61 ++++++++++++++++++++++ |
| 16 |
media-video/mpv/mpv-0.25.0-r2.ebuild | 3 +- |
| 17 |
media-video/mpv/mpv-0.26.0.ebuild | 3 +- |
| 18 |
media-video/mpv/mpv-0.27.0-r1.ebuild | 3 +- |
| 19 |
media-video/mpv/mpv-0.28.0.ebuild | 1 + |
| 20 |
5 files changed, 68 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch b/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..5498b99a3c7 |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch |
| 27 |
@@ -0,0 +1,61 @@ |
| 28 |
+commit f4f24c105f9c132e84cba9a9707acc261033a816 |
| 29 |
+Author: Ilya Tumaykin <itumaykin@×××××.com> |
| 30 |
+Date: Thu Feb 1 14:05:06 2018 +0300 |
| 31 |
+ |
| 32 |
+tests: stop comparing floats against DBL_EPSILON, use FLT_EPSILON |
| 33 |
+ |
| 34 |
+Fixes #5253. |
| 35 |
+ |
| 36 |
+diff --git a/test/gl_video.c b/test/gl_video.c |
| 37 |
+index a2d2577e25..6b5f3a7060 100644 |
| 38 |
+--- a/test/gl_video.c |
| 39 |
++++ b/test/gl_video.c |
| 40 |
+@@ -4,22 +4,22 @@ |
| 41 |
+ static void test_scale_ambient_lux_limits(void **state) { |
| 42 |
+ float x; |
| 43 |
+ x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 16.0); |
| 44 |
+- assert_double_equal(x, 2.40f); |
| 45 |
++ assert_float_equal(x, 2.40f); |
| 46 |
+ |
| 47 |
+ x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 64.0); |
| 48 |
+- assert_double_equal(x, 1.961f); |
| 49 |
++ assert_float_equal(x, 1.961f); |
| 50 |
+ } |
| 51 |
+ |
| 52 |
+ static void test_scale_ambient_lux_sign(void **state) { |
| 53 |
+ float x; |
| 54 |
+ x = gl_video_scale_ambient_lux(16.0, 64.0, 1.961, 2.40, 64.0); |
| 55 |
+- assert_double_equal(x, 2.40f); |
| 56 |
++ assert_float_equal(x, 2.40f); |
| 57 |
+ } |
| 58 |
+ |
| 59 |
+ static void test_scale_ambient_lux_clamping(void **state) { |
| 60 |
+ float x; |
| 61 |
+ x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 0.0); |
| 62 |
+- assert_double_equal(x, 2.40f); |
| 63 |
++ assert_float_equal(x, 2.40f); |
| 64 |
+ } |
| 65 |
+ |
| 66 |
+ static void test_scale_ambient_lux_log10_midpoint(void **state) { |
| 67 |
+@@ -27,7 +27,7 @@ static void test_scale_ambient_lux_log10_midpoint(void **state) { |
| 68 |
+ // 32 corresponds to the the midpoint after converting lux to the log10 scale |
| 69 |
+ x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 32.0); |
| 70 |
+ float mid_gamma = (2.40 - 1.961) / 2 + 1.961; |
| 71 |
+- assert_double_equal(x, mid_gamma); |
| 72 |
++ assert_float_equal(x, mid_gamma); |
| 73 |
+ } |
| 74 |
+ |
| 75 |
+ int main(void) { |
| 76 |
+diff --git a/test/test_helpers.h b/test/test_helpers.h |
| 77 |
+index 7a61da82ea..49328f623f 100644 |
| 78 |
+--- a/test/test_helpers.h |
| 79 |
++++ b/test/test_helpers.h |
| 80 |
+@@ -10,6 +10,7 @@ |
| 81 |
+ #include <math.h> |
| 82 |
+ #include <float.h> |
| 83 |
+ |
| 84 |
+-#define assert_double_equal(a, b) assert_true(fabs(a - b) <= DBL_EPSILON) |
| 85 |
++#define assert_double_equal(a, b) assert_true(fabs((a) - (b)) <= DBL_EPSILON * fmax(fabs(a), fabs(b))) |
| 86 |
++#define assert_float_equal(a, b) assert_true(fabsf((a) - (b)) <= FLT_EPSILON * fmaxf(fabsf(a), fabsf(b))) |
| 87 |
+ |
| 88 |
+ #endif |
| 89 |
|
| 90 |
diff --git a/media-video/mpv/mpv-0.25.0-r2.ebuild b/media-video/mpv/mpv-0.25.0-r2.ebuild |
| 91 |
index c5ddc81267d..c57ddd036dc 100644 |
| 92 |
--- a/media-video/mpv/mpv-0.25.0-r2.ebuild |
| 93 |
+++ b/media-video/mpv/mpv-0.25.0-r2.ebuild |
| 94 |
@@ -1,4 +1,4 @@ |
| 95 |
-# Copyright 1999-2017 Gentoo Foundation |
| 96 |
+# Copyright 1999-2018 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
|
| 99 |
EAPI=6 |
| 100 |
@@ -136,6 +136,7 @@ RDEPEND="${COMMON_DEPEND} |
| 101 |
PATCHES=( |
| 102 |
"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" |
| 103 |
"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" |
| 104 |
+ "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" |
| 105 |
) |
| 106 |
|
| 107 |
mpv_check_compiler() { |
| 108 |
|
| 109 |
diff --git a/media-video/mpv/mpv-0.26.0.ebuild b/media-video/mpv/mpv-0.26.0.ebuild |
| 110 |
index 164672738f8..c3ff2f124af 100644 |
| 111 |
--- a/media-video/mpv/mpv-0.26.0.ebuild |
| 112 |
+++ b/media-video/mpv/mpv-0.26.0.ebuild |
| 113 |
@@ -1,4 +1,4 @@ |
| 114 |
-# Copyright 1999-2017 Gentoo Foundation |
| 115 |
+# Copyright 1999-2018 Gentoo Foundation |
| 116 |
# Distributed under the terms of the GNU General Public License v2 |
| 117 |
|
| 118 |
EAPI=6 |
| 119 |
@@ -141,6 +141,7 @@ RDEPEND="${COMMON_DEPEND} |
| 120 |
PATCHES=( |
| 121 |
"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" |
| 122 |
"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" |
| 123 |
+ "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" |
| 124 |
) |
| 125 |
|
| 126 |
pkg_setup() { |
| 127 |
|
| 128 |
diff --git a/media-video/mpv/mpv-0.27.0-r1.ebuild b/media-video/mpv/mpv-0.27.0-r1.ebuild |
| 129 |
index fd90c09f204..558adb5ce72 100644 |
| 130 |
--- a/media-video/mpv/mpv-0.27.0-r1.ebuild |
| 131 |
+++ b/media-video/mpv/mpv-0.27.0-r1.ebuild |
| 132 |
@@ -1,4 +1,4 @@ |
| 133 |
-# Copyright 1999-2017 Gentoo Foundation |
| 134 |
+# Copyright 1999-2018 Gentoo Foundation |
| 135 |
# Distributed under the terms of the GNU General Public License v2 |
| 136 |
|
| 137 |
EAPI=6 |
| 138 |
@@ -141,6 +141,7 @@ RDEPEND="${COMMON_DEPEND} |
| 139 |
PATCHES=( |
| 140 |
"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" |
| 141 |
"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" |
| 142 |
+ "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" |
| 143 |
) |
| 144 |
|
| 145 |
pkg_setup() { |
| 146 |
|
| 147 |
diff --git a/media-video/mpv/mpv-0.28.0.ebuild b/media-video/mpv/mpv-0.28.0.ebuild |
| 148 |
index 9e4020ca823..23b6694770d 100644 |
| 149 |
--- a/media-video/mpv/mpv-0.28.0.ebuild |
| 150 |
+++ b/media-video/mpv/mpv-0.28.0.ebuild |
| 151 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 152 |
|
| 153 |
PATCHES=( |
| 154 |
"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" |
| 155 |
+ "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" |
| 156 |
) |
| 157 |
|
| 158 |
pkg_setup() { |
Archives