Commit 6b3fe441 authored by Matthew Waters's avatar Matthew Waters 🐨

Move gst-plugins-gl to bad

parent 870503dc
This diff is collapsed.
......@@ -57,6 +57,7 @@ GTKDOC_LIBS = \
$(top_builddir)/gst-libs/gst/insertbin/libgstinsertbin-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/mpegts/libgstmpegts-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la \
$(GST_BASE_LIBS)
GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
......
......@@ -56,6 +56,32 @@
<title>Useful elements</title>
<xi:include href="xml/gstinsertbin.xml" />
</chapter>
<chapter id="gl">
<title>OpenGL Helper Library</title>
<xi:include href="xml/gstglapi.xml"/>
<xi:include href="xml/gstglbufferpool.xml"/>
<xi:include href="xml/gstglcontext.xml"/>
<xi:include href="xml/gstglcontextcocoa.xml"/>
<xi:include href="xml/gstglcontextegl.xml"/>
<xi:include href="xml/gstglcontextglx.xml"/>
<xi:include href="xml/gstglcontextwgl.xml"/>
<xi:include href="xml/gstgldisplay.xml"/>
<xi:include href="xml/gstgldownload.xml"/>
<xi:include href="xml/gstglfilter.xml"/>
<xi:include href="xml/gstglmemory.xml"/>
<xi:include href="xml/gstglmixer.xml"/>
<xi:include href="xml/gstglshader.xml"/>
<xi:include href="xml/gstglupload.xml"/>
<xi:include href="xml/gstglutils.xml"/>
<xi:include href="xml/gstglwindow.xml"/>
<xi:include href="xml/gstglwindowandroid.xml"/>
<xi:include href="xml/gstglwindowcocoa.xml"/>
<xi:include href="xml/gstglwindowdispmanx.xml"/>
<xi:include href="xml/gstglwindowwayland.xml"/>
<xi:include href="xml/gstglwindowwin32.xml"/>
<xi:include href="xml/gstglwindowx11.xml"/>
</chapter>
</part>
<part id="gstreamer-libs-hierarchy">
......
This diff is collapsed.
......@@ -4,6 +4,7 @@
#include <gst/codecparsers/gstmpegvideoparser.h>
#include <gst/insertbin/gstinsertbin.h>
#include <gst/mpegts/mpegts.h>
#include <gst/gl/gl.h>
gst_mpegts_section_get_type
gst_mpeg_ts_section_type_get_type
......@@ -22,4 +23,16 @@ gst_mpeg_ts_dvb_service_type_get_type
gst_mpeg_ts_stream_type_get_type
gst_insert_bin_get_type
\ No newline at end of file
gst_insert_bin_get_type
gst_gl_upload_get_type
gst_gl_download_get_type
gst_gl_display_get_type
gst_gl_context_get_type
gst_gl_filter_get_type
gst_gl_shader_get_type
gst_gl_mixer_get_type
gst_gl_buffer_pool_get_type
gst_gl_allocator_get_type
gst_gl_window_get_type
......@@ -82,6 +82,12 @@ else
EGLGLES_DIR=
endif
if USE_GL
GL_DIR=gl
else
GL_DIR=
endif
if USE_RESINDVD
RESINDVD_DIR = resindvd
else
......@@ -154,6 +160,12 @@ else
LIBMMS_DIR=
endif
if USE_LIBVISUAL
LIBVISUAL_DIR=libvisual
else
LIBVISUAL_DIR=
endif
if USE_MODPLUG
MODPLUG_DIR=modplug
else
......@@ -405,6 +417,7 @@ SUBDIRS=\
$(DTS_DIR) \
$(RESINDVD_DIR) \
$(EGLGLES_DIR) \
$(GL_DIR) \
$(FAAC_DIR) \
$(FAAD_DIR) \
$(FLITE_DIR) \
......@@ -417,6 +430,7 @@ SUBDIRS=\
$(LV2_DIR) \
$(LIBFAME_DIR) \
$(LIBMMS_DIR) \
$(LIBVISUAL_DIR) \
$(MODPLUG_DIR) \
$(MPEG2ENC_DIR) \
$(MPG123_DIR) \
......@@ -478,6 +492,7 @@ DIST_SUBDIRS = \
daala \
dts \
eglgles \
gl \
modplug \
mimic \
mpeg2enc \
......
......@@ -2,9 +2,16 @@ if HAVE_EGL
EGL_DIR = egl
endif
if USE_OPENGL
GL_DIR = gl
endif
if USE_GLES2
GL_DIR = gl
endif
SUBDIRS = interfaces basecamerabinsrc codecparsers \
insertbin uridownloader mpegts $(EGL_DIR)
insertbin uridownloader mpegts $(EGL_DIR) $(GL_DIR)
noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h
DIST_SUBDIRS = interfaces egl basecamerabinsrc codecparsers \
DIST_SUBDIRS = interfaces egl gl basecamerabinsrc codecparsers \
insertbin uridownloader mpegts
......@@ -176,6 +176,14 @@ else
check_shm=
endif
if USE_GL
check_gl=libs/gstglcontext \
libs/gstglmemory \
libs/gstglupload
else
check_gl=
endif
VALGRIND_TO_FIX = \
elements/mpeg2enc \
elements/mplex \
......@@ -242,6 +250,7 @@ check_PROGRAMS = \
$(check_zbar) \
$(check_orc) \
libs/insertbin \
$(check_gl) \
$(EXPERIMENTAL_CHECKS)
noinst_HEADERS = elements/mxfdemux.h
......@@ -409,6 +418,33 @@ orc/audiomixer.c: $(top_srcdir)/gst/audiomixer/gstaudiomixerorc.orc
$(MKDIR_P) orc
$(ORCC) --test -o $@ $<
libs_gstglcontext_LDADD = \
$(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
$(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la
libs_gstglcontext_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
-DGST_USE_UNSTABLE_API \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
libs_gstglmemory_LDADD = \
$(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
$(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la
libs_gstglmemory_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
-DGST_USE_UNSTABLE_API \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
libs_gstglupload_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
-DGST_USE_UNSTABLE_API \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
libs_gstglupload_LDADD = \
$(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
$(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la
distclean-local-orc:
rm -rf orc
......
......@@ -4,3 +4,6 @@ mpegvideoparser
mpegts
vc1parser
insertbin
gstglcontext
gstglmemory
gstglupload
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment