diff mbox series

[3/3,v4] package/qt5/qt5webengine: fix build dependencies for autodetected packages

Message ID 6efc39e9d97769fae93be2bcb91f56b050dda219.1600290685.git.yann.morin.1998@free.fr
State New
Headers show
Series [1/3,v4] package/qt5/qt5webengine: fix ffmpeg/codec/alsa option handling for latest | expand

Commit Message

Yann E. MORIN Sept. 16, 2020, 9:11 p.m. UTC
From: Nathan Ford <nford@westpond.com>

Signed-off-by: Nathan Ford <nford@westpond.com>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/qt5/qt5webengine/qt5webengine.mk | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

Comments

Thomas Petazzoni Sept. 17, 2020, 6:51 p.m. UTC | #1
On Wed, 16 Sep 2020 23:11:34 +0200
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> +ifeq ($(BR2_PACKAGE_JSONCPP),y)
> +QT5WEBENGINE_DEPENDENCIES += jsoncpp
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LCMS2),y)
> +QT5WEBENGINE_DEPENDENCIES += lcms2
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBEVENT),y)
> +QT5WEBENGINE_DEPENDENCIES += libevent
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBXML2),y)
> +QT5WEBENGINE_DEPENDENCIES += libxml2
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBXSLT),y)
> +QT5WEBENGINE_DEPENDENCIES += libxslt
> +endif
> +
> +ifeq ($(BR2_PACKAGE_PROTOBUF),y)
> +QT5WEBENGINE_DEPENDENCIES += protobuf
> +endif
> +
> +ifeq ($(BR2_PACKAGE_SNAPPY),y)
> +QT5WEBENGINE_DEPENDENCIES += snappy
> +endif

I am not 100% sure but I believe those dependencies do have options,
much like the -webengine-ffmpeg option that PATCH 1/3 is using. If you
look at ./src/core/configure.json in the qt5webengine sources, you can
see:

    "commandline": {
        "options": {
            "webengine-alsa": "boolean",
            "webengine-embedded-build": "boolean",
            "webengine-full-debug-info": "boolean",
            "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } },
            "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
            "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
            "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
            "webengine-pepper-plugins": "boolean",
            "webengine-printing-and-pdf": "boolean",
            "webengine-proprietary-codecs": "boolean",
            "webengine-pulseaudio": "boolean",
            "webengine-spellchecker": "boolean",
            "webengine-native-spellchecker": "boolean",
            "webengine-extensions": "boolean",
            "webengine-webrtc": "boolean",
            "webengine-geolocation": "boolean",
            "webengine-webchannel": "boolean",
            "webengine-kerberos": "boolean",
            "alsa": { "type": "boolean", "name": "webengine-alsa" },
            "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
            "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
            "opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
            "webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
            "pepper-plugins": { "type": "boolean", "name": "webengine-pepper-plugins" },
            "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" },
            "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" },
            "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" },
            "extensions": { "type": "boolean", "name": "webengine-extensions" },
            "webrtc": { "type": "boolean", "name": "webengine-webrtc" }
        }
    },

So it seems like if we have a -webengine-ffmpeg option, then we should
also have many other options to enable (and perhaps disable ?) other
optional features.

However, I'm not sure to understand the difference between the
"webengine-<something>" option and the corresponding "<something>"
option.

Also, it seems like some options such as webengine-ffmpeg or
webengine-icu can take multiple values: they are enums and not
booleans. should we use -webengine-ffmpeg=system for example ? Ditto
for the other dependencies;

For the record, the qt5webengine source code bundles chromium in
./src/3rdparty/, which itself bundles a bunch of things including
ffmpeg in ./src/3rdparty/chromium/third_party/ffmpeg/ (do you like when
a 3rdparty folder includes another third_party folder ?).

Obviously, in the context of Buildroot, we'd prefer to use as few
bundled libraries as possible, and use as much as possible system
libraries.

How is the configure.json above being parsed and used ?

Thomas
Nathan Ford Sept. 17, 2020, 7:22 p.m. UTC | #2
Hi Thomas,

In src/buildtools/configure.json some of the library dependencies have
had their auto detection disabled ( look for the key "autoDetect" in
the features section ), at least as of 5.14.2 ( I have not migrated to
newer for the projects I work on yet ).

I assumed that any lib that qt5webengine built itself was a hard
dependency, so if it is present in the buildroot build, use it,
otherwise let qt5webengine build its own. The alternative is to make
all those libs build dependencies of qt5webengine.

--Nate



