| Message ID | 20190218171719.18721-2-aperez@igalia.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | Unify configuration/makefiles for the GTK and WPE WebKit packages | expand |
Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <aperez@igalia.com> a écrit : > 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 > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> > --- > 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%) > > diff --git a/package/Config.in b/package/Config.in > index 420e6e95a3..65faf1fcd6 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -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 > diff --git a/package/libwpe/Config.in b/package/webkit/libwpe/Config.in > similarity index 100% > rename from package/libwpe/Config.in > rename to package/webkit/libwpe/Config.in > diff --git a/package/libwpe/libwpe.hash b/package/webkit/libwpe/libwpe.hash > similarity index 100% > rename from package/libwpe/libwpe.hash > rename to package/webkit/libwpe/libwpe.hash > diff --git a/package/libwpe/libwpe.mk b/package/webkit/libwpe/libwpe.mk > similarity index 100% > rename from package/libwpe/libwpe.mk > rename to package/webkit/libwpe/libwpe.mk > diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk > new file mode 100644 > index 0000000000..47e94d72f6 > --- /dev/null > +++ b/package/webkit/webkit.mk > @@ -0,0 +1,7 @@ > > +################################################################################ > +# > +# Common definitions for the GTK and WPE WebKit ports. > +# > > +################################################################################ > + > +include $(sort $(wildcard package/webkit/*/*.mk)) > diff --git a/package/webkitgtk/Config.in > b/package/webkit/webkitgtk/Config.in > similarity index 100% > rename from package/webkitgtk/Config.in > rename to package/webkit/webkitgtk/Config.in > diff --git a/package/webkitgtk/webkitgtk.hash > b/package/webkit/webkitgtk/webkitgtk.hash > similarity index 100% > rename from package/webkitgtk/webkitgtk.hash > rename to package/webkit/webkitgtk/webkitgtk.hash > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkit/webkitgtk/ > webkitgtk.mk > similarity index 100% > rename from package/webkitgtk/webkitgtk.mk > rename to package/webkit/webkitgtk/webkitgtk.mk > diff --git a/package/wpebackend-fdo/Config.in > b/package/webkit/wpebackend-fdo/Config.in > similarity index 100% > rename from package/wpebackend-fdo/Config.in > rename to package/webkit/wpebackend-fdo/Config.in > diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash > b/package/webkit/wpebackend-fdo/wpebackend-fdo.hash > similarity index 100% > rename from package/wpebackend-fdo/wpebackend-fdo.hash > rename to package/webkit/wpebackend-fdo/wpebackend-fdo.hash > diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk > b/package/webkit/wpebackend-fdo/wpebackend-fdo.mk > similarity index 100% > rename from package/wpebackend-fdo/wpebackend-fdo.mk > rename to package/webkit/wpebackend-fdo/wpebackend-fdo.mk > diff --git a/package/wpewebkit/Config.in > b/package/webkit/wpewebkit/Config.in > similarity index 100% > rename from package/wpewebkit/Config.in > rename to package/webkit/wpewebkit/Config.in > diff --git a/package/wpewebkit/wpewebkit.hash > b/package/webkit/wpewebkit/wpewebkit.hash > similarity index 100% > rename from package/wpewebkit/wpewebkit.hash > rename to package/webkit/wpewebkit/wpewebkit.hash > diff --git a/package/wpewebkit/wpewebkit.mk b/package/webkit/wpewebkit/ > wpewebkit.mk > similarity index 100% > rename from package/wpewebkit/wpewebkit.mk > rename to package/webkit/wpewebkit/wpewebkit.mk > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > <div dir="ltr"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <<a href="mailto:aperez@igalia.com">aperez@igalia.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Move the packages related to the GTK and WPE WebKit ports (webkitgtk,<br> libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/<br> subbdirectory as the first step to unify some of their configuration.<br> <br></blockquote><div><br></div><div>Moving packages into a subdirectory is discouraged,</div><div> see <a href="https://buildroot.org/downloads/manual/manual.html#_package_directory">https://buildroot.org/downloads/manual/manual.html#_package_directory</a><br></div><div><br></div><div>François<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Signed-off-by: Adrian Perez de Castro <<a href="mailto:aperez@igalia.com" target="_blank">aperez@igalia.com</a>><br> ---<br> package/Config.in | 8 ++++----<br> package/{ => webkit}/libwpe/Config.in | 0<br> package/{ => webkit}/libwpe/libwpe.hash | 0<br> package/{ => webkit}/libwpe/<a href="http://libwpe.mk" rel="noreferrer" target="_blank">libwpe.mk</a> | 0<br> package/webkit/<a href="http://webkit.mk" rel="noreferrer" target="_blank">webkit.mk</a> | 7 +++++++<br> package/{ => webkit}/webkitgtk/Config.in | 0<br> package/{ => webkit}/webkitgtk/webkitgtk.hash | 0<br> package/{ => webkit}/webkitgtk/<a href="http://webkitgtk.mk" rel="noreferrer" target="_blank">webkitgtk.mk</a> | 0<br> package/{ => webkit}/wpebackend-fdo/Config.in | 0<br> package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash | 0<br> package/{ => webkit}/wpebackend-fdo/<a href="http://wpebackend-fdo.mk" rel="noreferrer" target="_blank">wpebackend-fdo.mk</a> | 0<br> package/{ => webkit}/wpewebkit/Config.in | 0<br> package/{ => webkit}/wpewebkit/wpewebkit.hash | 0<br> package/{ => webkit}/wpewebkit/<a href="http://wpewebkit.mk" rel="noreferrer" target="_blank">wpewebkit.mk</a> | 0<br> 14 files changed, 11 insertions(+), 4 deletions(-)<br> rename package/{ => webkit}/libwpe/Config.in (100%)<br> rename package/{ => webkit}/libwpe/libwpe.hash (100%)<br> rename package/{ => webkit}/libwpe/<a href="http://libwpe.mk" rel="noreferrer" target="_blank">libwpe.mk</a> (100%)<br> create mode 100644 package/webkit/<a href="http://webkit.mk" rel="noreferrer" target="_blank">webkit.mk</a><br> rename package/{ => webkit}/webkitgtk/Config.in (100%)<br> rename package/{ => webkit}/webkitgtk/webkitgtk.hash (100%)<br> rename package/{ => webkit}/webkitgtk/<a href="http://webkitgtk.mk" rel="noreferrer" target="_blank">webkitgtk.mk</a> (100%)<br> rename package/{ => webkit}/wpebackend-fdo/Config.in (100%)<br> rename package/{ => webkit}/wpebackend-fdo/wpebackend-fdo.hash (100%)<br> rename package/{ => webkit}/wpebackend-fdo/<a href="http://wpebackend-fdo.mk" rel="noreferrer" target="_blank">wpebackend-fdo.mk</a> (100%)<br> rename package/{ => webkit}/wpewebkit/Config.in (100%)<br> rename package/{ => webkit}/wpewebkit/wpewebkit.hash (100%)<br> rename package/{ => webkit}/wpewebkit/<a href="http://wpewebkit.mk" rel="noreferrer" target="_blank">wpewebkit.mk</a> (100%)<br> <br> diff --git a/package/Config.in b/package/Config.in<br> index 420e6e95a3..65faf1fcd6 100644<br> --- a/package/Config.in<br> +++ b/package/Config.in<br> @@ -1304,7 +1304,6 @@ menu "Graphics"<br> source "package/libva-intel-driver/Config.in"<br> source "package/libvdpau/Config.in"<br> source "package/libvips/Config.in"<br> - source "package/libwpe/Config.in"<br> source "package/menu-cache/Config.in"<br> source "package/opencv/Config.in"<br> source "package/opencv3/Config.in"<br> @@ -1320,11 +1319,12 @@ menu "Graphics"<br> source "package/wayland/Config.in"<br> source "package/wayland-protocols/Config.in"<br> source "package/waylandpp/Config.in"<br> - source "package/webkitgtk/Config.in"<br> + source "package/webkit/webkitgtk/Config.in"<br> + source "package/webkit/libwpe/Config.in"<br> + source "package/webkit/wpebackend-fdo/Config.in"<br> + source "package/webkit/wpewebkit/Config.in"<br> source "package/webp/Config.in"<br> source "package/woff2/Config.in"<br> - source "package/wpebackend-fdo/Config.in"<br> - source "package/wpewebkit/Config.in"<br> source "package/zbar/Config.in"<br> source "package/zxing-cpp/Config.in"<br> endmenu<br> diff --git a/package/libwpe/Config.in b/package/webkit/libwpe/Config.in<br> similarity index 100%<br> rename from package/libwpe/Config.in<br> rename to package/webkit/libwpe/Config.in<br> diff --git a/package/libwpe/libwpe.hash b/package/webkit/libwpe/libwpe.hash<br> similarity index 100%<br> rename from package/libwpe/libwpe.hash<br> rename to package/webkit/libwpe/libwpe.hash<br> diff --git a/package/libwpe/<a href="http://libwpe.mk" rel="noreferrer" target="_blank">libwpe.mk</a> b/package/webkit/libwpe/<a href="http://libwpe.mk" rel="noreferrer" target="_blank">libwpe.mk</a><br> similarity index 100%<br> rename from package/libwpe/<a href="http://libwpe.mk" rel="noreferrer" target="_blank">libwpe.mk</a><br> rename to package/webkit/libwpe/<a href="http://libwpe.mk" rel="noreferrer" target="_blank">libwpe.mk</a><br> diff --git a/package/webkit/<a href="http://webkit.mk" rel="noreferrer" target="_blank">webkit.mk</a> b/package/webkit/<a href="http://webkit.mk" rel="noreferrer" target="_blank">webkit.mk</a><br> new file mode 100644<br> index 0000000000..47e94d72f6<br> --- /dev/null<br> +++ b/package/webkit/<a href="http://webkit.mk" rel="noreferrer" target="_blank">webkit.mk</a><br> @@ -0,0 +1,7 @@<br> +################################################################################<br> +#<br> +# Common definitions for the GTK and WPE WebKit ports.<br> +#<br> +################################################################################<br> +<br> +include $(sort $(wildcard package/webkit/*/*.mk))<br> diff --git a/package/webkitgtk/Config.in b/package/webkit/webkitgtk/Config.in<br> similarity index 100%<br> rename from package/webkitgtk/Config.in<br> rename to package/webkit/webkitgtk/Config.in<br> diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkit/webkitgtk/webkitgtk.hash<br> similarity index 100%<br> rename from package/webkitgtk/webkitgtk.hash<br> rename to package/webkit/webkitgtk/webkitgtk.hash<br> diff --git a/package/webkitgtk/<a href="http://webkitgtk.mk" rel="noreferrer" target="_blank">webkitgtk.mk</a> b/package/webkit/webkitgtk/<a href="http://webkitgtk.mk" rel="noreferrer" target="_blank">webkitgtk.mk</a><br> similarity index 100%<br> rename from package/webkitgtk/<a href="http://webkitgtk.mk" rel="noreferrer" target="_blank">webkitgtk.mk</a><br> rename to package/webkit/webkitgtk/<a href="http://webkitgtk.mk" rel="noreferrer" target="_blank">webkitgtk.mk</a><br> diff --git a/package/wpebackend-fdo/Config.in b/package/webkit/wpebackend-fdo/Config.in<br> similarity index 100%<br> rename from package/wpebackend-fdo/Config.in<br> rename to package/webkit/wpebackend-fdo/Config.in<br> diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/webkit/wpebackend-fdo/wpebackend-fdo.hash<br> similarity index 100%<br> rename from package/wpebackend-fdo/wpebackend-fdo.hash<br> rename to package/webkit/wpebackend-fdo/wpebackend-fdo.hash<br> diff --git a/package/wpebackend-fdo/<a href="http://wpebackend-fdo.mk" rel="noreferrer" target="_blank">wpebackend-fdo.mk</a> b/package/webkit/wpebackend-fdo/<a href="http://wpebackend-fdo.mk" rel="noreferrer" target="_blank">wpebackend-fdo.mk</a><br> similarity index 100%<br> rename from package/wpebackend-fdo/<a href="http://wpebackend-fdo.mk" rel="noreferrer" target="_blank">wpebackend-fdo.mk</a><br> rename to package/webkit/wpebackend-fdo/<a href="http://wpebackend-fdo.mk" rel="noreferrer" target="_blank">wpebackend-fdo.mk</a><br> diff --git a/package/wpewebkit/Config.in b/package/webkit/wpewebkit/Config.in<br> similarity index 100%<br> rename from package/wpewebkit/Config.in<br> rename to package/webkit/wpewebkit/Config.in<br> diff --git a/package/wpewebkit/wpewebkit.hash b/package/webkit/wpewebkit/wpewebkit.hash<br> similarity index 100%<br> rename from package/wpewebkit/wpewebkit.hash<br> rename to package/webkit/wpewebkit/wpewebkit.hash<br> diff --git a/package/wpewebkit/<a href="http://wpewebkit.mk" rel="noreferrer" target="_blank">wpewebkit.mk</a> b/package/webkit/wpewebkit/<a href="http://wpewebkit.mk" rel="noreferrer" target="_blank">wpewebkit.mk</a><br> similarity index 100%<br> rename from package/wpewebkit/<a href="http://wpewebkit.mk" rel="noreferrer" target="_blank">wpewebkit.mk</a><br> rename to package/webkit/wpewebkit/<a href="http://wpewebkit.mk" rel="noreferrer" target="_blank">wpewebkit.mk</a><br> -- <br> 2.20.1<br> <br> _______________________________________________<br> buildroot mailing list<br> <a href="mailto:buildroot@busybox.net" target="_blank">buildroot@busybox.net</a><br> <a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/mailman/listinfo/buildroot</a><br> </blockquote></div></div></div>
Hello! On Fri, 22 Feb 2019 11:40:20 +0100, François Perrad <francois.perrad@gadz.org> wrote: > Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <aperez@igalia.com> a > écrit : > > > 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 > François > > > > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> > > --- > > 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%) > > > > diff --git a/package/Config.in b/package/Config.in > > index 420e6e95a3..65faf1fcd6 100644 > > --- a/package/Config.in > > +++ b/package/Config.in > > @@ -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 > > diff --git a/package/libwpe/Config.in b/package/webkit/libwpe/Config.in > > similarity index 100% > > rename from package/libwpe/Config.in > > rename to package/webkit/libwpe/Config.in > > diff --git a/package/libwpe/libwpe.hash b/package/webkit/libwpe/libwpe.hash > > similarity index 100% > > rename from package/libwpe/libwpe.hash > > rename to package/webkit/libwpe/libwpe.hash > > diff --git a/package/libwpe/libwpe.mk b/package/webkit/libwpe/libwpe.mk > > similarity index 100% > > rename from package/libwpe/libwpe.mk > > rename to package/webkit/libwpe/libwpe.mk > > diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk > > new file mode 100644 > > index 0000000000..47e94d72f6 > > --- /dev/null > > +++ b/package/webkit/webkit.mk > > @@ -0,0 +1,7 @@ > > > > +################################################################################ > > +# > > +# Common definitions for the GTK and WPE WebKit ports. > > +# > > > > +################################################################################ > > + > > +include $(sort $(wildcard package/webkit/*/*.mk)) > > diff --git a/package/webkitgtk/Config.in > > b/package/webkit/webkitgtk/Config.in > > similarity index 100% > > rename from package/webkitgtk/Config.in > > rename to package/webkit/webkitgtk/Config.in > > diff --git a/package/webkitgtk/webkitgtk.hash > > b/package/webkit/webkitgtk/webkitgtk.hash > > similarity index 100% > > rename from package/webkitgtk/webkitgtk.hash > > rename to package/webkit/webkitgtk/webkitgtk.hash > > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkit/webkitgtk/ > > webkitgtk.mk > > similarity index 100% > > rename from package/webkitgtk/webkitgtk.mk > > rename to package/webkit/webkitgtk/webkitgtk.mk > > diff --git a/package/wpebackend-fdo/Config.in > > b/package/webkit/wpebackend-fdo/Config.in > > similarity index 100% > > rename from package/wpebackend-fdo/Config.in > > rename to package/webkit/wpebackend-fdo/Config.in > > diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash > > b/package/webkit/wpebackend-fdo/wpebackend-fdo.hash > > similarity index 100% > > rename from package/wpebackend-fdo/wpebackend-fdo.hash > > rename to package/webkit/wpebackend-fdo/wpebackend-fdo.hash > > diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk > > b/package/webkit/wpebackend-fdo/wpebackend-fdo.mk > > similarity index 100% > > rename from package/wpebackend-fdo/wpebackend-fdo.mk > > rename to package/webkit/wpebackend-fdo/wpebackend-fdo.mk > > diff --git a/package/wpewebkit/Config.in > > b/package/webkit/wpewebkit/Config.in > > similarity index 100% > > rename from package/wpewebkit/Config.in > > rename to package/webkit/wpewebkit/Config.in > > diff --git a/package/wpewebkit/wpewebkit.hash > > b/package/webkit/wpewebkit/wpewebkit.hash > > similarity index 100% > > rename from package/wpewebkit/wpewebkit.hash > > rename to package/webkit/wpewebkit/wpewebkit.hash > > diff --git a/package/wpewebkit/wpewebkit.mk b/package/webkit/wpewebkit/ > > wpewebkit.mk > > similarity index 100% > > rename from package/wpewebkit/wpewebkit.mk > > rename to package/webkit/wpewebkit/wpewebkit.mk > > -- > > 2.20.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot@busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot --- [1] For example: https://github.com/WebPlatformForEmbedded/WPEBackend-rdk
Le ven. 22 févr. 2019 à 15:47, Adrian Perez de Castro <aperez@igalia.com> a écrit : > Hello! > > On Fri, 22 Feb 2019 11:40:20 +0100, François Perrad < > francois.perrad@gadz.org> wrote: > > Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <aperez@igalia.com> > a > > écrit : > > > > > 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 > > > > François > > > > Le ven. 22 févr. 2019 à 15:47, Adrian Perez de Castro <aperez@igalia.com> > a écrit : > Hello! > > On Fri, 22 Feb 2019 11:40:20 +0100, François Perrad < > francois.perrad@gadz.org> wrote: > > Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <aperez@igalia.com> > a > > écrit : > > > > > 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? > > 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 > Cheers, > > > -Adrián > > > > François > > > > > > > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> > > <div dir="ltr"><div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le ven. 22 févr. 2019 à 15:47, Adrian Perez de Castro <<a href="mailto:aperez@igalia.com">aperez@igalia.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello!<br> <br> On Fri, 22 Feb 2019 11:40:20 +0100, François Perrad <<a href="mailto:francois.perrad@gadz.org" target="_blank">francois.perrad@gadz.org</a>> wrote:<br> > Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <<a href="mailto:aperez@igalia.com" target="_blank">aperez@igalia.com</a>> a<br> > écrit :<br> > <br> > > Move the packages related to the GTK and WPE WebKit ports (webkitgtk,<br> > > libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/<br> > > subbdirectory as the first step to unify some of their configuration.<br> > ><br> > ><br> > Moving packages into a subdirectory is discouraged,<br> > see <a href="https://buildroot.org/downloads/manual/manual.html#_package_directory" rel="noreferrer" target="_blank">https://buildroot.org/downloads/manual/manual.html#_package_directory</a><br> <br> On the other hand, while adding new subdirectories is discouraged, it is<br> not forbidden. In this case I thought that it could make sense grouping the<br> the (very related) WebKit packages. Also note that I expect to be adding a<br> more in the future [1].<br> <br> That being said, I am of course open to alternative suggestions, and in<br> particular knowing where the common parts that this patch set adds into<br> “webkit/<a href="http://webkit.mk" rel="noreferrer" target="_blank">webkit.mk</a>” and “webkit/Config.in” would go in the case of not<br> making a subdirectory to group the related packages. Any ideas?<br> <br> Cheers,<br> <br> <br> -Adrián<br> <br> <br> > François<br> > <br><br><div dir="ltr" class="gmail_attr">Le ven. 22 févr. 2019 à 15:47, Adrian Perez de Castro <<a href="mailto:aperez@igalia.com">aperez@igalia.com</a>> a écrit :<br></div>Hello!<br> <br> On Fri, 22 Feb 2019 11:40:20 +0100, François Perrad <<a href="mailto:francois.perrad@gadz.org" target="_blank">francois.perrad@gadz.org</a>> wrote:<br> > Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <<a href="mailto:aperez@igalia.com" target="_blank">aperez@igalia.com</a>> a<br> > écrit :<br> > <br> > > Move the packages related to the GTK and WPE WebKit ports (webkitgtk,<br> > > libwpe, wpewebkit, wpebackend-fdo) under a new package/webkit/<br> > > subbdirectory as the first step to unify some of their configuration.<br> > ><br> > ><br> > Moving packages into a subdirectory is discouraged,<br> > see <a href="https://buildroot.org/downloads/manual/manual.html#_package_directory" rel="noreferrer" target="_blank">https://buildroot.org/downloads/manual/manual.html#_package_directory</a><br> <br> On the other hand, while adding new subdirectories is discouraged, it is<br> not forbidden. In this case I thought that it could make sense grouping the<br> the (very related) WebKit packages. Also note that I expect to be adding a<br> more in the future [1].<br> <br> That being said, I am of course open to alternative suggestions, and in<br> particular knowing where the common parts that this patch set adds into<br> “webkit/<a href="http://webkit.mk" rel="noreferrer" target="_blank">webkit.mk</a>” and “webkit/Config.in” would go in the case of not<br> making a subdirectory to group the related packages. Any ideas?<br> <br></blockquote><div><br></div><div>You could create a virtual package webkit with 2 providers webkitgtk & wpewebkit.</div><div>See details on <a href="https://buildroot.org/downloads/manual/manual.html#virtual-package-tutorial">https://buildroot.org/downloads/manual/manual.html#virtual-package-tutorial</a><br></div><div><br></div><div>midori still depends on webkitgtk,</div><div>but cog could depends on webkit, ie. using webkitgtk or wpewebkit.<br></div><div><br></div><div>François<br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Cheers,<br> <br> <br> -Adrián<br> <br> <br> > François<br> > <br> > <br> > > Signed-off-by: Adrian Perez de Castro <<a href="mailto:aperez@igalia.com" target="_blank">aperez@igalia.com</a>><br><br> </blockquote></div></div></div>
Hello François, Thanks for your comments, but I have reservations about your suggestion. On Fri, 22 Feb 2019 17:32:48 +0100, François Perrad <francois.perrad@gadz.org> wrote: > Le ven. 22 févr. 2019 à 15:47, Adrian Perez de Castro <aperez@igalia.com> a > écrit : > > > Hello! > > > > On Fri, 22 Feb 2019 11:40:20 +0100, François Perrad < > > francois.perrad@gadz.org> wrote: > > > Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <aperez@igalia.com> > > a > > > écrit : > > > > > > > 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 > > > > > > > François > > > > > > > Le ven. 22 févr. 2019 à 15:47, Adrian Perez de Castro <aperez@igalia.com> > > a écrit : > > Hello! > > > > On Fri, 22 Feb 2019 11:40:20 +0100, François Perrad < > > francois.perrad@gadz.org> wrote: > > > Le lun. 18 févr. 2019 à 18:17, Adrian Perez de Castro <aperez@igalia.com> > > a > > > écrit : > > > > > > > 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? > > > > > 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. > 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 > > Cheers, > > > > > > -Adrián > > > > > > > François > > > > > > > > > > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
diff --git a/package/Config.in b/package/Config.in index 420e6e95a3..65faf1fcd6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -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 diff --git a/package/libwpe/Config.in b/package/webkit/libwpe/Config.in similarity index 100% rename from package/libwpe/Config.in rename to package/webkit/libwpe/Config.in diff --git a/package/libwpe/libwpe.hash b/package/webkit/libwpe/libwpe.hash similarity index 100% rename from package/libwpe/libwpe.hash rename to package/webkit/libwpe/libwpe.hash diff --git a/package/libwpe/libwpe.mk b/package/webkit/libwpe/libwpe.mk similarity index 100% rename from package/libwpe/libwpe.mk rename to package/webkit/libwpe/libwpe.mk diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk new file mode 100644 index 0000000000..47e94d72f6 --- /dev/null +++ b/package/webkit/webkit.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# Common definitions for the GTK and WPE WebKit ports. +# +################################################################################ + +include $(sort $(wildcard package/webkit/*/*.mk)) diff --git a/package/webkitgtk/Config.in b/package/webkit/webkitgtk/Config.in similarity index 100% rename from package/webkitgtk/Config.in rename to package/webkit/webkitgtk/Config.in diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkit/webkitgtk/webkitgtk.hash similarity index 100% rename from package/webkitgtk/webkitgtk.hash rename to package/webkit/webkitgtk/webkitgtk.hash diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkit/webkitgtk/webkitgtk.mk similarity index 100% rename from package/webkitgtk/webkitgtk.mk rename to package/webkit/webkitgtk/webkitgtk.mk diff --git a/package/wpebackend-fdo/Config.in b/package/webkit/wpebackend-fdo/Config.in similarity index 100% rename from package/wpebackend-fdo/Config.in rename to package/webkit/wpebackend-fdo/Config.in diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/webkit/wpebackend-fdo/wpebackend-fdo.hash similarity index 100% rename from package/wpebackend-fdo/wpebackend-fdo.hash rename to package/webkit/wpebackend-fdo/wpebackend-fdo.hash diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/webkit/wpebackend-fdo/wpebackend-fdo.mk similarity index 100% rename from package/wpebackend-fdo/wpebackend-fdo.mk rename to package/webkit/wpebackend-fdo/wpebackend-fdo.mk diff --git a/package/wpewebkit/Config.in b/package/webkit/wpewebkit/Config.in similarity index 100% rename from package/wpewebkit/Config.in rename to package/webkit/wpewebkit/Config.in diff --git a/package/wpewebkit/wpewebkit.hash b/package/webkit/wpewebkit/wpewebkit.hash similarity index 100% rename from package/wpewebkit/wpewebkit.hash rename to package/webkit/wpewebkit/wpewebkit.hash diff --git a/package/wpewebkit/wpewebkit.mk b/package/webkit/wpewebkit/wpewebkit.mk similarity index 100% rename from package/wpewebkit/wpewebkit.mk rename to package/webkit/wpewebkit/wpewebkit.mk
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. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> --- 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%)