From 35ed1108f248d97d6caea87b8a67671f6268fc67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kelemen=20=28vudiq=29?= <vudiq@vudiq.sk>
Date: Wed, 24 Mar 2021 21:38:27 +0100
Subject: [PATCH] cairo: set options based on OPENGL/ES

Setting the flags related to OpenGL should not be based on the
presence of the DISPLAYSERVER - one can have OpenGL without
DISPLAYSERVER.
---
 packages/graphics/cairo/package.mk | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/graphics/cairo/package.mk b/packages/graphics/cairo/package.mk
index f2bb86eb3c..cf885d25d2 100644
--- a/packages/graphics/cairo/package.mk
+++ b/packages/graphics/cairo/package.mk
@@ -74,18 +74,27 @@ pre_configure_target() {
                                  --x-libraries="${SYSROOT_PREFIX}/usr/lib" \
                                  --enable-xlib \
                                  --enable-xlib-xrender \
-                                 --enable-gl \
-                                 --enable-glx \
-                                 --disable-glesv2 \
-                                 --disable-egl \
                                  --with-x"
-   else
+  else
     PKG_CONFIGURE_OPTS_TARGET+=" --disable-xlib \
                                  --disable-xlib-xrender \
-                                 --disable-gl \
-                                 --disable-glx \
-                                 --enable-glesv2 \
-                                 --enable-egl \
                                  --without-x"
   fi
+
+  if [ "${OPENGL_SUPPORT}" = "yes" ]; then
+    PKG_CONFIGURE_OPTS_TARGET+=" --enable-gl \
+                                 --enable-glx \
+                                 --disable-glesv2 \
+                                 --disable-egl"
+  elif [ "${OPENGLES_SUPPORT}" = "yes" ]; then
+    PKG_CONFIGURE_OPTS_TARGET+=" --disable-gl \
+                                 --disable-glx \
+                                 --enable-glesv2 \
+                                 --enable-egl"
+  else
+    PKG_CONFIGURE_OPTS_TARGET+=" --disable-gl \
+                                 --disable-glx \
+                                 --disable-glesv2 \
+                                 --disable-egl"
+  fi
 }