Skip to contentSkip to conversation

package/gstreamer1: gl enabled when either GL or GLES2 is present

PATCH New Charlie Turner 2 participants 3 messages Jul 25, 2019 – Aug 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/gstreamer1: gl enabled when either GL or GLES2 is present

When building gst1-plugins-base with GL support on the rpi3 (which supports only GLES2, not full desktop GL), GStreamer was being asked to disable its GL support completely. This isn't correct since it can be used with either GL or GLES2.

---
 .../gstreamer1/gst1-plugins-base/gst1-plugins-base.mk    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +7 -2
index 66c136c36c..b572c0e992 100644
@@ -39,13 +39,18 @@ GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y)
-GST1_PLUGINS_BASE_GL_API_LIST = opengl
 GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled
-GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu
+else ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y)
+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
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 package/gstreamer1: gl enabled when either GL or GLES2 is present

Ping

Quoted 38 lines · Charlie Turner

When building gst1-plugins-base with GL support on the rpi3 (which supports only GLES2, not full desktop GL), GStreamer was being asked to
disable its GL support completely. This isn't correct since it can be used with either GL or GLES2.

---
 .../gstreamer1/gst1-plugins-base/gst1-plugins-base.mk    | 9
+++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 66c136c36c..b572c0e992 100644

package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +7 -2
@@ -39,13 +39,18 @@ GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y)
-GST1_PLUGINS_BASE_GL_API_LIST = opengl
 GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled
-GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu
+else ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y)
+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
#2 lore raw

PATCH 1/1 package/gstreamer1: gl enabled when either GL or GLES2 is present

In reply to Charlie Turner

Hello!

Quoted 4 lines · Charlie Turner

When building gst1-plugins-base with GL support on the rpi3 (which supports only GLES2, not full desktop GL), GStreamer was being asked to disable its GL support completely. This isn't correct since it can be used with either GL or GLES2.

Precisely yesterday we were having a discussion in the #buildroot IRC channel about how it should be possible to build the GStreamer GL support with APIs other than desktop OpenGL. This will also enable using it in systems with EGL+GLES2 support for which GStreamer has support (Vivante, Wayland, etc.), as I can see from the corresponding ?meson.build? file:

https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/blob/master/gst-libs/gst/gl/meson.build#L228

All in all, your patch looks good to me (thanks, and sorry that it has been sitting without a review for so long!), and I just have a comment below asking for a small simplification?please take a look.

Quoted 1 line
Quoted 10 lines
---
 .../gstreamer1/gst1-plugins-base/gst1-plugins-base.mk    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +0 -0
index 66c136c36c..b572c0e992 100644
@@ -39,13 +39,18 @@ GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled
 endif

package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled · line 47

Quoted 10 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +2 -2
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y)
-GST1_PLUGINS_BASE_GL_API_LIST = opengl
 GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled
-GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu
+else ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y)
+GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled
 else
 GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled
 endif

I would probably do the check for both _OPENGL_OPENGL and _OPENGL_GLES2 in a single line, like this:

  ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL)$(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),)
  GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled
  else
  GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled
  endif

(Options which are disabled expand to the empty string, so if both are empty the comparison with the empty string succeeds and we pass -Dgl=disabled to Meson.)

Quoted 10 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +5 -0
+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
Signature · 1 line
2.17.1

Cheers,
-Adrian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190808/10b2685e/attachment.asc>