Fix dolphin libretro dependencies.

packages/games/libretro/dolphin/package.mk

@@ -13,6 +13,30 @@ PKG_SECTION="libretro"
 PKG_SHORTDESC="Dolphin Libretro, a Gamecube & Wii emulator core for Retroarch"
 PKG_TOOLCHAIN="cmake"
 
+if [ ! "${OPENGL}" = "no" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
+  PKG_CONFIGURE_OPTS_TARGET+=" -DENABLE_X11=OFF \
+                               -DENABLE_EGL=ON"
+fi
+
+if [ "${OPENGLES_SUPPORT}" = yes ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_CONFIGURE_OPTS_TARGET+=" -DENABLE_X11=OFF \
+                               -DENABLE_EGL=ON"
+fi
+
+if [ "${DISPLAYSERVER}" = "wl" ]; then
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
+  PKG_CONFIGURE_OPTS_TARGET+=" -DENABLE_X11=ON \
+                               -DENABLE_EGL=ON"
+fi
+
+if [ "${VULKAN_SUPPORT}" = "yes" ]
+then
+  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
+  PKG_CONFIGURE_OPTS_TARGET+=" -DENABLE_VULKAN=ON"
+fi
+
 pre_configure_target() {
         PKG_CMAKE_OPTS_TARGET+="        -DENABLE_EGL=ON \
                                         -DUSE_SHARED_ENET=OFF \

packages/graphics/cairo/package.mk

@@ -14,14 +14,14 @@ if [ "$OPENGL" != "no" ]; then
   PKG_DEPENDS_TARGET+=" $OPENGL"
 fi
 
-if [ "$OPENGLES" != "no" ]; then
-  PKG_DEPENDS_TARGET+=" $OPENGLES"
+if [ "${OPENGLES}" != "no" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
 fi
 
-if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXrender libX11 mesa"
-  PKG_CAIRO_CONFIG="--x-includes="$SYSROOT_PREFIX/usr/include" \
-                    --x-libraries="$SYSROOT_PREFIX/usr/lib" \
+if [ "${DISPLAYSERVER}" = "x11" ]; then
+  PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} libXrender libX11 mesa"
+  PKG_CAIRO_CONFIG="--x-includes="${SYSROOT_PREFIX}/usr/include" \
+                    --x-libraries="${SYSROOT_PREFIX}/usr/lib" \
                     --enable-xlib \
                     --enable-xlib-xrender \
                     --enable-gl \
@@ -30,10 +30,10 @@ if [ "$DISPLAYSERVER" = "x11" ]; then
                     --disable-egl \
                     --with-x"
 
-elif [ "$DISPLAYSERVER" = "wl" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mesa libglvnd libXrender libX11"
-  PKG_CAIRO_CONFIG="--x-includes="$SYSROOT_PREFIX/usr/include" \
-                    --x-libraries="$SYSROOT_PREFIX/usr/lib" \
+elif [ "${DISPLAYSERVER}" = "wl" ]; then
+  PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} mesa libglvnd libXrender libX11"
+  PKG_CAIRO_CONFIG="--x-includes="${SYSROOT_PREFIX}/usr/include" \
+                    --x-libraries="${SYSROOT_PREFIX}/usr/lib" \
                     --enable-xlib \
                     --enable-xlib-xrender \
                     --disable-gl \