Skip to contentSkip to conversation

webkitgtk24: fix building with rpi egl/gles

PATCH Superseded Gustavo Zacarias 2 participants 3 messages Feb 8, 2016 – Feb 9, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 webkitgtk24: fix building with rpi egl/gles

It needs special handling for the additional include fixes. Fixes:
http://autobuild.buildroot.net/results/083/083ce94b1ac61a60aa16906336612af59e32b18b/

---
 package/webkitgtk24/webkitgtk24.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/webkitgtk24/webkitgtk24.mk +7 -0
index 8a831d9..07927ac 100644
@@ -69,6 +69,13 @@ WEBKITGTK24_CONF_OPTS += \
 	--enable-webgl \
 	--disable-glx
 WEBKITGTK24_DEPENDENCIES += libegl libgles
+# RPi EGL/GLES needs special handling
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+WEBKITGTK24_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) \
+	-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
+        -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
+	LIBS="-lvcos -lvchostif"
+endif
 # No GL
 else
 WEBKITGTK24_CONF_OPTS += \
Signature · 1 line
2.4.10
#1 lore raw

PATCH 1/1 webkitgtk24: fix building with rpi egl/gles

Dear Gustavo Zacarias,

Quoted 13 lines · Gustavo Zacarias

It needs special handling for the additional include fixes. Fixes:
http://autobuild.buildroot.net/results/083/083ce94b1ac61a60aa16906336612af59e32b18b/

---
 package/webkitgtk24/webkitgtk24.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/webkitgtk24/webkitgtk24.mk +0 -0
index 8a831d9..07927ac 100644

package/webkitgtk24/webkitgtk24.mk WEBKITGTK24_CONF_OPTS += \ · line 78

Quoted 10 lines
package/webkitgtk24/webkitgtk24.mk +7 -0
@@ -69,6 +69,13 @@ WEBKITGTK24_CONF_OPTS += \
 	--enable-webgl \
 	--disable-glx
 WEBKITGTK24_DEPENDENCIES += libegl libgles
+# RPi EGL/GLES needs special handling
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+WEBKITGTK24_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) \
+	-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
+        -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
+	LIBS="-lvcos -lvchostif"
+endif

Isn't it possible to use pkg-config ? We install egl.pc and glesv2.pc from all our OpenGL implementations specifically for this reason.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 webkitgtk24: fix building with rpi egl/gles

Quoted 6 lines · Thomas Petazzoni

Isn't it possible to use pkg-config ? We install egl.pc and glesv2.pc from all our OpenGL implementations specifically for this reason.

Thanks!

Thomas

Hi.
Ehhh sure, though i did find it odd that many others users of these don't do it, like kodi, gst-omx, libcec and gst1-plugins-bad.

Care to look at http://patchwork.ozlabs.org/patch/564312/ as well since it fixes the other webkitgtk24 build failure? (unknown/dependencies, plus it's also nice to save users some crazyness).

http://patchwork.ozlabs.org/patch/564313/ might be nice as well to legacy the midori https option since it becomes redundant.

(these two are backports of 2.10.x which doesn't make sense to submit until libgtk3 is bumped/wayland fixed).

Regards.