summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2013-05-11 16:54:46 +0200
committerRudolf Polzer <divverent@xonotic.org>2013-05-11 16:54:46 +0200
commit02bbd87b2bc3330c4988515969f71d73a86828e1 (patch)
treec5429c0668cbf29d06d16ade0d01e90d3cda44f7
parent139bc5ce0931b2d2bf096c1f2f90651fd15fa977 (diff)
downloadmpv-02bbd87b2bc3330c4988515969f71d73a86828e1.tar.bz2
mpv-02bbd87b2bc3330c4988515969f71d73a86828e1.tar.xz
For now, disable autodetection of sdl/sdl2
This is done because statically linked SDL libraries are incompatible with direct X11 function use (e.g. vo_x11, vo_gl etc.) because of clashing symbol names. http://bugzilla.libsdl.org/show_bug.cgi?id=1828
-rwxr-xr-xconfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 2119eb73f3..a9edaab93b 100755
--- a/configure
+++ b/configure
@@ -348,8 +348,8 @@ Video output:
--enable-gl enable OpenGL video output [autodetect]
--enable-caca enable CACA video output [autodetect]
--enable-direct3d enable Direct3D video output [autodetect]
- --enable-sdl enable SDL audio output [autodetect]
- --enable-sdl2 enable SDL 2.0+ audio and video output [autodetect]
+ --enable-sdl enable SDL audio output [disable]
+ --enable-sdl2 enable SDL 2.0+ audio and video output [disable]
--enable-xv enable Xv video output [autodetect]
--enable-vdpau enable VDPAU acceleration [autodetect]
--enable-vm enable XF86VidMode support [autodetect]
@@ -425,8 +425,8 @@ _xss=auto
_xv=auto
_vdpau=auto
_direct3d=auto
-_sdl=auto
-_sdl2=auto
+_sdl=no
+_sdl2=no
_dsound=auto
_mng=auto
_jpeg=auto