This changeset allows PACKAGECONFIG to determine the configuration of libgdiplus as it applies to jpeg, gif, exif, and tiff.
Signed-off-by: Barry Grussling <ba...@grussling.com> --- README.md | 14 ++++++++++++-- recipes-mono/libgdiplus/libgdiplus_2.10.8.bb | 8 +++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2adac04..0e25669 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,19 @@ Feedback on testing with armhf would be appreciated and incorporated into this R ## Layer Dependencies -The libgdiplus recipe has a dependency on the giflib recipe which is provided by the meta-oe layer. +The libgdiplus recipe has a soft dependency on the giflib recipe which is provided by the meta-oe layer. +These dependencies can be controlled using the PACKAGECONFIG feature of yocto. libgdiplus +recognizes the following options: -Thus if this recipe is included in an image, for example when building core-image-mono, then +"jpeg exif gif tiff" + +These can be controlled via the .bbappend mechanism or by adding: +PACKAGECONFIG_pn-mono = "" +PACKAGECONFIG_pn-mono-native = "" + +directives to the local.conf + +If this recipe is included in an image with gif enabled, for example when building core-image-mono, then conf/bblayers needs to be modified to include meta-oe, e.g. BBLAYERS = " \ diff --git a/recipes-mono/libgdiplus/libgdiplus_2.10.8.bb b/recipes-mono/libgdiplus/libgdiplus_2.10.8.bb index fecf7dc..75adfbf 100644 --- a/recipes-mono/libgdiplus/libgdiplus_2.10.8.bb +++ b/recipes-mono/libgdiplus/libgdiplus_2.10.8.bb @@ -6,6 +6,12 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=fe7364dfce9f3689eb6995e7cdd56879" +PACKAGECONFIG ??= "jpeg tiff gif exif" +PACKAGECONFIG[jpeg] = "--with-libjpeg,--without-libjpeg,jpeg" +PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" +PACKAGECONFIG[gif] = "--with-libgif,--without-libgif,libgif" +PACKAGECONFIG[exif] = "--with-libexif,--without-libexif,libexif" + SRC_URI = "https://github.com/mono/libgdiplus/archive/${PV}.tar.gz \ file://libgdiplus-2.10/cairo/configure.in.diff \ file://libgdiplus-2.10/libgdiplus-2.10.1-libpng15.patch \ @@ -14,7 +20,7 @@ SRC_URI = "https://github.com/mono/libgdiplus/archive/${PV}.tar.gz \ inherit autotools pkgconfig -DEPENDS =+ "cairo freetype fontconfig libxft libpng jpeg tiff giflib libexif" +DEPENDS =+ "cairo freetype fontconfig libxft libpng" SRC_URI[md5sum] = "6fd45bbb9843f5a8851b5f44e2a5dd04" SRC_URI[sha256sum] = "45c533dc72af0a24d1d3a8097873f5fe1670107fe7e6d08fb71ae586c87a0f1d" -- 2.10.2 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto