Skip to contentSkip to conversation

webkitgtk24: fix building with rpi egl/gles

PATCH New Gustavo Zacarias 2 participants 2 messages Feb 9, 2016 – Feb 25, 2016

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

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

Some egl/gles binary-only implementations need some extra help in the form of additional include directories, like rpi-userland. Fixes:

http://autobuild.buildroot.net/results/083/083ce94b1ac61a60aa16906336612af59e32b18b/

Signed-off-by Gustavo Zacarias <[email protected]>

---
v2: Use pkg-config

 package/webkitgtk24/webkitgtk24.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
package/webkitgtk24/webkitgtk24.mk +6 -2
index 8a831d9..8556f4e 100644
@@ -13,8 +13,8 @@ WEBKITGTK24_LICENSE_FILES = \
 	Source/WebCore/LICENSE-APPLE \
 	Source/WebCore/LICENSE-LGPL-2
 WEBKITGTK24_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
-	enchant harfbuzz icu jpeg libcurl libgtk2 libsecret libsoup \
-	libxml2 libxslt sqlite webp
+	host-pkgconf enchant harfbuzz icu jpeg libcurl libgtk2 \
+	libsecret libsoup libxml2 libxslt sqlite webp
 
 WEBKITGTK24_DEPENDENCIES += \
 	$(if $(BR_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) \

@@ -69,6 +69,10 @@ WEBKITGTK24_CONF_OPTS += \
 	--enable-webgl \
 	--disable-glx
 WEBKITGTK24_DEPENDENCIES += libegl libgles
+# Some EGL/GLES implementations needs extra help (eg. rpi-userland)
+WEBKITGTK24_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) \
+	`$(PKG_CONFIG_HOST_BINARY) --cflags egl` \
+	`$(PKG_CONFIG_HOST_BINARY) --clfags glesv2`"
 # No GL
 else
 WEBKITGTK24_CONF_OPTS += \
Signature · 1 line
2.4.10
Applied
#1 lore raw

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

Dear Gustavo Zacarias,

Quoted 8 lines · Gustavo Zacarias

Some egl/gles binary-only implementations need some extra help in the form of additional include directories, like rpi-userland. Fixes:

http://autobuild.buildroot.net/results/083/083ce94b1ac61a60aa16906336612af59e32b18b/

Signed-off-by Gustavo Zacarias <[email protected]>

---
v2: Use pkg-config

Applied to master, thanks.

Thomas

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