summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2012-03-16 21:41:41 +0100
committerUoti Urpala <uau@mplayer2.org>2012-03-25 22:30:37 +0300
commite37d7b14522b56432c0d81a6b5ab1ce3f118cd4a (patch)
tree6abf50bcd60e71789ccce2083170828aad778704
parente89ea0c371144dac8a5b930601f94bc5617c8810 (diff)
downloadmpv-e37d7b14522b56432c0d81a6b5ab1ce3f118cd4a.tar.bz2
mpv-e37d7b14522b56432c0d81a6b5ab1ce3f118cd4a.tar.xz
configure: disable X11 opengl backend if Cocoa is enabled
The recommended way to get function pointers to the functions in the OpenGL library is through dlopen/dlsym/dlclose. This causes problems in the Cocoa OpenGL backend when -lGL (X11's OpenGL headers) is linked to the binary together with -framework OpenGL. The linked OpenGL symbols are always from -lGL, causing all the function pointers to point to null when getFunctions is called against a Cocoa OpenGL context. For this reason change the configure autodetection code to disable the vo_gl X11 backend when cocoa is active.
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 22ea2b185e..4374d745b6 100755
--- a/configure
+++ b/configure
@@ -4548,7 +4548,7 @@ int main(int argc, char *argv[]) {
EOF
_gl=no
for _ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $_ld_pthread" ; do
- if cc_check $_ld_tmp $_ld_lm ; then
+ if test "$_cocoa" != yes && cc_check $_ld_tmp $_ld_lm ; then
_gl=yes
_gl_x11=yes
libs_mplayer="$libs_mplayer $_ld_tmp $_ld_dl"