Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/
Date: Sat, 08 Aug 2020 04:42:51
Message-Id: 1596861728.c3b6a9195cdcad8e233e5f570114c8ff18f68327.sam@gentoo
1 commit: c3b6a9195cdcad8e233e5f570114c8ff18f68327
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 8 04:42:00 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 8 04:42:08 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b6a919
7
8 media-libs/libjpeg-turbo: fix tests on ppc
9
10 Fix tests on PPC by applying upstream-recommended
11 workaround (-DFLOATTEST=64bit).
12
13 See https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
14 for details.
15
16 Bug: https://bugs.gentoo.org/727010
17 Closes: https://bugs.gentoo.org/715406
18 Thanks-to: ernsteiswuerfel <erhard_f <AT> mailbox.org>
19 Package-Manager: Portage-3.0.1, Repoman-2.3.23
20 Signed-off-by: Sam James <sam <AT> gentoo.org>
21
22 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild | 9 +++++++++
23 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild | 9 +++++++++
24 2 files changed, 18 insertions(+)
25
26 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
27 index c929f7d5bde..4a05e15dcda 100644
28 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
29 +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
30 @@ -81,7 +81,16 @@ multilib_src_configure() {
31 -DWITH_JAVA="$(multilib_native_usex java)"
32 -DWITH_MEM_SRCDST=ON
33 )
34 +
35 [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
36 +
37 + if use ppc ; then
38 + # Workaround recommended by upstream:
39 + # https://bugs.gentoo.org/715406#c9
40 + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
41 + mycmakeargs+=( -DFLOATTEST="64bit" )
42 + fi
43 +
44 cmake_src_configure
45 }
46
47
48 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild
49 index 66f92e41232..c344f315c60 100644
50 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild
51 +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild
52 @@ -77,7 +77,16 @@ multilib_src_configure() {
53 -DWITH_JAVA="$(multilib_native_usex java)"
54 -DWITH_MEM_SRCDST=ON
55 )
56 +
57 [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
58 +
59 + if use ppc ; then
60 + # Workaround recommended by upstream:
61 + # https://bugs.gentoo.org/715406#c9
62 + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
63 + mycmakeargs+=( -DFLOATTEST="64bit" )
64 + fi
65 +
66 cmake_src_configure
67 }