Skip to contentSkip to conversation

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

PATCH New Charlie Turner 4 participants 4 messages Aug 8, 2019 – Oct 29, 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, 6 insertions(+), 3 deletions(-)
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +6 -3
index 66c136c36c..e80b301b82 100644
@@ -38,12 +38,15 @@ else
 GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled
 endif
 
+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
+
 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
-GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y)
Signature · 1 line
2.17.1
#1 lore raw

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

Hello Charlie,

Thanks for the quick update, patch looks all good to me ?

Quoted 6 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.

Quoted 29 lines
---
 .../gstreamer1/gst1-plugins-base/gst1-plugins-base.mk    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +6 -3
index 66c136c36c..e80b301b82 100644
@@ -38,12 +38,15 @@ else
 GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled
 endif
 
+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
+
 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
-GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y)
Signature · 1 line
2.17.1

Cheers,
?Adri?n
-------------- 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/96db39d2/attachment.asc>

#2 lore raw

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

In reply to Charlie Turner

Hi Charlie,

Quoted 6 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.

I *finally* applied to master, thanks.

package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk else · line 41

Quoted 13 lines
---
 .../gstreamer1/gst1-plugins-base/gst1-plugins-base.mk    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +1 -0
index 66c136c36c..e80b301b82 100644
@@ -38,12 +38,15 @@ else
 GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL)$(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),)

Instead of this, I refactored it using the
BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API option, which is selected by those two. It has exactly the same effect and is much easer to read.

package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk else · line 47

Quoted 6 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +5 -0
+GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled
+else
+GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y)

... and I also moved these two conditions under the _API condition, so it's clear that it all belongs together.

Regards,
Arnout

Quoted 9 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +0 -3
 GST1_PLUGINS_BASE_GL_API_LIST = opengl
-GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled
 GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu
-else
-GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y)
#3 lore raw

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

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Hi Charlie,
On 08/08/2019 13:36, Charlie Turner wrote:

Quoted 8 lines
Quoted 6 lines

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.

I *finally* applied to master, thanks.

Committed to 2019.08.x, thanks. 2019.02.x uses an older gstreamer1 / autotools, so it isn't (directly) applicable.

Signature · 1 line
Bye, Peter Korsgaard