diff --git a/packages/multimedia/SDL/build b/packages/multimedia/SDL/build
index 6d16cfb95b..401c019bcc 100755
--- a/packages/multimedia/SDL/build
+++ b/packages/multimedia/SDL/build
@@ -22,6 +22,24 @@
 
 . config/options $1
 
+if [ "$DISPLAYSERVER" = xorg-server ]; 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"
+  SDL_X11="$SDL_X11 --disable-video-x11-vm --disable-video-x11-xv --with-x"
+else
+  SDL_X11="--disable-video --disable-x11-shared --disable-video-x11-dgamouse"
+  SDL_X11="$SDL_X11 --disable-video-x11-xinerama --disable-video-x11-xme"
+  SDL_X11="$SDL_X11 --disable-video-x11-xrandr --disable-video-x11"
+  SDL_X11="$SDL_X11 --disable-video-x11-vm --disable-video-x11-xv --without-x"
+fi
+
+if [ "$OPENGL" = Mesa ]; then
+  SDL_OPENGL="--enable-video-opengl"
+else
+  SDL_OPENGL="--disable-video-opengl"
+fi
+
 if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
   SDL_PULSEAUDIO="--enable-pulseaudio --enable-pulseaudio-shared"
 else
@@ -45,7 +63,6 @@ rm -f acinclude/alsa.m4
             --disable-rpath \
             --enable-libc \
             --enable-audio \
-            --enable-video \
             --enable-events \
             --enable-joystick \
             --enable-cdrom \
@@ -74,17 +91,14 @@ rm -f acinclude/alsa.m4
             --enable-nasm \
             --disable-altivec \
             --disable-ipod \
+            $SDL_X11 \
+            $SDL_OPENGL \
             --disable-video-nanox \
             --disable-nanox-debug \
             --disable-nanox-share-memory \
             --disable-nanox-direct-fb \
-            --enable-x11-shared \
             --disable-dga \
             --disable-video-dga \
-            --disable-video-x11-dgamouse \
-            --disable-video-x11-xinerama \
-            --disable-video-x11-xme \
-            --enable-video-x11-xrandr \
             --disable-video-photon \
             --disable-video-carbon \
             --disable-video-cocoa \
@@ -99,7 +113,6 @@ rm -f acinclude/alsa.m4
             --disable-video-qtopia \
             --disable-video-picogui \
             --disable-video-dummy \
-            --enable-video-opengl \
             --disable-osmesa-shared \
             --enable-input-events \
             --disable-input-tslib \
@@ -111,10 +124,6 @@ rm -f acinclude/alsa.m4
             --enable-sdl-dlopen \
             --disable-atari-ldg \
             --disable-clock_gettime \
-            --enable-video-x11 \
-            --enable-video-x11-vm \
-            --enable-video-x11-xv \
-            --with-x
 
 make
 
diff --git a/packages/multimedia/SDL/meta b/packages/multimedia/SDL/meta
index a2965e3efb..d3c792390a 100644
--- a/packages/multimedia/SDL/meta
+++ b/packages/multimedia/SDL/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libsdl.org/"
 PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="alsa-lib libX11 libXrandr Mesa"
-PKG_BUILD_DEPENDS="toolchain yasm alsa-lib libX11 libXrandr Mesa"
+PKG_DEPENDS="alsa-lib"
+PKG_BUILD_DEPENDS="toolchain yasm alsa-lib"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="libsdl: A cross-platform Graphic API"
@@ -35,8 +35,17 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
+if [ "$DISPLAYMANAGER" = xorg-server ]; 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"
+fi
+
 if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
   PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio"
 fi
-