Unify configuration/makefiles for the GTK and WPE WebKit packages
cover Unify configuration/makefiles for the GTK and WPE WebKit packages
Hello!
Both the GTK and WPE WebKit ports share many dependencies (usage of GLib, libsoup, GStreamer, Cairo, etc.), their supported platforms, and both receive releases from the same stable branch following the same schedule:
major releases twice a year, around the release dates for GNOME.
Because of the above, it is possible to factor out commonalities from the packaging for both the GTK and WPE WebKit ports. This patch set tries to explore a possible way of doing it by moving both packages (plus libwpe and wpebackend-fdo, which are specific to the WPE port) into a new package/webkit/ subdirectory, where common parts live in a webkit.mk and a Config.in file.
I would really like to make it easier to maintain both the webkitgtk and wpewebkit packages by factoring out the commonalities, so I am looking forward to read you feedback on this patch set :-)
Regards,
Adrian Perez de Castro (4):
package/webkit: new home for GTK and WPE WebKit components package/webkit: unify *_ARCH_SUPPORTS{,_JIT} package/webkit: factor out common bits of .mk files package/webkit: factor out check for woff2
package/Config.in | 9 ++---
package/midori/Config.in | 4 +--
package/webkit/Config.in | 29 +++++++++++++++
package/{ => webkit}/libwpe/Config.in | 0
package/{ => webkit}/libwpe/libwpe.hash | 0
package/{ => webkit}/libwpe/libwpe.mk | 0
package/webkit/webkit.mk | 28 +++++++++++++++
package/{ => webkit}/webkitgtk/Config.in | 34 ++----------------
package/{ => webkit}/webkitgtk/webkitgtk.hash | 0
package/{ => webkit}/webkitgtk/webkitgtk.mk | 18 +++-------
package/{ => webkit}/wpebackend-fdo/Config.in | 0
.../wpebackend-fdo/wpebackend-fdo.hash | 0
.../wpebackend-fdo/wpebackend-fdo.mk | 0
package/{ => webkit}/wpewebkit/Config.in | 36 ++-----------------
package/{ => webkit}/wpewebkit/wpewebkit.hash | 0
package/{ => webkit}/wpewebkit/wpewebkit.mk | 21 ++---------
16 files changed, 76 insertions(+), 103 deletions(-)
create mode 100644 package/webkit/Config.in
rename package/{ => webkit}/libwpe/Config.in (100%)
rename package/{ => webkit}/libwpe/libwpe.hash (100%)
rename package/{ => webkit}/libwpe/libwpe.mk (100%)
create mode 100644 package/webkit/webkit.mk
rename package/{ => webkit}/webkitgtk/Config.in (71%)
rename package/{ => webkit}/webkitgtk/webkitgtk.hash (100%)
rename package/{ => webkit}/webkitgtk/webkitgtk.mk (85%)
rename package/{ => webkit}/wpebackend-fdo/Config.in (100%)
rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash (100%)
rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.mk (100%)
rename package/{ => webkit}/wpewebkit/Config.in (71%)
rename package/{ => webkit}/wpewebkit/wpewebkit.hash (100%)
rename package/{ => webkit}/wpewebkit/wpewebkit.mk (70%)Signature · 1 line
2.20.1
PATCH 1/4 package/webkit: new home for GTK and WPE WebKit components
Move the packages related to the GTK and WPE WebKit ports (webkitgtk, libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/ subbdirectory as the first step to unify some of their configuration.
---
package/Config.in | 8 ++++----
package/{ => webkit}/libwpe/Config.in | 0
package/{ => webkit}/libwpe/libwpe.hash | 0
package/{ => webkit}/libwpe/libwpe.mk | 0
package/webkit/webkit.mk | 7 +++++++
package/{ => webkit}/webkitgtk/Config.in | 0
package/{ => webkit}/webkitgtk/webkitgtk.hash | 0
package/{ => webkit}/webkitgtk/webkitgtk.mk | 0
package/{ => webkit}/wpebackend-fdo/Config.in | 0
package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash | 0
package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.mk | 0
package/{ => webkit}/wpewebkit/Config.in | 0
package/{ => webkit}/wpewebkit/wpewebkit.hash | 0
package/{ => webkit}/wpewebkit/wpewebkit.mk | 0
14 files changed, 11 insertions(+), 4 deletions(-)
rename package/{ => webkit}/libwpe/Config.in (100%)
rename package/{ => webkit}/libwpe/libwpe.hash (100%)
rename package/{ => webkit}/libwpe/libwpe.mk (100%)
create mode 100644 package/webkit/webkit.mk
rename package/{ => webkit}/webkitgtk/Config.in (100%)
rename package/{ => webkit}/webkitgtk/webkitgtk.hash (100%)
rename package/{ => webkit}/webkitgtk/webkitgtk.mk (100%)
rename package/{ => webkit}/wpebackend-fdo/Config.in (100%)
rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash (100%)
rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.mk (100%)
rename package/{ => webkit}/wpewebkit/Config.in (100%)
rename package/{ => webkit}/wpewebkit/wpewebkit.hash (100%)
rename package/{ => webkit}/wpewebkit/wpewebkit.mk (100%)package/Config.in +4 -4
@@ -1304,7 +1304,6 @@ menu "Graphics" source "package/libva-intel-driver/Config.in" source "package/libvdpau/Config.in" source "package/libvips/Config.in" - source "package/libwpe/Config.in" source "package/menu-cache/Config.in" source "package/opencv/Config.in" source "package/opencv3/Config.in"
@@ -1320,11 +1319,12 @@ menu "Graphics" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" source "package/waylandpp/Config.in" - source "package/webkitgtk/Config.in" + source "package/webkit/webkitgtk/Config.in" + source "package/webkit/libwpe/Config.in" + source "package/webkit/wpebackend-fdo/Config.in" + source "package/webkit/wpewebkit/Config.in" source "package/webp/Config.in" source "package/woff2/Config.in" - source "package/wpebackend-fdo/Config.in" - source "package/wpewebkit/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" endmenu
package/webkit/libwpe/Config.in renamed from package/libwpe/Config.in +0 -0
package/webkit/libwpe/libwpe.hash renamed from package/libwpe/libwpe.hash +0 -0
package/webkit/libwpe/libwpe.mk renamed from package/libwpe/libwpe.mk +0 -0
package/webkit/webkit.mk new file +7 -0
@@ -0,0 +1,7 @@ +################################################################################ +# +# Common definitions for the GTK and WPE WebKit ports. +# +################################################################################ + +include $(sort $(wildcard package/webkit/*/*.mk))
package/webkit/webkitgtk/Config.in renamed from package/webkitgtk/Config.in +0 -0
package/webkit/webkitgtk/webkitgtk.hash renamed from package/webkitgtk/webkitgtk.hash +0 -0
package/webkit/webkitgtk/webkitgtk.mk renamed from package/webkitgtk/webkitgtk.mk +0 -0
package/webkit/wpebackend-fdo/Config.in renamed from package/wpebackend-fdo/Config.in +0 -0
package/webkit/wpebackend-fdo/wpebackend-fdo.hash renamed from package/wpebackend-fdo/wpebackend-fdo.hash +0 -0
package/webkit/wpebackend-fdo/wpebackend-fdo.mk renamed from package/wpebackend-fdo/wpebackend-fdo.mk +0 -0
package/webkit/wpewebkit/Config.in renamed from package/wpewebkit/Config.in +0 -0
package/webkit/wpewebkit/wpewebkit.hash renamed from package/wpewebkit/wpewebkit.hash +0 -0
package/webkit/wpewebkit/wpewebkit.mk renamed from package/wpewebkit/wpewebkit.mk +0 -0
Signature · 1 line
2.20.1
PATCH 1/4 package/webkit: new home for GTK and WPE WebKit components
Le lun. 18 f?vr. 2019 ? 18:17, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 5 lines
Move the packages related to the GTK and WPE WebKit ports (webkitgtk, libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/ subbdirectory as the first step to unify some of their configuration.
Moving packages into a subdirectory is discouraged,
see https://buildroot.org/downloads/manual/manual.html#_package_directory
Fran?ois
Quoted 134 lines
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/Config.in | 8 ++++---- package/{ => webkit}/libwpe/Config.in | 0 package/{ => webkit}/libwpe/libwpe.hash | 0 package/{ => webkit}/libwpe/libwpe.mk | 0 package/webkit/webkit.mk | 7 +++++++ package/{ => webkit}/webkitgtk/Config.in | 0 package/{ => webkit}/webkitgtk/webkitgtk.hash | 0 package/{ => webkit}/webkitgtk/webkitgtk.mk | 0 package/{ => webkit}/wpebackend-fdo/Config.in | 0 package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash | 0 package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.mk | 0 package/{ => webkit}/wpewebkit/Config.in | 0 package/{ => webkit}/wpewebkit/wpewebkit.hash | 0 package/{ => webkit}/wpewebkit/wpewebkit.mk | 0 14 files changed, 11 insertions(+), 4 deletions(-) rename package/{ => webkit}/libwpe/Config.in (100%) rename package/{ => webkit}/libwpe/libwpe.hash (100%) rename package/{ => webkit}/libwpe/libwpe.mk (100%) create mode 100644 package/webkit/webkit.mk rename package/{ => webkit}/webkitgtk/Config.in (100%) rename package/{ => webkit}/webkitgtk/webkitgtk.hash (100%) rename package/{ => webkit}/webkitgtk/webkitgtk.mk (100%) rename package/{ => webkit}/wpebackend-fdo/Config.in (100%) rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash (100%) rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.mk (100%) rename package/{ => webkit}/wpewebkit/Config.in (100%) rename package/{ => webkit}/wpewebkit/wpewebkit.hash (100%) rename package/{ => webkit}/wpewebkit/wpewebkit.mk (100%)package/Config.in +4
-4@@ -1304,7 +1304,6 @@ menu "Graphics" source "package/libva-intel-driver/Config.in" source "package/libvdpau/Config.in" source "package/libvips/Config.in" - source "package/libwpe/Config.in" source "package/menu-cache/Config.in" source "package/opencv/Config.in" source "package/opencv3/Config.in"@@ -1320,11 +1319,12 @@ menu "Graphics" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" source "package/waylandpp/Config.in" - source "package/webkitgtk/Config.in" + source "package/webkit/webkitgtk/Config.in" + source "package/webkit/libwpe/Config.in" + source "package/webkit/wpebackend-fdo/Config.in" + source "package/webkit/wpewebkit/Config.in" source "package/webp/Config.in" source "package/woff2/Config.in" - source "package/wpebackend-fdo/Config.in" - source "package/wpewebkit/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" endmenupackage/webkit/libwpe/Config.in renamed from package/libwpe/Config.in +0
-0package/webkit/libwpe/libwpe.hash renamed from package/libwpe/libwpe.hash +0
-0package/webkit/libwpe/libwpe.mk renamed from package/libwpe/libwpe.mk +0
-0package/webkit/webkit.mk new file +7
-0@@ -0,0 +1,7 @@ +################################################################################ +# +# Common definitions for the GTK and WPE WebKit ports. +# +################################################################################ + +include $(sort $(wildcard package/webkit/*/*.mk))package/webkit/webkitgtk/Config.in renamed from package/webkitgtk/Config.in +0
-0package/webkit/webkitgtk/webkitgtk.hash renamed from package/webkitgtk/webkitgtk.hash +0
-0package/webkit/webkitgtk/ renamed from package/webkitgtk/webkitgtk.mk +0
-0webkitgtk.mk
similarity index 100%
rename frompackage/webkitgtk/webkitgtk.mk
rename topackage/webkit/webkitgtk/webkitgtk.mkpackage/webkit/wpebackend-fdo/Config.in renamed from package/wpebackend-fdo/Config.in +0
-0package/webkit/wpebackend-fdo/wpebackend-fdo.hash renamed from package/wpebackend-fdo/wpebackend-fdo.hash +0
-0package/webkit/wpebackend-fdo/wpebackend-fdo.mk renamed from package/wpebackend-fdo/wpebackend-fdo.mk +0
-0package/webkit/wpewebkit/Config.in renamed from package/wpewebkit/Config.in +0
-0package/webkit/wpewebkit/wpewebkit.hash renamed from package/wpewebkit/wpewebkit.hash +0
-0package/webkit/wpewebkit/ renamed from package/wpewebkit/wpewebkit.mk +0
-0wpewebkit.mk
similarity index 100%
rename frompackage/wpewebkit/wpewebkit.mk
rename topackage/webkit/wpewebkit/wpewebkit.mk
--
2.20.1
Quoted 5 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190222/41cd554f/attachment.html>
PATCH 1/4 package/webkit: new home for GTK and WPE WebKit components
Hello!
Quoted 10 lines · Fran?ois Perrad
Le lun. 18 f?vr. 2019 ? 18:17, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 5 lines
Move the packages related to the GTK and WPE WebKit ports (webkitgtk, libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/ subbdirectory as the first step to unify some of their configuration.
Moving packages into a subdirectory is discouraged,
see https://buildroot.org/downloads/manual/manual.html#_package_directory
On the other hand, while adding new subdirectories is discouraged, it is not forbidden. In this case I thought that it could make sense grouping the the (very related) WebKit packages. Also note that I expect to be adding a more in the future [1].
That being said, I am of course open to alternative suggestions, and in particular knowing where the common parts that this patch set adds into ?webkit/webkit.mk? and ?webkit/Config.in? would go in the case of not making a subdirectory to group the related packages. Any ideas?
Cheers,
-Adri?n
Quoted 137 lines
Fran?ois
Quoted 134 lines
Signed-off-by Adrian Perez de Castro <[email protected]>--- package/Config.in | 8 ++++---- package/{ => webkit}/libwpe/Config.in | 0 package/{ => webkit}/libwpe/libwpe.hash | 0 package/{ => webkit}/libwpe/libwpe.mk | 0 package/webkit/webkit.mk | 7 +++++++ package/{ => webkit}/webkitgtk/Config.in | 0 package/{ => webkit}/webkitgtk/webkitgtk.hash | 0 package/{ => webkit}/webkitgtk/webkitgtk.mk | 0 package/{ => webkit}/wpebackend-fdo/Config.in | 0 package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash | 0 package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.mk | 0 package/{ => webkit}/wpewebkit/Config.in | 0 package/{ => webkit}/wpewebkit/wpewebkit.hash | 0 package/{ => webkit}/wpewebkit/wpewebkit.mk | 0 14 files changed, 11 insertions(+), 4 deletions(-) rename package/{ => webkit}/libwpe/Config.in (100%) rename package/{ => webkit}/libwpe/libwpe.hash (100%) rename package/{ => webkit}/libwpe/libwpe.mk (100%) create mode 100644 package/webkit/webkit.mk rename package/{ => webkit}/webkitgtk/Config.in (100%) rename package/{ => webkit}/webkitgtk/webkitgtk.hash (100%) rename package/{ => webkit}/webkitgtk/webkitgtk.mk (100%) rename package/{ => webkit}/wpebackend-fdo/Config.in (100%) rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash (100%) rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.mk (100%) rename package/{ => webkit}/wpewebkit/Config.in (100%) rename package/{ => webkit}/wpewebkit/wpewebkit.hash (100%) rename package/{ => webkit}/wpewebkit/wpewebkit.mk (100%)package/Config.in +4
-4@@ -1304,7 +1304,6 @@ menu "Graphics" source "package/libva-intel-driver/Config.in" source "package/libvdpau/Config.in" source "package/libvips/Config.in" - source "package/libwpe/Config.in" source "package/menu-cache/Config.in" source "package/opencv/Config.in" source "package/opencv3/Config.in"@@ -1320,11 +1319,12 @@ menu "Graphics" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" source "package/waylandpp/Config.in" - source "package/webkitgtk/Config.in" + source "package/webkit/webkitgtk/Config.in" + source "package/webkit/libwpe/Config.in" + source "package/webkit/wpebackend-fdo/Config.in" + source "package/webkit/wpewebkit/Config.in" source "package/webp/Config.in" source "package/woff2/Config.in" - source "package/wpebackend-fdo/Config.in" - source "package/wpewebkit/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" endmenupackage/webkit/libwpe/Config.in renamed from package/libwpe/Config.in +0
-0package/webkit/libwpe/libwpe.hash renamed from package/libwpe/libwpe.hash +0
-0package/webkit/libwpe/libwpe.mk renamed from package/libwpe/libwpe.mk +0
-0package/webkit/webkit.mk new file +7
-0@@ -0,0 +1,7 @@ +################################################################################ +# +# Common definitions for the GTK and WPE WebKit ports. +# +################################################################################ + +include $(sort $(wildcard package/webkit/*/*.mk))package/webkit/webkitgtk/Config.in renamed from package/webkitgtk/Config.in +0
-0package/webkit/webkitgtk/webkitgtk.hash renamed from package/webkitgtk/webkitgtk.hash +0
-0package/webkit/webkitgtk/ renamed from package/webkitgtk/webkitgtk.mk +0
-0webkitgtk.mk
similarity index 100%
rename frompackage/webkitgtk/webkitgtk.mk
rename topackage/webkit/webkitgtk/webkitgtk.mkpackage/webkit/wpebackend-fdo/Config.in renamed from package/wpebackend-fdo/Config.in +0
-0package/webkit/wpebackend-fdo/wpebackend-fdo.hash renamed from package/wpebackend-fdo/wpebackend-fdo.hash +0
-0package/webkit/wpebackend-fdo/wpebackend-fdo.mk renamed from package/wpebackend-fdo/wpebackend-fdo.mk +0
-0package/webkit/wpewebkit/Config.in renamed from package/wpewebkit/Config.in +0
-0package/webkit/wpewebkit/wpewebkit.hash renamed from package/wpewebkit/wpewebkit.hash +0
-0package/webkit/wpewebkit/ renamed from package/wpewebkit/wpewebkit.mk +0
-0wpewebkit.mk
similarity index 100%
rename frompackage/wpewebkit/wpewebkit.mk
rename topackage/webkit/wpewebkit/wpewebkit.mk
--
2.20.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
---
[1] For example: https://github.com/WebPlatformForEmbedded/WPEBackend-rdk
-------------- 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/20190222/8d77b316/attachment.asc>
PATCH 1/4 package/webkit: new home for GTK and WPE WebKit components
Le ven. 22 f?vr. 2019 ? 15:47, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 60 lines
Hello!
Quoted 1 line · Fran?ois Perrad
Le lun. 18 f?vr. 2019 ? 18:17, Adrian Perez de Castro <[email protected]>
a
Quoted 9 lines
?crit :
Quoted 5 lines
Move the packages related to the GTK and WPE WebKit ports (webkitgtk, libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/ subbdirectory as the first step to unify some of their configuration.
Moving packages into a subdirectory is discouraged, see
https://buildroot.org/downloads/manual/manual.html#_package_directory
On the other hand, while adding new subdirectories is discouraged, it is not forbidden. In this case I thought that it could make sense grouping the the (very related) WebKit packages. Also note that I expect to be adding a more in the future [1].
That being said, I am of course open to alternative suggestions, and in particular knowing where the common parts that this patch set adds into ?webkit/webkit.mk? and ?webkit/Config.in? would go in the case of not making a subdirectory to group the related packages. Any ideas?
Cheers,
-Adri?n
Quoted 2 lines
Fran?ois
Le ven. 22 f?vr. 2019 ? 15:47, Adrian Perez de Castro <[email protected]> a ?crit :
Hello!Quoted 1 line · Fran?ois Perrad
Le lun. 18 f?vr. 2019 ? 18:17, Adrian Perez de Castro <[email protected]>
a
Quoted 9 lines
?crit :
Quoted 5 lines
Move the packages related to the GTK and WPE WebKit ports (webkitgtk, libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/ subbdirectory as the first step to unify some of their configuration.
Moving packages into a subdirectory is discouraged, see
https://buildroot.org/downloads/manual/manual.html#_package_directory
On the other hand, while adding new subdirectories is discouraged, it is not forbidden. In this case I thought that it could make sense grouping the the (very related) WebKit packages. Also note that I expect to be adding a more in the future [1].
Quoted 6 lines
That being said, I am of course open to alternative suggestions, and in particular knowing where the common parts that this patch set adds into ?webkit/webkit.mk? and ?webkit/Config.in? would go in the case of not making a subdirectory to group the related packages. Any ideas?
You could create a virtual package webkit with 2 providers webkitgtk & wpewebkit.
See details on
https://buildroot.org/downloads/manual/manual.html#virtual-package-tutorial
midori still depends on webkitgtk,
but cog could depends on webkit, ie. using webkitgtk or wpewebkit.
Fran?ois
Quoted 12 lines
Cheers,
-Adri?n
Quoted 4 lines
Fran?ois
Quoted 1 line
Signed-off-by Adrian Perez de Castro <[email protected]>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190222/63a4c315/attachment.html>
PATCH 1/4 package/webkit: new home for GTK and WPE WebKit components
Hello Fran?ois,
Thanks for your comments, but I have reservations about your suggestion.
Quoted 69 lines · Fran?ois Perrad
Le ven. 22 f?vr. 2019 ? 15:47, Adrian Perez de Castro <[email protected]> a ?crit :
Quoted 60 lines
Hello!
Quoted 1 line · Fran?ois Perrad
Le lun. 18 f?vr. 2019 ? 18:17, Adrian Perez de Castro <[email protected]>
a
Quoted 9 lines
?crit :
Quoted 5 lines
Move the packages related to the GTK and WPE WebKit ports (webkitgtk, libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/ subbdirectory as the first step to unify some of their configuration.
Moving packages into a subdirectory is discouraged, see
https://buildroot.org/downloads/manual/manual.html#_package_directory
On the other hand, while adding new subdirectories is discouraged, it is not forbidden. In this case I thought that it could make sense grouping the the (very related) WebKit packages. Also note that I expect to be adding a more in the future [1].
That being said, I am of course open to alternative suggestions, and in particular knowing where the common parts that this patch set adds into ?webkit/webkit.mk? and ?webkit/Config.in? would go in the case of not making a subdirectory to group the related packages. Any ideas?
Cheers,
-Adri?n
Quoted 2 lines
Fran?ois
Le ven. 22 f?vr. 2019 ? 15:47, Adrian Perez de Castro <[email protected]> a ?crit :
Hello!Quoted 1 line · Fran?ois Perrad
Le lun. 18 f?vr. 2019 ? 18:17, Adrian Perez de Castro <[email protected]>
a
Quoted 9 lines
?crit :
Quoted 5 lines
Move the packages related to the GTK and WPE WebKit ports (webkitgtk, libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/ subbdirectory as the first step to unify some of their configuration.
Moving packages into a subdirectory is discouraged, see
https://buildroot.org/downloads/manual/manual.html#_package_directory
On the other hand, while adding new subdirectories is discouraged, it is not forbidden. In this case I thought that it could make sense grouping the the (very related) WebKit packages. Also note that I expect to be adding a more in the future [1].
Quoted 6 lines
That being said, I am of course open to alternative suggestions, and in particular knowing where the common parts that this patch set adds into ?webkit/webkit.mk? and ?webkit/Config.in? would go in the case of not making a subdirectory to group the related packages. Any ideas?
Quoted 4 lines
You could create a virtual package webkit with 2 providers webkitgtk & wpewebkit.
See details on
https://buildroot.org/downloads/manual/manual.html#virtual-package-tutorial
There cannot be a virtual package, because both ?webkitgtk? and ?wpewebkit? can be built and be installed in the same system.
Quoted 2 lines
midori still depends on webkitgtk,
but cog could depends on webkit, ie. using webkitgtk or wpewebkit.
I don't think so. Cog can be built against WebKitGTK, that's true; but that is intended as a development aid and it is not recommended for normal usage. The main goal of Cog is to be a library to help out implementing custom WPE WebKit launchers, and it just happens to include a reference launcher as well.
The question still remains: if there is no subdirectory, where would the common bits from ?webkit/webkit.mk? and ?webkit/Config.in? belong?
Regards,
-Adri?n
Quoted 10 lines
Quoted 10 lines
Cheers,
-Adri?n
Quoted 4 lines
Fran?ois
Quoted 1 line
Signed-off-by Adrian Perez de Castro <[email protected]>
-------------- 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/20190222/2724c404/attachment.asc>
PATCH 2/4 package/webkit: unify *_ARCH_SUPPORTS{, _JIT}
In reply to Adrian Perez de CastroInstead of having BR2_PACKAGE_{WPEWEBKIT,WEBKITGTK}_ARCH_SUPPORTS and BR2_PACKAGE_{WPEWEBKIT,WEBKITGTK}_ARCH_SUPPORTS_JIT, which have the same conditions for both WebKit packages, unify them into common configuration variables BR2_WEBKIT_ARCH_SUPPORTS{,_JIT} which get used by both. Also, propagate the needed changes to the .mk files.
--- package/Config.in | 1 + package/midori/Config.in | 4 +-- package/webkit/Config.in | 29 +++++++++++++++++++++ package/webkit/webkitgtk/Config.in | 34 ++----------------------- package/webkit/webkitgtk/webkitgtk.mk | 2 +- package/webkit/wpewebkit/Config.in | 36 +++------------------------ package/webkit/wpewebkit/wpewebkit.mk | 2 +- 7 files changed, 39 insertions(+), 69 deletions(-) create mode 100644 package/webkit/Config.in
package/Config.in +1 -0
@@ -1320,6 +1320,7 @@ menu "Graphics" source "package/wayland-protocols/Config.in" source "package/waylandpp/Config.in" source "package/webkit/webkitgtk/Config.in" + source "package/webkit/Config.in" source "package/webkit/libwpe/Config.in" source "package/webkit/wpebackend-fdo/Config.in" source "package/webkit/wpewebkit/Config.in"
package/midori/Config.in +2 -2
@@ -1,5 +1,5 @@ comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_WEBKIT_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ !BR2_TOOLCHAIN_USES_GLIBC
@@ -12,7 +12,7 @@ config BR2_PACKAGE_MIDORI depends on BR2_HOST_GCC_AT_LEAST_4_8 # webkitgtk -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_WEBKIT_ARCH_SUPPORTS # GCR can only be used with the X11 backend select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_GRANITE
package/webkit/Config.in new file +29 -0
@@ -0,0 +1,29 @@ +config BR2_WEBKIT_ARCH_SUPPORTS + bool + # ARM needs BLX, so v5t+, BE completely untested so disabled + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + # Disabled on MIPS big endian due to sigbus + default y if BR2_mipsel || BR2_mips64el + # Disabled on PowerPC pending runtime testing + # Disabled on SuperH because of segfault + depends on BR2_USE_MMU # libglib2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt + +config BR2_WEBKIT_ARCH_SUPPORTS_JIT + bool + # ARM needs NEON for JIT. + default y if BR2_ARM_CPU_HAS_NEON + # AArch64 is supported upstream but not well tested on big-endian mode. + default y if BR2_aarch64 + # i386 & x86_64 don't have any special requirements. + default y if BR2_i386 + default y if BR2_x86_64 + # JIT is known not to work on MIPS64. + # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6 + # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258 + # The MIPS support is completely untested in big-endian mode. + default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 + default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5
package/webkit/webkitgtk/Config.in +2 -32
@@ -1,35 +1,5 @@ -config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - bool - # ARM needs BLX, so v5t+, BE completely untested so disabled - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 - default y if BR2_aarch64 || BR2_aarch64_be - default y if BR2_i386 || BR2_x86_64 - # Disabled on MIPS big endian due to sigbus - default y if BR2_mipsel || BR2_mips64el - # Disabled on PowerPC pending runtime testing - # Disabled on SuperH because of segfault - depends on BR2_USE_MMU # libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - -config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT - bool - # ARM needs NEON for JIT. - default y if BR2_ARM_CPU_HAS_NEON - # AArch64 is supported upstream but not well tested on big-endian mode. - default y if BR2_aarch64 - # i386 & x86_64 don't have any special requirements. - default y if BR2_i386 - default y if BR2_x86_64 - # JIT is known not to work on MIPS64. - # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6 - # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258 - # The MIPS support is completely untested in big-endian mode. - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 - comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_WEBKIT_ARCH_SUPPORTS depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_HOST_GCC_AT_LEAST_4_8 || \
@@ -43,7 +13,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_LIBGTK3 - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_WEBKIT_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_ENCHANT
package/webkit/webkitgtk/webkitgtk.mk +1 -1
@@ -27,7 +27,7 @@ WEBKITGTK_CONF_OPTS = \ -DUSE_LIBHYPHEN=OFF \ -DUSE_WOFF2=ON -ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y) +ifeq ($(BR2_WEBKIT_ARCH_SUPPORTS_JIT),y) WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON else WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF
package/webkit/wpewebkit/Config.in +3 -33
@@ -1,42 +1,12 @@ -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS - bool - # ARM needs BLX, so v5t+, BE completely untested so disabled - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 - default y if BR2_aarch64 || BR2_aarch64_be - default y if BR2_i386 || BR2_x86_64 - # Disabled on MIPS big endian due to sigbus - default y if BR2_mipsel || BR2_mips64el - # Disabled on PowerPC pending runtime testing - # Disabled on SuperH because of segfault - depends on BR2_USE_MMU # libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - -config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT - bool - # ARM needs NEON for JIT. - default y if BR2_ARM_CPU_HAS_NEON - # AArch64 is supported upstream but not well tested on big-endian mode. - default y if BR2_aarch64 - # i386 & x86_64 don't have any special requirements. - default y if BR2_i386 - default y if BR2_x86_64 - # JIT is known not to work on MIPS64. - # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6 - # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258 - # The MIPS support is completely untested in big-endian mode. - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 - default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 - comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8, host gcc >= 4.8" - depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_WEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_HOST_GCC_AT_LEAST_4_8 comment "wpewebkit needs an OpenGL ES w/ EGL backend" - depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_WEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL
@@ -51,7 +21,7 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy - depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_WEBKIT_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_HARFBUZZ
package/webkit/wpewebkit/wpewebkit.mk +1 -1
@@ -21,7 +21,7 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF -ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y) +ifeq ($(BR2_WEBKIT_ARCH_SUPPORTS_JIT),y) WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON else WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF
Signature · 1 line
2.20.1
PATCH 3/4 package/webkit: factor out common bits of .mk files
In reply to Adrian Perez de CastroMove the commen set of dependencies and CMake configuration options into webkit.mk, as well, as well as test for BR2_WEBKIT_ARCH_SUPPORTS_JIT (which was duplicated). While at it, the changes make the list of dependencies common to both packages (WEBKIT_DEPENDENCIES) more correct and thorough.
--- package/webkit/webkit.mk | 14 ++++++++++++++ package/webkit/webkitgtk/webkitgtk.mk | 15 +++------------ package/webkit/wpewebkit/wpewebkit.mk | 14 +++----------- 3 files changed, 20 insertions(+), 23 deletions(-)
package/webkit/webkit.mk +14 -0
@@ -4,4 +4,18 @@ # ################################################################################ +WEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ + cairo harfbuzz icu jpeg libgcrypt libsoup libpng libtasn1 \ + libxml2 libxslt sqlite webp +WEBKIT_CONF_OPTS = \ + -DENABLE_API_TESTS=OFF \ + -DENABLE_GTKDOC=OFF \ + -DENABLE_INTROSPECTION=OFF + +ifeq ($(BR2_WEBKIT_ARCH_SUPPORTS_JIT),y) +WEBKIT_CONF_OPTS += -DENABLE_JIT=ON +else +WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF +endif + include $(sort $(wildcard package/webkit/*/*.mk))
package/webkit/webkitgtk/webkitgtk.mk +3 -12
@@ -12,14 +12,11 @@ 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-python host-gperf \ - enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ - libtasn1 libxml2 libxslt sqlite webp woff2 +WEBKITGTK_DEPENDENCIES = $(WEBKIT_DEPENDENCIES) \ + enchant libgtk3 libsecret woff2 WEBKITGTK_CONF_OPTS = \ - -DENABLE_API_TESTS=OFF \ + $(WEBKIT_CONF_OPTS) -DENABLE_GEOLOCATION=OFF \ - -DENABLE_GTKDOC=OFF \ - -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \
@@ -27,12 +24,6 @@ WEBKITGTK_CONF_OPTS = \ -DUSE_LIBHYPHEN=OFF \ -DUSE_WOFF2=ON -ifeq ($(BR2_WEBKIT_ARCH_SUPPORTS_JIT),y) -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON -else -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -endif - ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=ON \
package/webkit/wpewebkit/wpewebkit.mk +3 -11
@@ -12,21 +12,13 @@ WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 -WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ - harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ - libpng libxslt wayland-protocols webp wpebackend-fdo - +WPEWEBKIT_DEPENDENCIES = $(WEBKIT_DEPENDENCIES) \ + libepoxy libgles wayland-protocols wpebackend-fdo WPEWEBKIT_CONF_OPTS = \ + $(WEBKIT_CONF_OPTS) \ -DPORT=WPE \ - -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF -ifeq ($(BR2_WEBKIT_ARCH_SUPPORTS_JIT),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON -else -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -endif - ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y) WPEWEBKIT_CONF_OPTS += \ -DENABLE_VIDEO=ON \
Signature · 1 line
2.20.1
PATCH 4/4 package/webkit: factor out check for woff2
In reply to Adrian Perez de CastroUsage of woff2 os configurable at build time for both wpewebkit and webkitgtk.
--- package/webkit/webkit.mk | 7 +++++++ package/webkit/webkitgtk/webkitgtk.mk | 5 ++--- package/webkit/wpewebkit/wpewebkit.mk | 7 ------- 3 files changed, 9 insertions(+), 10 deletions(-)
package/webkit/webkit.mk +7 -0
@@ -18,4 +18,11 @@ else WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF endif +ifeq ($(BR2_PACKAGE_WOFF2),y) +WEBKIT_CONF_OPTS += -DUSE_WOFF2=ON +WEBKIT_DEPENDENCIES += woff2 +else +WEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF +endif + include $(sort $(wildcard package/webkit/*/*.mk))
package/webkit/webkitgtk/webkitgtk.mk +2 -3
@@ -13,7 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_DEPENDENCIES = $(WEBKIT_DEPENDENCIES) \ - enchant libgtk3 libsecret woff2 + enchant libgtk3 libsecret WEBKITGTK_CONF_OPTS = \ $(WEBKIT_CONF_OPTS) -DENABLE_GEOLOCATION=OFF \
@@ -21,8 +21,7 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ -DUSE_LIBNOTIFY=OFF \ - -DUSE_LIBHYPHEN=OFF \ - -DUSE_WOFF2=ON + -DUSE_LIBHYPHEN=OFF ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y) WEBKITGTK_CONF_OPTS += \
package/webkit/wpewebkit/wpewebkit.mk +0 -7
@@ -43,11 +43,4 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif -ifeq ($(BR2_PACKAGE_WOFF2),y) -WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON -WPEWEBKIT_DEPENDENCIES += woff2 -else -WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF -endif - $(eval $(cmake-package))
Signature · 1 line
2.20.1
cover Unify configuration/makefiles for the GTK and WPE WebKit packages
In reply to Adrian Perez de CastroHi Adrian,
It took us a bit of time, but finally a few of us got together and discussed
this series.
Quoted 14 lines · Adrian Perez de Castro
Hello!
Both the GTK and WPE WebKit ports share many dependencies (usage of GLib, libsoup, GStreamer, Cairo, etc.), their supported platforms, and both receive releases from the same stable branch following the same schedule:
major releases twice a year, around the release dates for GNOME.Because of the above, it is possible to factor out commonalities from the packaging for both the GTK and WPE WebKit ports. This patch set tries to explore a possible way of doing it by moving both packages (plus libwpe and wpebackend-fdo, which are specific to the WPE port) into a new package/webkit/ subdirectory, where common parts live in a webkit.mk and a Config.in file.
Quoted 3 lines
I would really like to make it easier to maintain both the webkitgtk and wpewebkit packages by factoring out the commonalities, so I am looking forward to read you feedback on this patch set :-)
We doubt that this really makes it easier to maintain these packages.
One of the design guidelines of Buildroot is "Explicit rather than implicit".
Although software developers are tempted to "refactor" common bits into variables, this is often not making it easier to understand the code, and also not making it easier to change it. The refactoring of this series smells a bit like that: it factors out the options that happen to be the same.
Also, it makes these packages different from how we normally do things in
Buildroot. Normally, we don't use subdirectories. Also normally, the .mk file is self-contained, so within one file (and assuming you know how the infra works), you have everything needed to understand how the build system will behave. After this series, it will become more difficult to find out e.g. why the package has this particular dependency or config option. When you want to change something in wpewebkit, you need to also open, look at and potentially modify webkit.mk.
Admittedly, the latter can be an advantage too: when you're editing wpewebkit,
you're forced to consider if and how it impacts webkitgtk as well. But the same could be achieved by simply adding a comment in the .mk file that you should also look at the other package and do similar updates there.
To compare: we have for example mesa3d and mesa3d-headers, which are two
separate independent packages even though they're tightly related. For those, we consciously chose to keep them separate to keep things explicit. In the end, not so much would be shared between the two packages. I think we have a similar case
here: the common Config.in and webkit.mk files are less than 30 lines, and the non-shared Config.in and .mk files are much larger than that.
Therefore, I've marked the series as Rejected in patchwork.
However, it's a thin line. If you really believe that unifying these packages
would make maintaining them significantly easier, feel free to resubmit the series, with a short explanation why it makes life easier. This probably means:
how does this refactoring make it less likely that you make a mistake when you're updating the webkit stuff.
In case you would do that, I have one more suggestion: you should probably also
factor out WEBKIT_MAJOR = 2.22. Otherwise, a common _ARCH_DEPENDS risks to become incorrect when one of them is bumped and the other is not.
Regards,
Arnout
cover Unify configuration/makefiles for the GTK and WPE WebKit packages
Hello Arnout (and everybody else),
Quoted 2 lines · Arnout Vandecappelle
It took us a bit of time, but finally a few of us got together and discussed
this series.
No problem at all :)
Quoted 55 lines · Adrian Perez de Castro
Quoted 14 lines
Hello!
Both the GTK and WPE WebKit ports share many dependencies (usage of GLib, libsoup, GStreamer, Cairo, etc.), their supported platforms, and both receive releases from the same stable branch following the same schedule:
major releases twice a year, around the release dates for GNOME.Because of the above, it is possible to factor out commonalities from the packaging for both the GTK and WPE WebKit ports. This patch set tries to explore a possible way of doing it by moving both packages (plus libwpe and wpebackend-fdo, which are specific to the WPE port) into a new package/webkit/ subdirectory, where common parts live in a webkit.mk and a Config.in file.
Quoted 3 lines
I would really like to make it easier to maintain both the webkitgtk and wpewebkit packages by factoring out the commonalities, so I am looking forward to read you feedback on this patch set :-)
We doubt that this really makes it easier to maintain these packages.
One of the design guidelines of Buildroot is "Explicit rather than implicit".
Although software developers are tempted to "refactor" common bits into variables, this is often not making it easier to understand the code, and also not making it easier to change it. The refactoring of this series smells a bit like that: it factors out the options that happen to be the same.Also, it makes these packages different from how we normally do things in
Buildroot. Normally, we don't use subdirectories. Also normally, the .mk file is self-contained, so within one file (and assuming you know how the infra works), you have everything needed to understand how the build system will behave. After this series, it will become more difficult to find out e.g. why the package has this particular dependency or config option. When you want to change something in wpewebkit, you need to also open, look at and potentially modify webkit.mk.Admittedly, the latter can be an advantage too: when you're editing wpewebkit,
you're forced to consider if and how it impacts webkitgtk as well. But the same could be achieved by simply adding a comment in the .mk file that you should also look at the other package and do similar updates there.To compare: we have for example mesa3d and mesa3d-headers, which are two
separate independent packages even though they're tightly related. For those, we consciously chose to keep them separate to keep things explicit. In the end, not so much would be shared between the two packages. I think we have a similar case
here: the common Config.in and webkit.mk files are less than 30 lines, and the non-shared Config.in and .mk files are much larger than that.Therefore, I've marked the series as Rejected in patchwork.
However, it's a thin line. If you really believe that unifying these packages
would make maintaining them significantly easier, feel free to resubmit the series, with a short explanation why it makes life easier. This probably means:
how does this refactoring make it less likely that you make a mistake when you're updating the webkit stuff.
Quoted 3 lines
In case you would do that, I have one more suggestion: you should probably also
factor outWEBKIT_MAJOR= 2.22. Otherwise, a common_ARCH_DEPENDSrisks to become incorrect when one of them is bumped and the other is not.
I understand the rationale, and I am now convinced that it makes more sense to maintain both packages separately.
Also, trying to look at things with my ?Buildroot packager? hat, it can happen that we want to ship different versions of them at some point (e.g. WebKitGTK 2.24.x and WPE WebKit 2.22.x) in the same Buildroot release for $REASONS ? having the packages completely separate allows for that. Moreover, while right now I am maintaining both packages, it is not unthinkable that different people might want to take care of each package separately, and having two independent packages would allow for that with less friction, as it would not need different people to coordinate.
While we (as WebKit maintainers) do not expect big differences between both the GTK and WPE ports appearing in the future, and we also do try hard to keep releases for both in sync, it might happen that both WebKit ports drift apart. Having two completely separate packages in Buildroot can be seen also as a ?just in case? safeguard for the future.
From now on I will keep maintenance of both packages separate.
Thanks for the feedback!
?Adri?n
P.S: Now I am ready to look into updating to 2.24.x, which has been out
for a while :)
-------------- 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/20190426/dcad805c/attachment.asc>