From patchwork Wed Jul 22 08:33:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 498443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id DD1751402BC for ; Wed, 22 Jul 2015 18:33:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F08BD94E50; Wed, 22 Jul 2015 08:33:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VgYsbRCgmcVQ; Wed, 22 Jul 2015 08:33:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5D147939EC; Wed, 22 Jul 2015 08:33:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E637B1C0FCC for ; Wed, 22 Jul 2015 08:33:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E11A9911CB for ; Wed, 22 Jul 2015 08:33:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q3ocega6utu0 for ; Wed, 22 Jul 2015 08:33:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8C9918B299 for ; Wed, 22 Jul 2015 08:33:49 +0000 (UTC) Received: by wicmv11 with SMTP id mv11so71051446wic.0 for ; Wed, 22 Jul 2015 01:33:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aQIkHKSomFo6AZFys2yinuTm/oIjdOYYwJ5Cy5zzZtg=; b=Rq5vtn1JcpZ2BdcCsu2JDpuoz6wYGYJFGWTIyCKk9muoAy9RXOAbMwiDKqOC6eGRIm HUoDZTrZsrv1xA1pWa76aixtmvxYOCJmmSE9ZmP9dKbYvb7PfZi5nlddNAaqey8Ttgml fSSZ2cR8h9QPFd6YBEvsqR6vvAXkwFdu0UtwDdP+69BIc/1vnnVBFK2jvcgjK8ls7pVJ iY7F3+VgSXZQoX3WFrnYmllfmVhyIzdmmry2ZOy5m7+UvZpEEABQVxDhDxsCxJafyHKV oYtgi9zGY6xt7h4nYEwwgiiCmOHBUVofeaOtjChL7J+SdMVXesmF316LWEgtNmMOX7tD kbmA== X-Received: by 10.180.102.74 with SMTP id fm10mr40128238wib.25.1437554028037; Wed, 22 Jul 2015 01:33:48 -0700 (PDT) Received: from mic341-linux.sinters-int.fr ([195.200.174.78]) by smtp.gmail.com with ESMTPSA id fm8sm2179117wib.9.2015.07.22.01.33.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jul 2015 01:33:47 -0700 (PDT) From: Julien Corjon To: buildroot@buildroot.org Date: Wed, 22 Jul 2015 10:33:32 +0200 Message-Id: <1437554012-25241-2-git-send-email-corjon.j@ecagroup.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1437554012-25241-1-git-send-email-corjon.j@ecagroup.com> References: <1437554012-25241-1-git-send-email-corjon.j@ecagroup.com> Cc: ECA SINTERS software Subject: [Buildroot] [PATCH 2/2] qt/qt5base: Fix big endian image conversion X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Julien Corjon --- .../qt5base/0007-big_endian-fix_destformat.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/qt5/qt5base/0007-big_endian-fix_destformat.patch diff --git a/package/qt5/qt5base/0007-big_endian-fix_destformat.patch b/package/qt5/qt5base/0007-big_endian-fix_destformat.patch new file mode 100644 index 0000000..b30d220 --- /dev/null +++ b/package/qt5/qt5base/0007-big_endian-fix_destformat.patch @@ -0,0 +1,34 @@ +From 02ab210ea9bc5ee53fa4f1db2f068ce24272a6cd Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Fri, 3 Jul 2015 14:19:02 +0200 +Subject: [PATCH] Fix compile error on big endian + +DestFormat is not defined here but should be Format_RGBX8888 + +Change-Id: Ie33989a6fc31650434281a6b7b0f4806524268af +Reviewed-by: Konstantin Ritt +Reviewed-by: Timo Jyrinki +Reviewed-by: Simon Hausmann + +Upstream-Status: https://codereview.qt-project.org/#/c/120654/ +Signed-off-by: Julien Corjon +--- + src/gui/image/qimage_conversions.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp +index e0ca2c5..02f32aa 100644 +--- a/src/gui/image/qimage_conversions.cpp ++++ b/src/gui/image/qimage_conversions.cpp +@@ -1103,7 +1103,7 @@ static bool mask_alpha_converter_rgbx_inplace(QImageData *data, Qt::ImageConvers + } + rgb_data += pad; + } +- data->format = DestFormat; ++ data->format = QImage::Format_RGBX8888; + return true; + #endif + } +-- +2.1.0 +