| Message ID | 20230221183051.4011311-1-giulio.benetti@benettiengineering.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | package/jpeg: fix build failure when qt5base tries to use libjpeg | expand |
On Tue, 21 Feb 2023 19:30:51 +0100 Giulio Benetti <giulio.benetti@benettiengineering.com> wrote: > Qt5 fails to build with libjpeg since the API is different from > libjpeg-turbo and libjpeg-turbo is pointed as the library Qt5 usually link > against to[0]. So let's default jpeg variant to libjpeg-turbo if > BR2_PACKAGE_QT5BASE_JPEG is selected. > > Fixes: > still not failed > > [0]: https://doc.qt.io/qt-5/qtgui-index.html#licenses-and-attributions > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > --- > package/jpeg/Config.in | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in > index 371f89aa49..3a39a0dfb8 100644 > --- a/package/jpeg/Config.in > +++ b/package/jpeg/Config.in > @@ -16,7 +16,8 @@ if BR2_PACKAGE_JPEG > > choice > prompt "jpeg variant" > - default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT > + default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT || \ > + BR2_PACKAGE_QT5BASE_JPEG I don't think this will work, as it doesn't prevent from using classic libjpeg with Qt5, it only changes the default. So a user can still select Qt5 + classic libjpeg, and the autobuilder randomization will also generate such configurations. If really classic libjpeg are jpeg-turbo are no longer compatible, then we probably need to drop the virtual package entirely... but it's going to be a lot of work to handle both variants in all packages using jpeg... Thomas
diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 371f89aa49..3a39a0dfb8 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -16,7 +16,8 @@ if BR2_PACKAGE_JPEG choice prompt "jpeg variant" - default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT + default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT || \ + BR2_PACKAGE_QT5BASE_JPEG help Select the normal libjpeg or libjpeg-turbo.
Qt5 fails to build with libjpeg since the API is different from libjpeg-turbo and libjpeg-turbo is pointed as the library Qt5 usually link against to[0]. So let's default jpeg variant to libjpeg-turbo if BR2_PACKAGE_QT5BASE_JPEG is selected. Fixes: still not failed [0]: https://doc.qt.io/qt-5/qtgui-index.html#licenses-and-attributions Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- package/jpeg/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)