Skip to contentSkip to conversation

webkitgtk: remove an old workaround

PATCH New Francois Perrad 4 participants 7 messages Dec 25, 2018 – Jan 1, 2019

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH 1/2 webkitgtk: remove an old workaround

fixed upstream by https://trac.webkit.org/changeset/220007/webkit

Signed-off-by Francois Perrad <[email protected]>
---
 package/webkitgtk/webkitgtk.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
package/webkitgtk/webkitgtk.mk +1 -5
index 4cfddd1eb..e03fd969e 100644
@@ -39,13 +39,9 @@ WEBKITGTK_CONF_OPTS += \
 	-DENABLE_WEB_AUDIO=ON
 WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good
 else
-# ENABLE_MEDIA_STREAM has to be explicitly disabled because there is a missing
-# feature dependency in the WebKitGTK+ CMake files. This can be removed once
-# https://bugs.webkit.org/show_bug.cgi?id=174940 makes it into a release.
 WEBKITGTK_CONF_OPTS += \
 	-DENABLE_VIDEO=OFF \
-	-DENABLE_WEB_AUDIO=OFF \
-	-DENABLE_MEDIA_STREAM=OFF
+	-DENABLE_WEB_AUDIO=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_WEBKITGTK_WEBDRIVER),y)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 webkitgtk: fix host dependencies

python 2.7 is required by the cmake stuff.
bison & flex are not used in the webkitgtk tree.

Signed-off-by Francois Perrad <[email protected]>
---
 package/webkitgtk/webkitgtk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/webkitgtk/webkitgtk.mk +1 -1
index e03fd969e..80daadd15 100644
@@ -12,7 +12,7 @@ WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause
 WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-APPLE \
 	Source/WebCore/LICENSE-LGPL-2.1
-WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
+WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \
 	enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
 	libtasn1 libxml2 libxslt sqlite webp woff2
 WEBKITGTK_CONF_OPTS = \
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 webkitgtk: fix host dependencies

Hello Fran?ois,

Thanks for seding these cleanups, they look good to me.

Quoted 4 lines · Francois Perrad

python 2.7 is required by the cmake stuff.
bison & flex are not used in the webkitgtk tree.

Signed-off-by Francois Perrad <[email protected]>
Acked-by Adrian Perez de Castro <[email protected]>
Quoted 9 lines
---
 package/webkitgtk/webkitgtk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/webkitgtk/webkitgtk.mk +0 -0
index e03fd969e..80daadd15 100644

package/webkitgtk/webkitgtk.mk WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause · line 18

Quoted 8 lines
package/webkitgtk/webkitgtk.mk +1 -1
@@ -12,7 +12,7 @@ WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause
 WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-APPLE \
 	Source/WebCore/LICENSE-LGPL-2.1
-WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
+WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \
 	enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
 	libtasn1 libxml2 libxslt sqlite webp woff2
 WEBKITGTK_CONF_OPTS = \

-------------- 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/20181225/9f4c5606/attachment.asc>

#4 lore raw

PATCH 1/2 webkitgtk: remove an old workaround

In reply to Francois Perrad

Hello,

Quoted 3 lines · Francois Perrad

fixed upstream by https://trac.webkit.org/changeset/220007/webkit

Signed-off-by Francois Perrad <[email protected]>
Acked-by Adrian Perez de Castro <[email protected]>
Quoted 30 lines
---
 package/webkitgtk/webkitgtk.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
package/webkitgtk/webkitgtk.mk +1 -5
index 4cfddd1eb..e03fd969e 100644
@@ -39,13 +39,9 @@ WEBKITGTK_CONF_OPTS += \
 	-DENABLE_WEB_AUDIO=ON
 WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good
 else
-# ENABLE_MEDIA_STREAM has to be explicitly disabled because there is a missing
-# feature dependency in the WebKitGTK+ CMake files. This can be removed once
-# https://bugs.webkit.org/show_bug.cgi?id=174940 makes it into a release.
 WEBKITGTK_CONF_OPTS += \
 	-DENABLE_VIDEO=OFF \
-	-DENABLE_WEB_AUDIO=OFF \
-	-DENABLE_MEDIA_STREAM=OFF
+	-DENABLE_WEB_AUDIO=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_WEBKITGTK_WEBDRIVER),y)
Signature · 6 lines
2.17.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

-------------- 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/20181225/8e37bbb1/attachment.asc>

#5 lore raw

PATCH 1/2 webkitgtk: remove an old workaround

In reply to Francois Perrad

Hello,

Quoted 6 lines · Francois Perrad

fixed upstream by https://trac.webkit.org/changeset/220007/webkit

Signed-off-by Francois Perrad <[email protected]>
---
 package/webkitgtk/webkitgtk.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Thanks, both patches applied, with Adrian Acked-by. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com