aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-11-12 20:37:56 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-09-25 15:30:56 +0200
commit34498c1f1a0fa272753917e4ef014600413c6a5f (patch)
treed366fa34db6d1b7b1446193016420710b2f667b7
parent31794691b4276831c4825b9d80f6e9574178094c (diff)
downloadbuildroot-34498c1f1a0fa272753917e4ef014600413c6a5f.tar.gz
buildroot-34498c1f1a0fa272753917e4ef014600413c6a5f.tar.bz2
package/gstreamer1/gst1-plugins-base: gl needs api, platform and window
Build will fail if gl is enabled without an api, a platform and a window: Message: No OpenGL Platforms found or requested Message: No OpenGL Window systems found or requested gst-libs/gst/gl/meson.build:948:2: ERROR: Problem encountered: GStreamer OpenGL integration required via options, but needed dependencies not found. This requirement is already specified in Config.in through a simple comment: comment "The opengl library needs an API, a platform and a window system" depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL Fixes: - http://autobuild.buildroot.org/results/d171059801adf8dea1a2116d7c729a2aa5767ac8 - http://autobuild.buildroot.org/results/b1bfa505bba534440d331c4948eea5eb2d165c97 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 66e484a7514128552543262da7bfb4a7816436b3) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index 1781a5d461..42fe09bf57 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -38,19 +38,22 @@ else
GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled
endif
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API)$(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM)$(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW),yyy)
GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled
+else
+GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled
+endif
+
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y)
GST1_PLUGINS_BASE_GL_API_LIST = opengl
GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu
endif
+
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y)
GST1_PLUGINS_BASE_GL_API_LIST += gles2
GST1_PLUGINS_BASE_DEPENDENCIES += libgles
endif
-else
-GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled
-endif
+
GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_api='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_GL_API_LIST))'
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX),y)