package/qt5/qt5imageformats: add optional dependencies
PATCH 1/2 package/qt5/qt5imageformats: add optional dependencies
Add optional dependencies which are enabled by default:
- libmng and tiff are optional dependencies since version 5.0.0 and
https://github.com/qt/qtimageformats/commit/5373e3e821c7f43d9c941384437b1d39d6e9d47e
- webp is an optional dependency since version 5.3.0 and
https://github.com/qt/qtimageformats/commit/4522b350e53471c2ebc6d4692736ee4708445b66
- jasper is an optional dependency since version 5.7.0 and
https://github.com/qt/qtimageformats/commit/2d59367241aafbfe6acb30202f64e30697028bd9
Ideally we should use the configure options to disable those dependencies if needed especially webp to avoid using the embedded one These options are defined here:
https://code.qt.io/cgit/qt/qtimageformats.git/tree/config_help.txt
but I'm not skilled enough with the qmake-infrastructure
--- package/qt5/qt5imageformats/qt5imageformats.mk | 6 ++++++ 1 file changed, 6 insertions(+)
package/qt5/qt5imageformats/qt5imageformats.mk +6 -0
@@ -12,4 +12,10 @@ QT5IMAGEFORMATS_INSTALL_STAGING = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +QT5IMAGEFORMATS_DEPENDENCIES += \ + $(if $(BR2_PACKAGE_JASPER),jasper) \ + $(if $(BR2_PACKAGE_LIBMNG),libmng) \ + $(if $(BR2_PACKAGE_TIFF),tiff) \ + $(if $(BR2_PACKAGE_WEBP),webp) + $(eval $(qmake-package))
Signature · 1 line
2.28.0
PATCH 2/2 package/qt5/qt5imageformats: fix build with jasper
Fixes:
- http://autobuild.buildroot.org/results/ea3bc0d3110cb54421ecf433317ca79ca0ff834a
- http://autobuild.buildroot.org/results/6831dfdd1ecaaa3812de481882040c1742a72aec
--- .../0001-fix-build-on-Arch-Linux.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patch
package/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 704868db61be1542c2d9e2b75ead00c45c56cc36 Mon Sep 17 00:00:00 2001 +From: "Evgeniy A. Dushistov" <[email protected]> +Date: Sat, 15 Aug 2020 15:09:08 +0300 +Subject: fix build on Arch Linux +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp:844:41: +error: no declaration of ?pow? + 844 | const double jasperRate = minRate + pow((double(quality) / double(maxQuality)), 2) * maxRate; + +Pick-to: 5.15 +Change-Id: I085996c2db2251903b2a3e52e6e648831637c8f9 +Reviewed-by: Shawn Rutledge <[email protected]> +[Retrieved from: +https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=704868db61be1542c2d9e2b75ead00c45c56cc36] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + src/plugins/imageformats/jp2/qjp2handler.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp +index 4311d26..05c7bc1 100644 +--- a/src/plugins/imageformats/jp2/qjp2handler.cpp ++++ b/src/plugins/imageformats/jp2/qjp2handler.cpp +@@ -45,6 +45,7 @@ + #include "qcolor.h" + + #include <jasper/jasper.h> ++#include <math.h> // for pow + + QT_BEGIN_NAMESPACE + +-- +cgit v1.2.1 +
Signature · 1 line
2.28.0
Yann E. MORIN
AppliedPATCH 2/2 package/qt5/qt5imageformats: fix build with jasper
Fabrice, All,
On 2020-08-22 20:25 +0200, Fabrice Fontaine spake thusly:
Quoted 5 lines
Fixes:
- http://autobuild.buildroot.org/results/ea3bc0d3110cb54421ecf433317ca79ca0ff834a
- http://autobuild.buildroot.org/results/6831dfdd1ecaaa3812de481882040c1742a72aecSigned-off-by Fabrice Fontaine <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 55 lines
--- .../0001-fix-build-on-Arch-Linux.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patchpackage/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patch new file +37
-0@@ -0,0 +1,37 @@ +From 704868db61be1542c2d9e2b75ead00c45c56cc36 Mon Sep 17 00:00:00 2001 +From: "Evgeniy A. Dushistov" <[email protected]> +Date: Sat, 15 Aug 2020 15:09:08 +0300 +Subject: fix build on Arch Linux +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp:844:41: +error: no declaration of ?pow? + 844 | const double jasperRate = minRate + pow((double(quality) / double(maxQuality)), 2) * maxRate; + +Pick-to: 5.15 +Change-Id: I085996c2db2251903b2a3e52e6e648831637c8f9 +Reviewed-by: Shawn Rutledge <[email protected]> +[Retrieved from: +https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=704868db61be1542c2d9e2b75ead00c45c56cc36] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + src/plugins/imageformats/jp2/qjp2handler.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp +index 4311d26..05c7bc1 100644 +--- a/src/plugins/imageformats/jp2/qjp2handler.cpp ++++ b/src/plugins/imageformats/jp2/qjp2handler.cpp +@@ -45,6 +45,7 @@ + #include "qcolor.h" + + #include <jasper/jasper.h> ++#include <math.h> // for pow + + QT_BEGIN_NAMESPACE + +-- +cgit v1.2.1 +Signature · 6 lines
2.28.0 _______________________________________________ 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/2 package/qt5/qt5imageformats: add optional dependencies
In reply to Fabrice FontaineOn 2020-08-22 20:25 +0200, Fabrice Fontaine spake thusly:
Quoted 8 lines
Add optional dependencies which are enabled by default:
- libmng and tiff are optional dependencies since version 5.0.0 and
https://github.com/qt/qtimageformats/commit/5373e3e821c7f43d9c941384437b1d39d6e9d47e
- webp is an optional dependency since version 5.3.0 and
https://github.com/qt/qtimageformats/commit/4522b350e53471c2ebc6d4692736ee4708445b66
- jasper is an optional dependency since version 5.7.0 and
https://github.com/qt/qtimageformats/commit/2d59367241aafbfe6acb30202f64e30697028bd9
Quoted 5 lines
Ideally we should use the configure options to disable those dependencies if needed especially webp to avoid using the embedded one These options are defined here:
https://code.qt.io/cgit/qt/qtimageformats.git/tree/config_help.txt
but I'm not skilled enough with the qmake-infrastructure
https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_qmake_based_packages
It would probably be something along the lines of:
ifeq ($(BR2_PACKAGE_JASPER),y)
QT5IMAGEFORMATS_DEPENDENCIES += jasper
QT5IMAGEFORMATS_CONF_OPTS += QT_CONFIG+=jasper
else
QT5IMAGEFORMATS_CONF_OPTS += QT_CONFIG-=jasper
endifWould you rework this patch, and split it into four patches, one for each optional dependency, please?
Regards,
Yann E. MORIN.
Quoted 27 lines
Signed-off-by Fabrice Fontaine <[email protected]>--- package/qt5/qt5imageformats/qt5imageformats.mk | 6 ++++++ 1 file changed, 6 insertions(+)package/qt5/qt5imageformats/qt5imageformats.mk +6
-0@@ -12,4 +12,10 @@ QT5IMAGEFORMATS_INSTALL_STAGING = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +QT5IMAGEFORMATS_DEPENDENCIES += \ + $(if $(BR2_PACKAGE_JASPER),jasper) \ + $(if $(BR2_PACKAGE_LIBMNG),libmng) \ + $(if $(BR2_PACKAGE_TIFF),tiff) \ + $(if $(BR2_PACKAGE_WEBP),webp) + $(eval $(qmake-package))Signature · 6 lines
2.28.0 _______________________________________________ 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/2 package/qt5/qt5imageformats: add optional dependencies
Hi Yann,
Le dim. 23 ao?t 2020 ? 15:28, Yann E. MORIN <[email protected]> a ?crit :
Quoted 19 lines
On 2020-08-22 20:25 +0200, Fabrice Fontaine spake thusly:
Quoted 8 lines
Add optional dependencies which are enabled by default:
- libmng and tiff are optional dependencies since version 5.0.0 and
https://github.com/qt/qtimageformats/commit/5373e3e821c7f43d9c941384437b1d39d6e9d47e
- webp is an optional dependency since version 5.3.0 and
https://github.com/qt/qtimageformats/commit/4522b350e53471c2ebc6d4692736ee4708445b66
- jasper is an optional dependency since version 5.7.0 and
https://github.com/qt/qtimageformats/commit/2d59367241aafbfe6acb30202f64e30697028bd9Quoted 5 lines
Ideally we should use the configure options to disable those dependencies if needed especially webp to avoid using the embedded one These options are defined here:
https://code.qt.io/cgit/qt/qtimageformats.git/tree/config_help.txt
but I'm not skilled enough with the qmake-infrastructurehttps://buildroot.org/downloads/manual/manual.html#_infrastructure_for_qmake_based_packages
It would probably be something along the lines of:
Quoted 6 lines
ifeq ($(BR2_PACKAGE_JASPER),y)
QT5IMAGEFORMATS_DEPENDENCIES += jasper
QT5IMAGEFORMATS_CONF_OPTS += QT_CONFIG+=jasper
else
QT5IMAGEFORMATS_CONF_OPTS += QT_CONFIG-=jasper
endifThis doesn't work, this has no effect on the build (i.e. jasper is enabled if it is found on the system even if I passed QT_CONFIG -= jasper or more importantly the embedded webp is used even if I passed QT_CONFIG -= webp).
Quoted 1 line
Quoted 1 line
qt5imageformats 5.15.0 Configuring
cd /home/fabrice/buildroot/output/build/qt5imageformats-5.15.0/ && PATH="/home/fabrice/buildroot/output/host/bin:/home/fabrice/buildroot/output/host/sbin:/home/fabrice/perl5/bin:/home/fabrice/.local/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
/home/fabrice/buildroot/output/host/bin/qmake -spec
devices/linux-buildroot-g++ QT_CONFIG-=jasper QT_CONFIG-=tiff
QT_CONFIG-=webp
Info: creating stash file/home/fabrice/buildroot/output/build/qt5imageformats-5.15.0/.qmake.stash
Info: creating cache file/home/fabrice/buildroot/output/build/qt5imageformats-5.15.0/.qmake.cache
Running configuration tests...
Done running configuration tests.
Configure summary:
Further Image Formats:
JasPer ................................. yes
MNG .................................... no
TIFF ................................... yes
Using system libtiff ................. no
WEBP ................................... yes
Using system libwebp ................. noFrom my understanding, the build option should be -webp=system or -webp=no but this option is not recognized by qmake but I know nearly nothing about Qt.
Quoted 36 lines
Would you rework this patch, and split it into four patches, one for each optional dependency, please?
Regards,
Yann E. MORIN.Quoted 24 lines
Signed-off-by Fabrice Fontaine <[email protected]>--- package/qt5/qt5imageformats/qt5imageformats.mk | 6 ++++++ 1 file changed, 6 insertions(+)package/qt5/qt5imageformats/qt5imageformats.mk +6
-0@@ -12,4 +12,10 @@ QT5IMAGEFORMATS_INSTALL_STAGING = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +QT5IMAGEFORMATS_DEPENDENCIES += \ + $(if $(BR2_PACKAGE_JASPER),jasper) \ + $(if $(BR2_PACKAGE_LIBMNG),libmng) \ + $(if $(BR2_PACKAGE_TIFF),tiff) \ + $(if $(BR2_PACKAGE_WEBP),webp) +$(eval $(qmake-package))
--
2.28.0Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Quoted 7 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. |'------------------------------^-------^------------------^--------------------'
Best Regards,
Fabrice