From patchwork Tue Jan 28 09:36:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1230245 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=iD2Q/muv; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 486M2k3G18z9s29 for ; Tue, 28 Jan 2020 20:37:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 85520204F6; Tue, 28 Jan 2020 09:37:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 79cA7tvK2UJU; Tue, 28 Jan 2020 09:36:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A434B20457; Tue, 28 Jan 2020 09:36:57 +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 C3B411BF2A4 for ; Tue, 28 Jan 2020 09:36:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BFC7E868CA for ; Tue, 28 Jan 2020 09:36:56 +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 fp1-aYWtv7ij for ; Tue, 28 Jan 2020 09:36:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by whitealder.osuosl.org (Postfix) with ESMTPS id 18113868B4 for ; Tue, 28 Jan 2020 09:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1580204209; bh=4+JuaNHi/b7YuOFkvpvRZclz3z0imi836i5grA3vS1w=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=iD2Q/muvOECkMgkzZ/s9gysp7W5dfflEy4lnikRBpp36q54eJB3ix1hGB0nuiCt3O kx6aWw6jpkO/xSf6zp4IiH0TD351BxdIHl+H5OqlclmP5pCzmQk/tFcyApzgxgFc1Y BIT9MH3VUpY0WNViiyCawK5oGdS4rpGx0sRU40OE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.201]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MbivM-1jZZfj0e7y-00dE3B; Tue, 28 Jan 2020 10:36:49 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Tue, 28 Jan 2020 10:36:47 +0100 Message-Id: <20200128093647.12106-1-ps.report@gmx.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:fMwXl6CSbY/ZgF7LCtvneFXp0+NM2RzvxIvwTUuB3/4rolo/vfi 2YlxcCmrL3o5zZZN60Yz1hqHKZinrzxYkwGTrO9MSXStMs1BOAXJ1DwJ5imK9G8Ci3sBYhV S2EE8gIZtFmyVJHHBR99znnRyKMBmQM3/82thVJp7DHNUjV/xiHcSa/lk2DhBIBxkoQl0Pd 4M+NIar9WsnLKUN3Ph0zg== X-UI-Out-Filterresults: notjunk:1; V03:K0:X/ritcaTEx0=:mdMLEvGiSIqwbdRukPIDrd eD0N79uXnz7wNt6UY3XK2j85p/xREsz2wE3vcZ0qhj778zhEi8FZL76wilmR48DrjjYt/yy/F jYLyHG/X3cF51cCRSlxlofhs6KXhwvP7AKZRqbeBfj3Xeid0fDJ3yx90FeGQ9xxRs0mYs0lp9 Cm/JLy6/G3Si377wYaOTVa8mDFRtJlK89kCZJVMHr7BkDvBQLSLXtiK5t4KpI8U+2qES2Kf1O /SepwRY91DZcA8ASr2ZggDIPnCCvCrsAlsJNyVsQfeKPGrqDj1BBR8sNn1py4Mi07UtrPqig0 UHPFe+0l7VZ5ucCFpsxVd5pRIhT8c6OFsIlNY1lhwpacztNy4KdDxZ9jxVNd4x6bhwnLKTrWU taiQ5GUKKpK9pUp5xSt10VYBerTHwVtghyGV+O2LGjM6LtUvRZFe49d3knIBK/oLDPLElVOaY PtkY3pk3MB1NKrwCwmjZhKdRUSI83wkz/NenutvDiBGgqyzcbGWhZ92EunSj5nvlOMb5zV7d8 Cflo3Hnsgqjps7FbqlFjMCaJFBomdEbhPTkHlxWcQaQVr7+RfUQvzvNYg2SlPZJo+HMWTl4/f h7BYOnWxlBKZXT5RM5mvq7+GVvPzRWH32T197zwOXkF852bWr4QkipDrXHhvGYtfEcxlFwVwJ ZHmNIbrRTxTuNfLQ1cTpK2AD5MGC7KI+iWYYrPgI9zmTzWHnG2h968E4aOkgbmUq1/fMQnWEl DvVI9FqeSZKFgbrtDu4JjzLNh6skiCP2mF1XPvxci62WxmIaaXwrdBiVMzOPZH2Rh7ACjfBOP XmjwxIpPorA9Z8A5WUX5qjQMoQLMumjG71C2v8JA9rkoZGuHssuTMJKn/wFNaxMGHLJNmav+6 B1sQ8UYI7Ex+XViI41lwve43+NdJbRxeIwgS3GbOtXp+PQWYFcWDOBe8gv9ALAMJWoKxY3Hbs wzOOGlLwJYA4ckb5Gg22UKcKMQGktZhcmCsm2n2NIwlvZ4y+952no9stia5jFKo3ZWJdd2QRK dVj9ATThUtU2o6tVX3K3JeJbqcPn5EEAW1BtLbAaF4F7gMqkXyFjB2vMN41iVJr904M/Wi810 /nXUA+nLZ/597x1OvrtdBxX9WDVqvCtHdw+uZSwjfvDZuuJzarROqnavHeQbBpUnf48T5E/ll D4DDEHZgSNxVm6QwJTD/GApQb+eV1SKlu6FlVRzt/vuvGlI0rkP0UGB1J/avHm718napv+WZ0 7EaY5aLCzLQwpvKUv Subject: [Buildroot] [RFC-for-2019.02 v1] package/qt5webengine: fix LTS/5.6 jpec_codec compile failures X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rscr , Julien Corjon , =?utf-8?q?Ga=C3=ABl_Portay?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add patch to fix some jpeg_codec bool/boolean/int mismatch compile issues. Signed-off-by: Peter Seiderer --- Notes: Send as RFC because only tested for one defconfig provided by Rafa using the RPi provided pre-build toolchain ([1]). Send only for 2019.02 as the same defconfig failes with 2019.11 for qt5webengine later on with some libav/ffmpeg version mismatch errors. [1] http://lists.busybox.net/pipermail/buildroot/2020-January/272189.html --- ...ome-bool-boolean-int-mismatch-compil.patch | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 package/qt5/qt5webengine/5.6.3/0003-jpeg_codec-fix-some-bool-boolean-int-mismatch-compil.patch diff --git a/package/qt5/qt5webengine/5.6.3/0003-jpeg_codec-fix-some-bool-boolean-int-mismatch-compil.patch b/package/qt5/qt5webengine/5.6.3/0003-jpeg_codec-fix-some-bool-boolean-int-mismatch-compil.patch new file mode 100644 index 0000000000..57c781563d --- /dev/null +++ b/package/qt5/qt5webengine/5.6.3/0003-jpeg_codec-fix-some-bool-boolean-int-mismatch-compil.patch @@ -0,0 +1,98 @@ +From 99c96f1d5e3efbed066f11ff8384b13ca8a7056e Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 28 Jan 2020 10:08:09 +0100 +Subject: [PATCH] jpeg_codec: fix some bool/boolean/int mismatch compile issues + +Fixes: + + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc: In function 'boolean gfx::{anonymous}::EmptyOutputBuffer(jpeg_compress_struct*)': + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:123:10: error: invalid conversion from 'int' to 'boolean' [-fpermissive] + return 1; + ^ + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc: In static member function 'static bool gfx::JPEGCodec::Encode(const unsigned char*, gfx::JPEGCodec::ColorFormat, int, int, int, int, std::vector*)': + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:264:38: error: invalid conversion from 'int' to 'boolean' [-fpermissive] + jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100 + ^ + In file included from .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:16:0: + .../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/jpeglib.h:991:14: note: initializing argument 3 of 'void jpeg_set_quality(j_compress_ptr, int, boolean)' + EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality, + ^ + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:276:32: error: invalid conversion from 'int' to 'boolean' [-fpermissive] + jpeg_start_compress(&cinfo, 1); + ^ + In file included from .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:16:0: + .../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/jpeglib.h:1010:14: note: initializing argument 2 of 'void jpeg_start_compress(j_compress_ptr, boolean)' + EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo, + ^ + In file included from .../tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/arm-linux-gnueabihf/include/c++/4.9.3/bits/atomic_base.h:36:0, + from .../tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/arm-linux-gnueabihf/include/c++/4.9.3/atomic:41, + from .../build/qt5webengine-5.6.3/src/3rdparty/chromium/third_party/skia/include/core/../private/../private/SkAtomics.h:13, + from .../build/qt5webengine-5.6.3/src/3rdparty/chromium/third_party/skia/include/core/../private/SkOncePtr.h:11, + from .../build/qt5webengine-5.6.3/src/3rdparty/chromium/third_party/skia/include/core/SkColorTable.h:13, + from .../build/qt5webengine-5.6.3/src/3rdparty/chromium/third_party/skia/include/core/SkBitmap.h:12, + from .../qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:11: + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc: In function 'boolean gfx::{anonymous}::FillInputBuffer(j_decompress_ptr)': + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:362:10: error: cannot convert 'bool' to 'boolean' in return + return false; + ^ + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc: In static member function 'static bool gfx::JPEGCodec::Decode(const unsigned char*, size_t, gfx::JPEGCodec::ColorFormat, std::vector*, int*, int*)': + .../build/qt5webengine-5.6.3/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc:490:36: error: cannot convert 'bool' to 'boolean' for argument '2' to 'int jpeg_read_header(j_decompress_ptr, boolean)' + if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) + +Signed-off-by: Peter Seiderer +--- + src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc +index 8a08fe029..38d886c01 100644 +--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc ++++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc +@@ -120,7 +120,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { + // tell libjpeg where to write the next data + cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used]; + cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used; +- return 1; ++ return TRUE; + } + + // Cleans up the JpegEncoderState to prepare for returning in the final form. +@@ -261,7 +261,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, + cinfo.data_precision = 8; + + jpeg_set_defaults(&cinfo); +- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100 ++ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100 + + // set up the destination manager + jpeg_destination_mgr destmgr; +@@ -273,7 +273,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, + JpegEncoderState state(output); + cinfo.client_data = &state; + +- jpeg_start_compress(&cinfo, 1); ++ jpeg_start_compress(&cinfo, TRUE); + + // feed it the rows, doing necessary conversions for the color format + #ifdef JCS_EXTENSIONS +@@ -359,7 +359,7 @@ void InitSource(j_decompress_ptr cinfo) { + // set to a positive value if TRUE is returned. A FALSE return should only + // be used when I/O suspension is desired." + boolean FillInputBuffer(j_decompress_ptr cinfo) { +- return false; ++ return FALSE; + } + + // Skip data in the buffer. Since we have all the data at once, this operation +@@ -487,7 +487,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, + cinfo.client_data = &state; + + // fill the file metadata into our buffer +- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) ++ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) + return false; + + // we want to always get RGB data out +-- +2.25.0 +