From patchwork Fri Jan 19 16:42:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dagg Stompler X-Patchwork-Id: 863635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zNRT00Zwqz9s7F for ; Sat, 20 Jan 2018 03:42:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3CC4F2EECB; Fri, 19 Jan 2018 16:42:41 +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 O0JVzyqlKByd; Fri, 19 Jan 2018 16:42:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 870542EF96; Fri, 19 Jan 2018 16:42:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 784DA1C0AE7 for ; Fri, 19 Jan 2018 16:42:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 717B52EF96 for ; Fri, 19 Jan 2018 16:42:38 +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 uDr+UdbXRKWJ for ; Fri, 19 Jan 2018 16:42:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by silver.osuosl.org (Postfix) with ESMTPS id CB5722EECB for ; Fri, 19 Jan 2018 16:42:36 +0000 (UTC) Received: from NCC-5001-D.Starfleet ([176.231.97.93]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MMShK-1ejh121Mz8-008FUV for ; Fri, 19 Jan 2018 17:42:34 +0100 From: Dagg Stompler To: buildroot@buildroot.org Date: Fri, 19 Jan 2018 18:42:32 +0200 Message-Id: <20180119164232.1559-1-daggs@gmx.com> X-Mailer: git-send-email 2.16.0 MIME-Version: 1.0 X-Provags-ID: V03:K0:GPO3SuJPQiWq2ziPnkoUpyszJz4n68HCeHzzpz2hPhvNyuM5189 j+wEGKoo+qjJu6lkUNZ8zuMMP+onJy+eFi9btXHC/9Iw6DbaXx4sGqOcKo27Ay7OMls61sj RJWr0oMtWQcKqu3r/tg+qAQMGwLnDGz0qa61P8wz7NpaD8de3JT22ujYZ6hMC0DmUMg9bQg Pk2a2DvTJBUt/uGso1ZMw== X-UI-Out-Filterresults: notjunk:1; V01:K0:hzId4SxIEDw=:Zb5u5RY/PNMTpovPeqFgQ6 gpPoW13JZ0HYj+4VHYekUpsTVCJ0SvP6mERunn8veDPOhua6pAqegAD209g7TCGPellDZth34 1CdOClxjPLFlCdsVy/cim5eZeeOjuiQ0cy47g3uEJ46h0/Lv33uj/1f4sWwmfDOojkDIPxohR gksm41ayh2dTy04itxDQKLBMmVwlRd+F1zIxKPaVUJ+gev14BAuUrib4E3lrJ1cjn42wahUyB YZT0aygCNG9V0IojMVHbcClB786vzPLKZrIDHM0wJ4yy8aY/ZQY9crWDa1wV8Nx7bs8SiCxrA xIxRz4l6x8w+NIbHCYzRab3bLHSHfjucy6t1/fPjb11WQFx8eNs+E6rMDlwNrISAA2xGvAi3i JXYs4/EOMok09XrlWqSD1/eNoBxKXobUBVeaTWXQtmrUN5gWlFRhHu2+1t+UCbQ+n48E7TKii 9A5FuB5avImjv7YwhOI7Fhna/GUIU30PNH+z5iMVdazik++w7/rXiSiRj2VqhoZrIcuQryU4Z 7JQ1juBIUq4O3knq5FwUX8AKLm+P1cBCFDgOvfEAP7TJ0KRf5LXuVMAbbkcgZZDDAtYPUxyjb FmwLehEl3BKOBFC4+qYoc+Pu1QrmJrt1W1QuKQP5bKdh7Wpjfo8owhwq+Pcecn7TbpfTX2XMq HSZEhSdPb1cwjoF0J6FNJQ0Gkxpy57Y0ubN3QDjHhr25dB2IehYiPsX4ddhf9R0XZQcbaNKuS eAKh+gUfnmyD8K9SNzBSmt1CDMoZ101BZR3/xvIJcPWch/VUfBwq9dG45MWuFepPVOgIs2zbY CxxgSVAwryCdDWZKVhxdngbqF2CvitpNPBtqMPlAKbtLD97V5s= Subject: [Buildroot] [PATCH] kodi-texturepacker: fix compiltion error X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" backport fix the following error: declaration of ‘void* reallocarray(void*, size_t, size_t) throw ()’ has a different exception specifier from upstream kodi which can be reproduced using the following defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_PY_PYC=y Signed-off-by: Dagg Stompler --- .../kodi-texturepacker/0002-fix_reallocarray.patch | 169 +++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 package/kodi-texturepacker/0002-fix_reallocarray.patch diff --git a/package/kodi-texturepacker/0002-fix_reallocarray.patch b/package/kodi-texturepacker/0002-fix_reallocarray.patch new file mode 100644 index 0000000000..eb4ed349bd --- /dev/null +++ b/package/kodi-texturepacker/0002-fix_reallocarray.patch @@ -0,0 +1,169 @@ +From ebc5dfcad836936a14e6f18fd7faa377b3c804e7 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Mon, 6 Nov 2017 11:47:28 +0000 +Subject: [PATCH] TexturePacker: use C++ headers + +--- + tools/depends/native/TexturePacker/src/SimpleFS.h | 4 ++-- + tools/depends/native/TexturePacker/src/TexturePacker.cpp | 2 +- + tools/depends/native/TexturePacker/src/XBTFWriter.cpp | 6 +++--- + tools/depends/native/TexturePacker/src/XBTFWriter.h | 2 +- + tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 +- + tools/depends/native/TexturePacker/src/md5.h | 4 ++-- + 6 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/tools/depends/native/TexturePacker/src/SimpleFS.h b/tools/depends/native/TexturePacker/src/SimpleFS.h +index c48814c0ad..c2288cf8de 100644 +--- a/tools/depends/native/TexturePacker/src/SimpleFS.h ++++ b/tools/depends/native/TexturePacker/src/SimpleFS.h +@@ -20,9 +20,9 @@ + * + */ + +-#include ++#include + #include +-#include ++#include + + class CFile + { +diff --git a/tools/depends/native/TexturePacker/src/TexturePacker.cpp b/tools/depends/native/TexturePacker/src/TexturePacker.cpp +index ba618be574..045c5ce38d 100644 +--- a/tools/depends/native/TexturePacker/src/TexturePacker.cpp ++++ b/tools/depends/native/TexturePacker/src/TexturePacker.cpp +@@ -22,7 +22,7 @@ + #include + #include + #define __STDC_FORMAT_MACROS +-#include ++#include + #define platform_stricmp _stricmp + #else + #define platform_stricmp stricmp +diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp +index 9e2493369b..2e80ba674c 100644 +--- a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp ++++ b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp +@@ -19,14 +19,14 @@ + */ + + #define __STDC_FORMAT_MACROS +-#include ++#include + #if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN) +-#include ++#include + #elif !defined(TARGET_DARWIN) + #include + #endif + #include +-#include ++#include + + #include "XBTFWriter.h" + #include "guilib/XBTFReader.h" +diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.h b/tools/depends/native/TexturePacker/src/XBTFWriter.h +index 7509303a51..d5cf1a2965 100644 +--- a/tools/depends/native/TexturePacker/src/XBTFWriter.h ++++ b/tools/depends/native/TexturePacker/src/XBTFWriter.h +@@ -23,7 +23,7 @@ + + #include + #include +-#include ++#include + + #include "guilib/XBTF.h" + +diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp +index 56c22f7c3a..3ddb20fe88 100644 +--- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp ++++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp +@@ -20,7 +20,7 @@ + + #include "GifHelper.h" + #include +-#include ++#include + #include + + #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8)) +diff --git a/tools/depends/native/TexturePacker/src/md5.h b/tools/depends/native/TexturePacker/src/md5.h +index 456e5be17f..4bb48e0810 100644 +--- a/tools/depends/native/TexturePacker/src/md5.h ++++ b/tools/depends/native/TexturePacker/src/md5.h +@@ -23,8 +23,8 @@ + #ifndef MD5_H + #define MD5_H + +-#include /* for memcpy() */ +-#include ++#include /* for memcpy() */ ++#include + + struct MD5Context + { +-- +2.16.0 + +From ff3e6dad5fdb7b9a2985b2547c8020c709af0340 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Mon, 6 Nov 2017 18:05:17 +0000 +Subject: [PATCH] TexturePacker: drop unused variable + +--- + tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp +index 53f5e9beb7..b0f18bed68 100644 +--- a/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp ++++ b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp +@@ -72,7 +72,6 @@ bool JPGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames) + struct jpeg_decompress_struct cinfo; + struct jpeg_error_mgr jerr; + +- char *linha; + int ImageSize; + + cinfo.err = jpeg_std_error(&jerr); +@@ -89,7 +88,6 @@ bool JPGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames) + DecodedFrame frame; + + frame.rgbaImage.pixels = (char *)new char[ImageSize]; +- linha = (char *)frame.rgbaImage.pixels; + + unsigned char *scanlinebuff = new unsigned char[3 * cinfo.image_width]; + unsigned char *dst = (unsigned char *)frame.rgbaImage.pixels; +-- +2.16.0 + +From ee441543be07de1222bcff2587bfcdb5c1231989 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Mon, 6 Nov 2017 21:02:06 +0000 +Subject: [PATCH] TexturePacker: include GifHelper after system headers + +--- + tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp +index 3ddb20fe88..9ced4ec5bc 100644 +--- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp ++++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp +@@ -18,10 +18,10 @@ + * + */ + +-#include "GifHelper.h" + #include + #include + #include ++#include "GifHelper.h" + + #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8)) + #define GIF_MAX_MEMORY 82944000U // about 79 MB, which is equivalent to 10 full hd frames. +-- +2.16.0 +