diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-18 14:07:07 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-18 14:35:49 +0200 |
| commit | 6fb5a9b716a277826648519882542b0dee0694ac (patch) | |
| tree | 4f2c57b8c8b8acb33d11fa72ba7e16cce06e2954 | |
| parent | ebb99f27acf1c79845c0dd97e877cd9e43e4808f (diff) | |
| download | gstreamer-plugins-bad-6fb5a9b716a277826648519882542b0dee0694ac.tar.gz | |
eglglessink: Integrate into the build system
Conflicts:
ext/Makefile.am
| -rw-r--r-- | configure.ac | 31 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | ext/eglgles/Makefile.am | 2 |
3 files changed, 39 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 06e7da522..d6904c2bf 100644 --- a/configure.ac +++ b/configure.ac @@ -1522,6 +1522,36 @@ AG_GST_CHECK_FEATURE(RSVG, [rsvg decoder], rsvg, [ AC_SUBST(RSVG_LIBS) ]) +dnl *** eglgles *** +translit(dnm, m, l) AM_CONDITIONAL(USE_EGLGLES, true) +AG_GST_CHECK_FEATURE(EGLGLES, [eglgles sink], eglgles, [ + HAVE_EGLGLES="no" + PKG_CHECK_MODULES(EGLGLES, egl glesv2, HAVE_EGLGLES="yes", [ + HAVE_EGLGLES="no" + old_LIBS=$LIBS + old_CFLAGS=$CFLAGS + AC_CHECK_LIB([GLESv2], [glEnable], + [ + AC_CHECK_HEADER([GLES2/gl2.h], + [ + AC_CHECK_LIB([EGL], [eglGetProcAddress], + [ + AC_CHECK_HEADER([EGL/egl.h], + [ + HAVE_EGLGLES="yes" + EGLGLES_LIBS="-lGLESv2 -lEGL" + EGLGLES_CFLAGS="" + ]) + ]) + ]) + ]) + LIBS=$old_LIBS + CFLAGS=$old_CFLAGS + ]) + AC_SUBST(EGLGLES_CFLAGS) + AC_SUBST(EGLGLES_LIBS) +]) + dnl *** timidity *** translit(dnm, m, l) AM_CONDITIONAL(USE_TIMIDITY, true) AG_GST_CHECK_FEATURE(TIMIDITY, [timidity midi soft synth plugin], timidity, [ @@ -2116,6 +2146,7 @@ ext/dirac/Makefile ext/directfb/Makefile ext/wayland/Makefile ext/dts/Makefile +ext/eglgles/Makefile ext/faac/Makefile ext/faad/Makefile ext/flite/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 74b7b0ecf..68c347ecf 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -88,6 +88,12 @@ else DTS_DIR= endif +if USE_EGLGLES +EGLGLES_DIR=eglgles +else +EGLGLES_DIR= +endif + if USE_RESINDVD RESINDVD_DIR = resindvd else @@ -379,6 +385,7 @@ SUBDIRS=\ $(WAYLAND_DIR) \ $(DTS_DIR) \ $(RESINDVD_DIR) \ + $(EGLGLES_DIR) \ $(FAAC_DIR) \ $(FAAD_DIR) \ $(FLITE_DIR) \ @@ -446,6 +453,7 @@ DIST_SUBDIRS = \ libmms \ lv2 \ dts \ + eglgles \ modplug \ mimic \ mpeg2enc \ diff --git a/ext/eglgles/Makefile.am b/ext/eglgles/Makefile.am index af79dfd57..2573247ab 100644 --- a/ext/eglgles/Makefile.am +++ b/ext/eglgles/Makefile.am @@ -14,8 +14,6 @@ libgsteglglessink_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ -lgstinterfaces-$(GST_MAJORMINOR) libgsteglglessink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -if !GST_PLUGIN_BUILD_STATIC libgsteglglessink_la_LIBTOOLFLAGS = --tag=disable-static -endif noinst_HEADERS = gsteglglessink.h video_platform_wrapper.h |