* Remove -DENABLE_ZLIB=ON (it is no longer optional).
* Replace -DENABLE_CMS=lcms2 with -DENABLE_LCMS=ON.
* Replace the splash PACKAGECONFIG with boost (splash is no longer
optional).
* Correct the options for the nss and tiff PACKAGECONFIGs.
This avoids the following CMake warnings:
Manually-specified variables were not used by the project:
ENABLE_CMS
ENABLE_SPLASH
ENABLE_ZLIB
WITH_NSS3
WITH_TIFF
Signed-off-by: Peter Kjellerstedt <[email protected]>
---
meta-oe/recipes-support/poppler/poppler_24.09.0.bb | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-support/poppler/poppler_24.09.0.bb
b/meta-oe/recipes-support/poppler/poppler_24.09.0.bb
index 920d13f0f6..fb6b534cf4 100644
--- a/meta-oe/recipes-support/poppler/poppler_24.09.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_24.09.0.bb
@@ -14,15 +14,15 @@ DEPENDS = "fontconfig zlib cairo lcms glib-2.0
glib-2.0-native"
inherit cmake pkgconfig gobject-introspection
-PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash"
+PACKAGECONFIG ??= "boost jpeg nss openjpeg png tiff"
+PACKAGECONFIG[boost] = "-DENABLE_BOOST=ON,-DENABLE_BOOST=OFF,boost"
PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON
-DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg"
PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng"
-PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff"
+PACKAGECONFIG[tiff] = "-DENABLE_LIBTIFF=ON,-DENABLE_LIBTIFF=OFF,tiff"
PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl"
PACKAGECONFIG[openjpeg] =
"-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg"
PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native"
-PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss"
-PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON
-DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost"
+PACKAGECONFIG[nss] = "-DENABLE_NSS3=ON,-DENABLE_NSS3=OFF,nss"
PACKAGECONFIG[gpgme] = "-DENABLE_GPGME=ON,-DENABLE_GPGME=OFF,gpgme"
PACKAGECONFIG[qt6] = "-DENABLE_QT6=ON,-DENABLE_QT6=OFF,qtbase"
@@ -32,10 +32,9 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5',
'cmake_qt5', '', d)}
SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
EXTRA_OECMAKE += " \
- -DENABLE_CMS=lcms2 \
+ -DENABLE_LCMS=ON \
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-DBUILD_GTK_TESTS=OFF \
- -DENABLE_ZLIB=ON \
-DRUN_GPERF_IF_PRESENT=OFF \
-DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \
${@bb.utils.contains('GI_DATA_ENABLED', 'True',
'-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#112183):
https://lists.openembedded.org/g/openembedded-devel/message/112183
Mute This Topic: https://lists.openembedded.org/mt/108360325/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
