mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: fix OpenGL API detection

Browse source 
And don't build gl mosaic element unconditionally.
This commit is contained in:
Tim-Philipp Müller 2018-01-31 13:03:28 +00:00
parent bd37da2de4
commit b19e3d8cf3
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -225,6 +225,14 @@ if test "x$HAVE_GST_GL" = "xyes"; then
case "$GST_GL_PLATFORMS" in *egl*) GST_GL_HAVE_PLATFORM_EGL="1" ;; esac case "$GST_GL_PLATFORMS" in *egl*) GST_GL_HAVE_PLATFORM_EGL="1" ;; esac
case "$GST_GL_PLATFORMS" in *cgl*) GST_GL_HAVE_PLATFORM_CGL="1" ;; esac case "$GST_GL_PLATFORMS" in *cgl*) GST_GL_HAVE_PLATFORM_CGL="1" ;; esac
case "$GST_GL_PLATFORMS" in *eagl*) GST_GL_HAVE_PLATFORM_EAGL="1" ;; esac case "$GST_GL_PLATFORMS" in *eagl*) GST_GL_HAVE_PLATFORM_EAGL="1" ;; esac
AC_MSG_CHECKING([GStreamer OpenGL apis ...])
GST_GL_APIS=`$PKG_CONFIG --variable=gl_apis gstreamer-gl-1.0`
AC_MSG_RESULT([$GST_GL_APIS])
GST_GL_HAVE_API_GLES2=""
GST_GL_HAVE_API_GL=""
case "$GST_GL_APIS" in *gles2*) GST_GL_HAVE_API_GLES2="1" ;; esac
case "$GST_GL_APIS" in "gl"|"gl "*|*" gl"|*" gl "*) GST_GL_HAVE_API_GL="1" ;; esac
fi fi
AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
@ -1932,9 +1940,7 @@ AG_GST_CHECK_FEATURE(GL, [gl elements], gl, [
fi fi
]) ])
AM_CONDITIONAL(USE_GL, test "x$HAVE_GL" = "xyes") AM_CONDITIONAL(USE_GL, test "x$HAVE_GL" = "xyes")
AM_CONDITIONAL(USE_OPENGL, test "x$GST_GL_HAVE_API_GL" = "xyes")
dnl FIXME
AM_CONDITIONAL(USE_OPENGL, false)
dnl *** gtk+ *** dnl *** gtk+ ***
HAVE_GTK3_GL="no" HAVE_GTK3_GL="no"

2
ext/gl/Makefile.am
View file

@ -4,7 +4,6 @@ plugin_LTLIBRARIES = libgstopenglmixers.la
libgstopenglmixers_la_SOURCES = \ libgstopenglmixers_la_SOURCES = \
gstopengl.c \ gstopengl.c \
gstglbasemixer.c \ gstglbasemixer.c \
gstglmosaic.c \
gstglmixer.c \ gstglmixer.c \
gstglmixerbin.c \ gstglmixerbin.c \
gstglstereomix.c \ gstglstereomix.c \
@ -13,7 +12,6 @@ libgstopenglmixers_la_SOURCES = \
noinst_HEADERS = \ noinst_HEADERS = \
gstglbasemixer.h \ gstglbasemixer.h \
gstglmosaic.h \
gstglmixer.h \ gstglmixer.h \
gstglmixerbin.h \ gstglmixerbin.h \
gstglstereomix.h \ gstglstereomix.h \