diff --git a/packages/multimedia/SDL/build b/packages/multimedia/SDL/build
index 401c019bcc..44ebc27eaf 100755
--- a/packages/multimedia/SDL/build
+++ b/packages/multimedia/SDL/build
@@ -22,7 +22,7 @@
 
 . config/options $1
 
-if [ "$DISPLAYSERVER" = xorg-server ]; then
+if [ "$XORG_SUPPORT" = yes ]; then
   SDL_X11="--enable-video --enable-x11-shared --disable-video-x11-dgamouse"
   SDL_X11="$SDL_X11 --disable-video-x11-xinerama --disable-video-x11-xme"
   SDL_X11="$SDL_X11 --enable-video-x11-xrandr --enable-video-x11"
@@ -34,7 +34,7 @@ else
   SDL_X11="$SDL_X11 --disable-video-x11-vm --disable-video-x11-xv --without-x"
 fi
 
-if [ "$OPENGL" = Mesa ]; then
+if [ "$OPENGL_SUPPORT" = yes ]; then
   SDL_OPENGL="--enable-video-opengl"
 else
   SDL_OPENGL="--disable-video-opengl"
diff --git a/packages/multimedia/SDL/meta b/packages/multimedia/SDL/meta
index f08a648dad..bb002cf9d4 100644
--- a/packages/multimedia/SDL/meta
+++ b/packages/multimedia/SDL/meta
@@ -35,14 +35,14 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-if [ "$DISPLAYSERVER" = xorg-server ]; then
+if [ "$XORG_SUPPORT" = yes ]; then
   PKG_DEPENDS="$PKG_DEPENDS libX11 libXrandr"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXrandr"
 fi
 
-if [ "$OPENGL" = Mesa ]; then
-  PKG_DEPENDS="$PKG_DEPENDS Mesa"
-  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa"
+if [ "$OPENGL_SUPPORT" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS $OPENGL"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENGL"
 fi
 
 if [ "$PULSEAUDIO_SUPPORT" = yes ]; then