summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb2
-rw-r--r--meta-oe/recipes-support/poppler/poppler_0.86.1.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
index 91a7e1a36d..db545028f2 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
@@ -19,7 +19,7 @@ PE = "1"
19 19
20inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg 20inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg
21 21
22PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}" 22PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
23 23
24PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" 24PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
25 25
diff --git a/meta-oe/recipes-support/poppler/poppler_0.86.1.bb b/meta-oe/recipes-support/poppler/poppler_0.86.1.bb
index 96006dc8db..073edef86e 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.86.1.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.86.1.bb
@@ -14,7 +14,7 @@ DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
14 14
15inherit cmake pkgconfig gobject-introspection 15inherit cmake pkgconfig gobject-introspection
16 16
17PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" 17PACKAGECONFIG ??= "jpeg openjpeg png tiff nss"
18PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" 18PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg"
19PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" 19PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng"
20PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" 20PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff"