From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/qt5/qt5imageformats: fix build with jasper
Date: Sun, 23 Aug 2020 15:29:09 +0200 [thread overview]
Message-ID: <20200823132909.GF8728@scaer> (raw)
In-Reply-To: <20200822182535.1835260-2-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2020-08-22 20:25 +0200, Fabrice Fontaine spake thusly:
> Fixes:
> - http://autobuild.buildroot.org/results/ea3bc0d3110cb54421ecf433317ca79ca0ff834a
> - http://autobuild.buildroot.org/results/6831dfdd1ecaaa3812de481882040c1742a72aec
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> .../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
>
> diff --git a/package/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patch b/package/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patch
> new file mode 100644
> index 0000000000..c348c65260
> --- /dev/null
> +++ b/package/qt5/qt5imageformats/0001-fix-build-on-Arch-Linux.patch
> @@ -0,0 +1,37 @@
> +From 704868db61be1542c2d9e2b75ead00c45c56cc36 Mon Sep 17 00:00:00 2001
> +From: "Evgeniy A. Dushistov" <dushistov@mail.ru>
> +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 <shawn.rutledge@qt.io>
> +[Retrieved from:
> +https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=704868db61be1542c2d9e2b75ead00c45c56cc36]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + 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
> +
> --
> 2.28.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-08-23 13:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-22 18:25 [Buildroot] [PATCH 1/2] package/qt5/qt5imageformats: add optional dependencies Fabrice Fontaine
2020-08-22 18:25 ` [Buildroot] [PATCH 2/2] package/qt5/qt5imageformats: fix build with jasper Fabrice Fontaine
2020-08-23 13:29 ` Yann E. MORIN [this message]
2020-08-23 13:28 ` [Buildroot] [PATCH 1/2] package/qt5/qt5imageformats: add optional dependencies Yann E. MORIN
2020-08-23 14:16 ` Fabrice Fontaine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200823132909.GF8728@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox