dilfridge 15/05/24 18:45:23 Added: poppler-0.33.0-openjpeg2.patch Log: Use libopenjpeg:2 and workaround broken slotting (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0B08240A96F66571)
Revision Changes Path 1.1 app-text/poppler/files/poppler-0.33.0-openjpeg2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch?rev=1.1&content-type=text/plain Index: poppler-0.33.0-openjpeg2.patch =================================================================== Sadly the CMake side of openjpeg slotting in Gentoo is broken. To reliably find openjpeg:2 we need to use pkg-config. diff -ruN poppler-0.33.0.orig/CMakeLists.txt poppler-0.33.0/CMakeLists.txt --- poppler-0.33.0.orig/CMakeLists.txt 2015-05-14 20:22:31.000000000 +0200 +++ poppler-0.33.0/CMakeLists.txt 2015-05-24 20:39:30.163709257 +0200 @@ -172,7 +172,7 @@ set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND}) set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND}) elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2") - find_package(LIBOPENJPEG2) + pkg_check_modules(LIBOPENJPEG2 libopenjp2) set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND}) set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND}) endif()
