[DO NOT MERGE] Move eglgles Sink to ext/

9 files changed, 16 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index cf602c462..6cfc6a724 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1435,13 +1435,13 @@ AG_GST_CHECK_FEATURE(RSVG, [rsvg decoder], rsvg, [
 ])
 
 dnl *** android ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_DROIDSINKS, true)
-AG_GST_CHECK_FEATURE(DROIDSINKS, [Vidroid, Android EGL/GLES sink], android, [
-  PKG_CHECK_MODULES(DROIDSINKS, egl glesv2, HAVE_DROIDSINKS="yes", [
-    HAVE_DROIDSINKS="no"
+translit(dnm, m, l) AM_CONDITIONAL(USE_EGLGLES, true)
+AG_GST_CHECK_FEATURE(EGLGLES, [EglGles, Generic EGL/GLES sink], eglgles, [
+  PKG_CHECK_MODULES(EGLGLES, egl glesv2, HAVE_EGLGLES="yes", [
+    HAVE_EGLGLES="no"
   ])
-  AC_SUBST(DROIDSINKS_CFLAGS)
-  AC_SUBST(DROIDSINKS_LIBS)
+  AC_SUBST(EGLGLES_CFLAGS)
+  AC_SUBST(EGLGLES_LIBS)
 ])
 
 dnl *** timidity ***
@@ -1798,7 +1798,7 @@ AM_CONDITIONAL(USE_CURL, false)
 AM_CONDITIONAL(USE_DC1394, false)
 AM_CONDITIONAL(USE_DECKLINK, false)
 AM_CONDITIONAL(USE_DIRECTFB, false)
-AM_CONDITIONAL(USE_DROIDSINKS, false)
+AM_CONDITIONAL(USE_EGLGLES, false)
 AM_CONDITIONAL(USE_DIRAC, false)
 AM_CONDITIONAL(USE_DTS, false)
 AM_CONDITIONAL(USE_DIVX, false)
@@ -2010,7 +2010,6 @@ sys/Makefile
 sys/dshowdecwrapper/Makefile
 sys/acmenc/Makefile
 sys/acmmp3dec/Makefile
-sys/android/Makefile
 sys/applemedia/Makefile
 sys/avc/Makefile
 sys/d3dvideosink/Makefile
@@ -2059,6 +2058,7 @@ ext/dirac/Makefile
 ext/directfb/Makefile
 ext/divx/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 dc62386ca..abd5e2228 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -100,6 +100,12 @@ else
 DTS_DIR=
 endif
 
+if USE_EGLGLES
+EGLGLES_DIR=eglgles
+else
+EGLGLES_DIR=
+endif
+
 if USE_RESINDVD
  RESINDVD_DIR = resindvd
 else
@@ -461,6 +467,7 @@ DIST_SUBDIRS = \
 	dc1394 \
 	dirac \
 	directfb \
+	eglgles \
 	faac \
 	faad \
 	flite \
diff --git a/sys/android/Android.mk b/ext/eglgles/Android.mk
index 6f8db387a..6f8db387a 100644
--- a/sys/android/Android.mk
+++ b/ext/eglgles/Android.mk
diff --git a/sys/android/Makefile.am b/ext/eglgles/Makefile.am
index ff0addaa3..ff0addaa3 100644
--- a/sys/android/Makefile.am
+++ b/ext/eglgles/Makefile.am
diff --git a/sys/android/gstvidroidsink.c b/ext/eglgles/gstvidroidsink.c
index 5a58f13c6..5a58f13c6 100644
--- a/sys/android/gstvidroidsink.c
+++ b/ext/eglgles/gstvidroidsink.c
diff --git a/sys/android/gstvidroidsink.h b/ext/eglgles/gstvidroidsink.h
index 0f28411e0..0f28411e0 100644
--- a/sys/android/gstvidroidsink.h
+++ b/ext/eglgles/gstvidroidsink.h
diff --git a/sys/android/video_platform_wrapper.c b/ext/eglgles/video_platform_wrapper.c
index 9ec582c3d..9ec582c3d 100644
--- a/sys/android/video_platform_wrapper.c
+++ b/ext/eglgles/video_platform_wrapper.c
diff --git a/sys/android/video_platform_wrapper.h b/ext/eglgles/video_platform_wrapper.h
index db27c572c..db27c572c 100644
--- a/sys/android/video_platform_wrapper.h
+++ b/ext/eglgles/video_platform_wrapper.h
diff --git a/sys/Makefile.am b/sys/Makefile.am
index aac915e6e..664632d2e 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -46,12 +46,6 @@ else
 DIRECTSOUND_DIR=
 endif
 
-if USE_DROIDSINKS
-DROIDSINKS_DIR=android
-else
-DROIDSINKS_DIR=
-endif
-
 if USE_FBDEV
 FBDEV_DIR=fbdev
 else
@@ -128,7 +122,7 @@ endif
 
 SUBDIRS = $(ACM_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(DROIDSINKS_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(PVR_DIR)
 
-DIST_SUBDIRS = acmenc acmmp3dec android applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
+DIST_SUBDIRS = acmenc acmmp3dec applemedia avc d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
 		osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap pvr2d
 
 include $(top_srcdir)/common/parallel-subdirs.mak