Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/
Date: Sat, 03 Jun 2017 15:38:50
Message-Id: 1496504315.bdb1a320ada8a638591259e36535b46835491991.kensington@gentoo
1 commit: bdb1a320ada8a638591259e36535b46835491991
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 3 15:38:20 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 3 15:38:35 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb1a320
7
8 app-text/poppler: fix build with jpeg or jpeg2k USE flags disabled
9
10 Thanks to those that suggested solutions on the bugs.
11
12 Gentoo-bug: 619568
13 Gentoo-bug: 619720
14 Package-Manager: Portage-2.3.5, Repoman-2.3.2
15
16 app-text/poppler/poppler-0.55.0-r1.ebuild | 7 ++++++-
17 1 file changed, 6 insertions(+), 1 deletion(-)
18
19 diff --git a/app-text/poppler/poppler-0.55.0-r1.ebuild b/app-text/poppler/poppler-0.55.0-r1.ebuild
20 index df90008fc25..d429f13df27 100644
21 --- a/app-text/poppler/poppler-0.55.0-r1.ebuild
22 +++ b/app-text/poppler/poppler-0.55.0-r1.ebuild
23 @@ -111,10 +111,15 @@ src_configure() {
24 $(cmake-utils_use_find_package qt5 Qt5Core)
25 -DWITH_TIFF="$(usex tiff)"
26 )
27 + if use jpeg; then
28 + mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
29 + else
30 + mycmakeargs+=(-DENABLE_DCTDECODER=none)
31 + fi
32 if use jpeg2k; then
33 mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
34 else
35 - mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
36 + mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
37 fi
38 if use lcms; then
39 mycmakeargs+=(-DENABLE_CMS=lcms2)