package/qt5/qt5webengine: fix ffmpeg/codec/alsa option handling for latest
PATCH v3 1/2 package/qt5/qt5webengine: fix ffmpeg/codec/alsa option handling for latest
qt5engine also now requires webp mux support or the auto detection will fail.
This patch is based on the suggested fix, and fixes, Bug #12416
--- package/qt5/qt5webengine/Config.in | 1 + package/qt5/qt5webengine/qt5webengine.mk | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+)
package/qt5/qt5webengine/Config.in +1 -0
@@ -42,6 +42,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WEBP_MUX select BR2_PACKAGE_QT5BASE_DBUS select BR2_PACKAGE_QT5BASE_EGLFS select BR2_PACKAGE_QT5BASE_FONTCONFIG
package/qt5/qt5webengine/qt5webengine.mk +18 -0
@@ -30,17 +30,35 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss endif +# As of qt 5.10 these options are handled as arguments to qmake instead of defines +# The -- is needed to separate qmake options from config options +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS = -- +endif + +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -webengine-ffmpeg +else QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg +endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -webengine-proprietary-codecs +else QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_proprietary_codecs endif +endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib else +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -no-webengine-alsa +else QT5WEBENGINE_QMAKEFLAGS += QT_CONFIG-=alsa endif +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
Signature · 1 line
2.7.4
PATCH v3 2/2 package/qt5/qt5webengine: fix build dependencies for autodetected packages
--- package/qt5/qt5webengine/qt5webengine.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
package/qt5/qt5webengine/qt5webengine.mk +28 -0
@@ -60,6 +60,34 @@ QT5WEBENGINE_QMAKEFLAGS += QT_CONFIG-=alsa endif 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.
Signature · 1 line
2.7.4
PATCH v3 1/2 package/qt5/qt5webengine: fix ffmpeg/codec/alsa option handling for latest
In reply to Nathan FordNathan, Peter, All,
Sorry for the delay, but I even tually got around to looking at those two patches...
On 2020-02-28 12:05 -0500, Nathan Ford spake thusly:
Quoted 4 lines
qt5engine also now requires webp mux support or the auto detection will fail.
This patch is based on the suggested fix, and fixes, Bug #12416
This patch does two things;
- use the new options that replace defines
- add a missign dependency
So I've split it in two, and respun a series:
http://lists.busybox.net/pipermail/buildroot/2020-September/292497.html
I know this is a bit late, but I would really appreciate if you could check that I did not bork it when refreshing and splitting the patches.
Thanks!
Regards,
Yann E. MORIN.
Quoted 66 lines
Signed-off-by Nathan Ford <[email protected]>Reviewed-by Peter Seiderer <[email protected]>--- package/qt5/qt5webengine/Config.in | 1 + package/qt5/qt5webengine/qt5webengine.mk | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+)package/qt5/qt5webengine/Config.in +1
-0@@ -42,6 +42,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WEBP_MUX select BR2_PACKAGE_QT5BASE_DBUS select BR2_PACKAGE_QT5BASE_EGLFS select BR2_PACKAGE_QT5BASE_FONTCONFIGpackage/qt5/qt5webengine/qt5webengine.mk +18
-0@@ -30,17 +30,35 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss endif +# As of qt 5.10 these options are handled as arguments to qmake instead of defines +# The -- is needed to separate qmake options from config options +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS = -- +endif + +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -webengine-ffmpeg +else QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg +endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -webengine-proprietary-codecs +else QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_proprietary_codecs endif +endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib else +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WEBENGINE_QMAKEFLAGS += -no-webengine-alsa +else QT5WEBENGINE_QMAKEFLAGS += QT_CONFIG-=alsa endif +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->python2Signature · 6 lines
2.7.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'