From 6c90b4fa1350eefc0724eb695c7074ce54a729d1 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 6 Feb 2022 12:32:44 +0000 Subject: [PATCH] gdk-pixbuf: reintroduce conditional libX11 to support chrome update to conditionally build the /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders when building with libX11 for DISPLAYSERVER = x11. These are required for the chrome addon. Co-authored-by: mglae --- .../chrome-depends/gdk-pixbuf/package.mk | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk index 64e73464cd..b885e3a92a 100644 --- a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk @@ -12,10 +12,21 @@ PKG_DEPENDS_TARGET="toolchain glib libjpeg-turbo libpng jasper shared-mime-info PKG_DEPENDS_CONFIG="shared-mime-info" PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation." -PKG_MESON_OPTS_TARGET="-Dbuiltin_loaders=all \ - -Dgtk_doc=false \ - -Ddocs=false \ - -Dintrospection=disabled \ - -Dman=false \ - -Drelocatable=false \ - -Dinstalled_tests=false" +configure_package() { + if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libX11" + fi +} + +pre_configure_target() { + PKG_MESON_OPTS_TARGET="-Dgtk_doc=false \ + -Ddocs=false \ + -Dintrospection=disabled \ + -Dman=false \ + -Drelocatable=false \ + -Dinstalled_tests=false" + + if [ "${DISPLAYSERVER}" != "x11" ]; then + PKG_MESON_OPTS_TARGET+=" -Dbuiltin_loaders=all" + fi +}