[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/

[Michael Palimaka]

commit:     bdb1a320ada8a638591259e36535b46835491991
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 15:38:20 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 15:38:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb1a320

app-text/poppler: fix build with jpeg or jpeg2k USE flags disabled

Thanks to those that suggested solutions on the bugs.

Gentoo-bug: 619568
Gentoo-bug: 619720
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-text/poppler/poppler-0.55.0-r1.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-text/poppler/poppler-0.55.0-r1.ebuild 
b/app-text/poppler/poppler-0.55.0-r1.ebuild
index df90008fc25..d429f13df27 100644
--- a/app-text/poppler/poppler-0.55.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.55.0-r1.ebuild
@@ -111,10 +111,15 @@ src_configure() {
                $(cmake-utils_use_find_package qt5 Qt5Core)
                -DWITH_TIFF="$(usex tiff)"
        )
+       if use jpeg; then
+               mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+       else
+               mycmakeargs+=(-DENABLE_DCTDECODER=none)
+       fi
        if use jpeg2k; then
                mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
        else
-               mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+               mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
        fi
        if use lcms; then
                mycmakeargs+=(-DENABLE_CMS=lcms2)