On Thu, Sep 17, 2020 at 2:51 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Wed, 16 Sep 2020 23:11:34 +0200
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
>
> > +ifeq ($(BR2_PACKAGE_JSONCPP),y)
> > +QT5WEBENGINE_DEPENDENCIES += jsoncpp
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_LCMS2),y)
> > +QT5WEBENGINE_DEPENDENCIES += lcms2
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_LIBEVENT),y)
> > +QT5WEBENGINE_DEPENDENCIES += libevent
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_LIBXML2),y)
> > +QT5WEBENGINE_DEPENDENCIES += libxml2
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_LIBXSLT),y)
> > +QT5WEBENGINE_DEPENDENCIES += libxslt
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_PROTOBUF),y)
> > +QT5WEBENGINE_DEPENDENCIES += protobuf
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_SNAPPY),y)
> > +QT5WEBENGINE_DEPENDENCIES += snappy
> > +endif
>
> I am not 100% sure but I believe those dependencies do have options,
> much like the -webengine-ffmpeg option that PATCH 1/3 is using. If you
> look at ./src/core/configure.json in the qt5webengine sources, you can
> see:
>
>     "commandline": {
>         "options": {
>             "webengine-alsa": "boolean",
>             "webengine-embedded-build": "boolean",
>             "webengine-full-debug-info": "boolean",
>             "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } },
>             "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
>             "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
>             "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
>             "webengine-pepper-plugins": "boolean",
>             "webengine-printing-and-pdf": "boolean",
>             "webengine-proprietary-codecs": "boolean",
>             "webengine-pulseaudio": "boolean",
>             "webengine-spellchecker": "boolean",
>             "webengine-native-spellchecker": "boolean",
>             "webengine-extensions": "boolean",
>             "webengine-webrtc": "boolean",
>             "webengine-geolocation": "boolean",
>             "webengine-webchannel": "boolean",
>             "webengine-kerberos": "boolean",
>             "alsa": { "type": "boolean", "name": "webengine-alsa" },
>             "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
>             "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
>             "opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
>             "webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
>             "pepper-plugins": { "type": "boolean", "name": "webengine-pepper-plugins" },
>             "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" },
>             "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" },
>             "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" },
>             "extensions": { "type": "boolean", "name": "webengine-extensions" },
>             "webrtc": { "type": "boolean", "name": "webengine-webrtc" }
>         }
>     },
>
> So it seems like if we have a -webengine-ffmpeg option, then we should
> also have many other options to enable (and perhaps disable ?) other
> optional features.
>
> However, I'm not sure to understand the difference between the
> "webengine-<something>" option and the corresponding "<something>"
> option.
>
> Also, it seems like some options such as webengine-ffmpeg or
> webengine-icu can take multiple values: they are enums and not
> booleans. should we use -webengine-ffmpeg=system for example ? Ditto
> for the other dependencies;
>
> For the record, the qt5webengine source code bundles chromium in
> ./src/3rdparty/, which itself bundles a bunch of things including
> ffmpeg in ./src/3rdparty/chromium/third_party/ffmpeg/ (do you like when
> a 3rdparty folder includes another third_party folder ?).
>
> Obviously, in the context of Buildroot, we'd prefer to use as few
> bundled libraries as possible, and use as much as possible system
> libraries.
>
> How is the configure.json above being parsed and used ?
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni Sept. 17, 2020, 8:07 p.m. UTC | #3
On Thu, 17 Sep 2020 15:22:55 -0400
Nathan Ford <nford@westpond.com> wrote:

> In src/buildtools/configure.json some of the library dependencies have
> had their auto detection disabled ( look for the key "autoDetect" in
> the features section ), at least as of 5.14.2 ( I have not migrated to
> newer for the projects I work on yet ).

Ah yes, there was also src/buildtools/configure.json, which I don't
know how it interacts with ./src/core/configure.json...

So, the ones that have "autoDetect": "false", it means that the build
system doesn't try to detect them, and it will only enable them if
explicitly enabled?

> I assumed that any lib that qt5webengine built itself was a hard
> dependency, so if it is present in the buildroot build, use it,
> otherwise let qt5webengine build its own. The alternative is to make
> all those libs build dependencies of qt5webengine.

As much as possible we want to:

 (1) Use system libraries installed of bundled ones

 (2) Be explicit when handling optional dependencies by telling the
     build system "please enable support for FOO", "please disable support
     for FOO".

Thomas
Peter Seiderer Sept. 18, 2020, 8:33 p.m. UTC | #4
Re-add CC: Yann, buildroot

Sorry,
Peter

On Fri, 18 Sep 2020 22:30:27 +0200, Peter Seiderer <ps.report@gmx.net> wrote:

