diff options
| author | Thiago Santos <thiago.sousa.santos@collabora.com> | 2013-03-19 12:04:45 -0300 |
|---|---|---|
| committer | Thiago Santos <thiago.sousa.santos@collabora.com> | 2013-04-16 16:08:50 -0300 |
| commit | 45900156a93dde04b2b994e92ff42fa4df388a0e (patch) | |
| tree | fc5cec695b8e1c54d83ba649b6e0cf88d70cd08d | |
| parent | fb09e113287752343454b6349719c529ac3ba529 (diff) | |
| download | gstreamer-plugins-bad-45900156a93dde04b2b994e92ff42fa4df388a0e.tar.gz | |
egladaptation: add missing gl include for ios
Conflicts:
ext/eglgles/Makefile.am
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/eglgles/Makefile.am | 6 | ||||
| -rw-r--r-- | ext/eglgles/gstegladaptation.h | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 29b10a6f7..239425673 100644 --- a/configure.ac +++ b/configure.ac @@ -1731,6 +1731,8 @@ AG_GST_CHECK_FEATURE(EGLGLES, [eglgles sink], eglgles, [ ;; ios) HAVE_EGLGLES="yes" + EGLGLES_LIBS="-Wl,-framework -Wl,OpenGLES" + EGLGLES_CFLAGS="-Wl,-framework -Wl,OpenGLES" ;; *) AC_MSG_ERROR([invalid EGL window system specified]) diff --git a/ext/eglgles/Makefile.am b/ext/eglgles/Makefile.am index ad1e17915..a5f2eab68 100644 --- a/ext/eglgles/Makefile.am +++ b/ext/eglgles/Makefile.am @@ -18,7 +18,13 @@ libgsteglglessink_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ -lgstvideo-$(GST_MAJORMINOR) \ -lgstinterfaces-$(GST_MAJORMINOR) +if HAVE_IOS +libgsteglglessink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,-framework -Wl,OpenGLES +else libgsteglglessink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +endif +if !GST_PLUGIN_BUILD_STATIC libgsteglglessink_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gsteglglessink.h video_platform_wrapper.h gstegladaptation.h diff --git a/ext/eglgles/gstegladaptation.h b/ext/eglgles/gstegladaptation.h index 19f91422f..46f2cce1c 100644 --- a/ext/eglgles/gstegladaptation.h +++ b/ext/eglgles/gstegladaptation.h @@ -51,7 +51,10 @@ #include <gst/gst.h> -#ifndef HAVE_IOS +#ifdef HAVE_IOS +#include <OpenGLES/ES2/gl.h> + +#else #include <EGL/egl.h> #include <EGL/eglext.h> #include <GLES2/gl2.h> |