libs::cairo: enable xlib backend

Author: Johannes Osterholzer

recipes/libs/cairo.yaml

@@ -1,16 +1,30 @@
-inherit: [meson]
+inherit: [meson, cmake]
 
 metaEnvironment:
     PKG_VERSION: "1.18.4"
     PKG_LICENSE: "LGPL-2.1-only OR MPL-1.1"
 
+Config:
+    CAIRO_XLIB:
+        type: bool
+        default: false
+        help: Enable X Window System output target
+
 depends:
     - libs::glib-dev
     - libs::libpng-dev
     - libs::pixman-dev
     - libs::zlib-dev
     - libs::freetype-dev
     - libs::fontconfig-dev
+
+    - if: "$(eq,${CAIRO_XLIB:-0},1)"
+      depends:
+          - graphics::xorg::proto::xorgproto-dev
+          - libs::xorg::libX11-dev
+          - libs::xorg::libXext-dev
+          - libs::xorg::libXrender-dev
+
     - use: []
       depends:
           - libs::glib-tgt
@@ -20,16 +34,29 @@ depends:
           - libs::freetype-tgt
           - libs::fontconfig-tgt
 
+          - if: "$(eq,${CAIRO_XLIB:-0},1)"
+            depends:
+                - libs::xorg::libX11-tgt
+                - libs::xorg::libXext-tgt
+                - libs::xorg::libXrender-tgt
+
 checkoutSCM:
     scm: url
     url:  https://www.cairographics.org/releases/cairo-${PKG_VERSION}.tar.xz
     digestSHA256: 445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb
     stripComponents: 1
 
 buildTools: [host-toolchain]
+buildVars: [CAIRO_XLIB]
 buildScript: |
+    CONFIG=""
+    if [[ ${CAIRO_XLIB:-0} == "1" ]]; then
+      CONFIG="-Dxlib=enabled"
+      export MESON_ADDITIONAL_PROPERTIES="ipc_rmid_deferred_release= false"
+    fi
     mesonBuild $1 \
-        -Dtests=disabled
+        -Dtests=disabled \
+        ${CONFIG}
 
 multiPackage:
     dev:

tests/buildall/recipes/buildall.yaml

@@ -48,6 +48,11 @@ multiPackage:
             - bsp::intel::microcode
             - utils::iucode-tool # uses cpuid which is not available on !x86
 
+            - name: libs::cairo-tgt
+              environment:
+                  CAIRO_XLIB: "1"
+              alias: libs::cairo-x-tgt
+
             - name: libs::mesa3d-tgt
               alias: libs::mesa3d-intel-tgt