> Hello Thomas,
>
> On Thu, 17 Sep 2020 20:51:47 +0200, Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
>
> > On Wed, 16 Sep 2020 23:11:34 +0200
> > "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> >
> > > +ifeq ($(BR2_PACKAGE_JSONCPP),y)
> > > +QT5WEBENGINE_DEPENDENCIES += jsoncpp
> > > +endif
> > > +
> > > +ifeq ($(BR2_PACKAGE_LCMS2),y)
> > > +QT5WEBENGINE_DEPENDENCIES += lcms2
> > > +endif
> > > +
> > > +ifeq ($(BR2_PACKAGE_LIBEVENT),y)
> > > +QT5WEBENGINE_DEPENDENCIES += libevent
> > > +endif
> > > +
> > > +ifeq ($(BR2_PACKAGE_LIBXML2),y)
> > > +QT5WEBENGINE_DEPENDENCIES += libxml2
> > > +endif
> > > +
> > > +ifeq ($(BR2_PACKAGE_LIBXSLT),y)
> > > +QT5WEBENGINE_DEPENDENCIES += libxslt
> > > +endif
> > > +
> > > +ifeq ($(BR2_PACKAGE_PROTOBUF),y)
> > > +QT5WEBENGINE_DEPENDENCIES += protobuf
> > > +endif
> > > +
> > > +ifeq ($(BR2_PACKAGE_SNAPPY),y)
> > > +QT5WEBENGINE_DEPENDENCIES += snappy
> > > +endif
> >
> > I am not 100% sure but I believe those dependencies do have options,
> > much like the -webengine-ffmpeg option that PATCH 1/3 is using. If you
> > look at ./src/core/configure.json in the qt5webengine sources, you can
> > see:
>
> Do not see options for jsoncpp, lcms2, libevent, libxml2, libxslt, protobuf
> or snappy...
>
> >
> >     "commandline": {
> >         "options": {
> >             "webengine-alsa": "boolean",
> >             "webengine-embedded-build": "boolean",
> >             "webengine-full-debug-info": "boolean",
> >             "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } },
> >             "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
> >             "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
> >             "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
> >             "webengine-pepper-plugins": "boolean",
> >             "webengine-printing-and-pdf": "boolean",
> >             "webengine-proprietary-codecs": "boolean",
> >             "webengine-pulseaudio": "boolean",
> >             "webengine-spellchecker": "boolean",
> >             "webengine-native-spellchecker": "boolean",
> >             "webengine-extensions": "boolean",
> >             "webengine-webrtc": "boolean",
> >             "webengine-geolocation": "boolean",
> >             "webengine-webchannel": "boolean",
> >             "webengine-kerberos": "boolean",
> >             "alsa": { "type": "boolean", "name": "webengine-alsa" },
> >             "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
> >             "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
> >             "opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
> >             "webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
> >             "pepper-plugins": { "type": "boolean", "name": "webengine-pepper-plugins" },
> >             "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" },
> >             "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" },
> >             "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" },
> >             "extensions": { "type": "boolean", "name": "webengine-extensions" },
> >             "webrtc": { "type": "boolean", "name": "webengine-webrtc" }
> >         }
> >     },
> >
> > So it seems like if we have a -webengine-ffmpeg option, then we should
> > also have many other options to enable (and perhaps disable ?) other
> > optional features.
> >
> > However, I'm not sure to understand the difference between the
> > "webengine-<something>" option and the corresponding "<something>"
> > option.
>
> I believe the second one is an (short) alias for the first/long one...
>
> >
> > Also, it seems like some options such as webengine-ffmpeg or
> > webengine-icu can take multiple values: they are enums and not
> > booleans. should we use -webengine-ffmpeg=system for example ? Ditto
> > for the other dependencies;
>
> Or '-webengine-ffmpeg' means option enabled/yes --> use system one
> as the summary output (from the original submit, [1]) suggests:
>
>     According to build/qt5webengine-5.12.7/config.summary:
>
>       Optional system libraries used:
>     [...]
>        ffmpeg ............................... yes
>     [...]
>
>
> >
> > For the record, the qt5webengine source code bundles chromium in
> > ./src/3rdparty/, which itself bundles a bunch of things including
> > ffmpeg in ./src/3rdparty/chromium/third_party/ffmpeg/ (do you like when
> > a 3rdparty folder includes another third_party folder ?).
> >
> > Obviously, in the context of Buildroot, we'd prefer to use as few
> > bundled libraries as possible, and use as much as possible system
> > libraries.
>
> Still a lot of space for improvements....
>
> Regards,
> Peter
>
> [1] http://lists.busybox.net/pipermail/buildroot/2020-February/275313.html
>
> >
> > How is the configure.json above being parsed and used ?
> >
> > Thomas
>
diff mbox series

Patch

diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
index 5df6942977..520d32835b 100644
--- a/package/qt5/qt5webengine/qt5webengine.mk
+++ b/package/qt5/qt5webengine/qt5webengine.mk
@@ -41,6 +41,34 @@  else
 QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa
 endif
 
+ifeq ($(BR2_PACKAGE_JSONCPP),y)
+QT5WEBENGINE_DEPENDENCIES += jsoncpp
+endif
+
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+QT5WEBENGINE_DEPENDENCIES += lcms2
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVENT),y)
+QT5WEBENGINE_DEPENDENCIES += libevent
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+QT5WEBENGINE_DEPENDENCIES += libxml2
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXSLT),y)
+QT5WEBENGINE_DEPENDENCIES += libxslt
+endif
+
+ifeq ($(BR2_PACKAGE_PROTOBUF),y)
+QT5WEBENGINE_DEPENDENCIES += protobuf
+endif
+
+ifeq ($(BR2_PACKAGE_SNAPPY),y)
+QT5WEBENGINE_DEPENDENCIES += snappy
+endif
+
 # QtWebengine's build system uses python, but only supports python2. We work
 # around this by forcing python2 early in the PATH, via a python->python2
 # symlink.