diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com> | 2012-09-10 20:22:22 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com> | 2012-09-10 22:33:02 -0300 |
| commit | 5382e05f775cfd12c73d2067c43465d8ddade5e8 (patch) | |
| tree | e4e355e8fb50c6deedadb603df4f592141ec0767 | |
| parent | b515af44797b761080ecffaef00d543ba2ca0083 (diff) | |
Move eglgles Sink to ext/ #2
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | ext/Makefile.am | 1 | ||||
| -rw-r--r-- | ext/eglgles/Makefile.am | 4 | ||||
| -rw-r--r-- | ext/eglgles/gsteglglessink.c (renamed from ext/eglgles/gstvidroidsink.c) | 0 | ||||
| -rw-r--r-- | ext/eglgles/gsteglglessink.h (renamed from ext/eglgles/gstvidroidsink.h) | 0 |
5 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 6cfc6a724..219fa5a4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1434,9 +1434,9 @@ AG_GST_CHECK_FEATURE(RSVG, [rsvg decoder], rsvg, [ AC_SUBST(RSVG_LIBS) ]) -dnl *** android *** +dnl *** eglgles *** translit(dnm, m, l) AM_CONDITIONAL(USE_EGLGLES, true) -AG_GST_CHECK_FEATURE(EGLGLES, [EglGles, Generic EGL/GLES sink], eglgles, [ +AG_GST_CHECK_FEATURE(EGLGLES, [eglgles sink], eglgles, [ PKG_CHECK_MODULES(EGLGLES, egl glesv2, HAVE_EGLGLES="yes", [ HAVE_EGLGLES="no" ]) diff --git a/ext/Makefile.am b/ext/Makefile.am index abd5e2228..e25cb6d45 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -410,6 +410,7 @@ SUBDIRS=\ $(DIRECTFB_DIR) \ $(DIVX_DIR) \ $(DTS_DIR) \ + $(EGLGLES_DIR) \ $(RESINDVD_DIR) \ $(FAAC_DIR) \ $(FAAD_DIR) \ diff --git a/ext/eglgles/Makefile.am b/ext/eglgles/Makefile.am index ff0addaa3..a1fe7ce0d 100644 --- a/ext/eglgles/Makefile.am +++ b/ext/eglgles/Makefile.am @@ -4,11 +4,11 @@ libgsteglglessink_la_SOURCES = gsteglglessink.c video_platform_wrapper.c libgsteglglessink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) \ - $(DROIDSINKS_CFLAGS) \ + $(EGLGLES_CFLAGS) \ $(X11_CFLAGS) libgsteglglessink_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) $(DROIDSINKS_LIBS) $(X11_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) $(EGLGLES_LIBS) $(X11_LIBS) \ -lgstvideo-$(GST_MAJORMINOR) \ -lgstinterfaces-$(GST_MAJORMINOR) diff --git a/ext/eglgles/gstvidroidsink.c b/ext/eglgles/gsteglglessink.c index 5a58f13c6..5a58f13c6 100644 --- a/ext/eglgles/gstvidroidsink.c +++ b/ext/eglgles/gsteglglessink.c diff --git a/ext/eglgles/gstvidroidsink.h b/ext/eglgles/gsteglglessink.h index 0f28411e0..0f28411e0 100644 --- a/ext/eglgles/gstvidroidsink.h +++ b/ext/eglgles/gsteglglessink.h |