[vlc-commits] vout/macosx, coreanimation: do not link against opengl

[David Fuhrmann]

vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Jul  4 13:39:56 2015 +0200| [e4e0a222b50ec4c084da4901ede2ee4db6efbf6d] | committer: Felix Paul Kühne

vout/macosx,coreanimation: do not link against opengl

This is not needed. And for the normal mac builds, we even do not have this library at all.

Closes #13838

Manual backport of 86ac78e2

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e4e0a222b50ec4c084da4901ede2ee4db6efbf6d
---

 modules/video_output/Modules.am |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index df8fbf6..51bd09c 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -21,13 +21,11 @@ endif
 
 if HAVE_OSX
 libvout_macosx_plugin_la_SOURCES = macosx.m opengl.c opengl.h
-libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libvout_macosx_plugin_la_LIBADD = $(GL_LIBS)
+libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS)
 libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa
 
 libcaopengllayer_plugin_la_SOURCES = caopengllayer.m opengl.c opengl.h
-libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libcaopengllayer_plugin_la_LIBADD = $(GL_LIBS)
+libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS)
 libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore
 vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la
 endif