From 269581204f3555e3dee67f4ecf29dca64a118e48 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Apr 2023 05:52:09 +0100 Subject: gentoo auto-resync : 17:04:2023 - 05:52:08 --- media-libs/opencollada/Manifest | 4 ++- .../files/opencollada-1.6.68-gcc13.patch | 35 ++++++++++++++++++++++ .../files/opencollada-1.6.68-werror.patch | 11 +++++++ media-libs/opencollada/opencollada-1.6.68.ebuild | 4 ++- 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch create mode 100644 media-libs/opencollada/files/opencollada-1.6.68-werror.patch (limited to 'media-libs/opencollada') diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index 15212d1da022..0f05bffde727 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -1,6 +1,8 @@ AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55 AUX opencollada-1.6.68-cmake-fixes.patch 4823 BLAKE2B 0a403bf25b0935380d86ee9fe272935dcff053b29813de665d4e65028115f7b0ae5d7c8e51a4de0d027c74a41d0ebc23883469a20ca2e150fb1c440976f4db25 SHA512 5c2499575d5127a94eab5876817019a9bf28a32843d6f610d5b39ca35de2463589a12cc58b0004947a6cfb369c0b4c8115584f32f827b11dd5b966bd0f171494 AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70730707c3315ee8207a603fe2f6f1d569a37712572b69b011d75890837d530ddf788dfcd2f952dbeef9427a9167bf0b23d148a311512a6 SHA512 b18662b5844d71c643ad384fbdccd679b1177d6a9f0afcda653fd38d07a9d0048ab6abb029bc7b992198e455fcfbd868f8b74569606b3794d5a1892fddbf83be +AUX opencollada-1.6.68-gcc13.patch 1263 BLAKE2B ecb12ae78a732d3e8a2d858d7a6ff1409e98f01dc23b94a376b9ceb3b76c076939054531a58781cfa378027f8bd5aa27c587185e66f80327a3d2d0e1981c85db SHA512 3b879549faf5261a30f141ea9a2b96701a4e02310156b602f47d507deadadc2db57e9f8ba20405d28f819d3886f9307d1e1736bc40b2cce62acd705dc86d63e8 +AUX opencollada-1.6.68-werror.patch 445 BLAKE2B 8b397bf950c8240e95214221f4fcfe0379fae3f31ce4cf3fb989f7c6b89f5432cf655202daf570cd3a692c0dd00b4efbeaa3b7c06de81ab034ad994727e9f798 SHA512 8fe614fe475a1a8b06cfcee2aaa1a666e1b4b42cfeaf5053cb23bbf056fafba6cf2cb13262cdd812f80bb8a4a63365f94e81aebeddc6c8d53f00c7f366f4776c DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173 -EBUILD opencollada-1.6.68.ebuild 1887 BLAKE2B c3a62d6fb6c53de47eb872b1bc2bef933c13c6880ac55d80706bafc0dc37c547ddde3f7d334f9913d4faf7a3fa9bdb57b02547924179755f6475af3b5f38902d SHA512 de0a56e8f3854b053543b0e91f846558dd0d32f4743b1b12b4a59b091c83a6bbaadf4c0a1903ffa857e8b10539c702bb8ebc3fddba7be9f80a79a84eed44a9e0 +EBUILD opencollada-1.6.68.ebuild 1968 BLAKE2B 4c7e06f75e153cca81f48efa37f3b4506299890f0ff004c293c28076711a1510237cfaecad986caf1ec85cf6e11f1f46502ee3ddae7a6277f33a1b760caaa21a SHA512 db237c5ebb556ac9f415e747b1ed445531da5f604ffe388b67e42da50a5c781de6c5533263db8f02f98dc86a3333c04741cb4a0d3266c5c6b617ccc33da656b2 MISC metadata.xml 489 BLAKE2B b978448cfc058c6d9e723fef98d2f7d16974497bee81dfe3817cbf92cbbbacba6450ce32a931875d082760c4a2ae196b82214672dcd9c415f59dd97b20190a23 SHA512 91bd5a59106015bd88e11f99a2d68feac2b94f374c9344b068ad1563ae888fd6b0840a0d0c83fd8237c66892e311fb6ea8b0eb34302c30595667b4cf310d9cc2 diff --git a/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch b/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch new file mode 100644 index 000000000000..e12771ca97a4 --- /dev/null +++ b/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/899750 +https://github.com/KhronosGroup/OpenCOLLADA/pull/656 + +From 84c8c9a02b4e5fe40465034563cb36527e865dac Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 11 Jul 2022 21:33:11 +0100 +Subject: [PATCH] DAEValidator: fix gcc-13 build + +On gcc-13 c++ headers don't include implicitly any more. +This exposed build failure as: + + /build/source/DAEValidator/library/src/XmlDoc.cpp: In member function 'virtual void opencollada::XmlDoc::readFile(const std::string&)': + /build/source/DAEValidator/library/src/XmlDoc.cpp:59:17: error: 'uint32_t' was not declared in this scope + 59 | uint32_t signature = *reinterpret_cast(content.data()); + | ^~~~~~~~ +--- a/DAEValidator/library/src/DaeValidator.cpp ++++ b/DAEValidator/library/src/DaeValidator.cpp +@@ -4,6 +4,7 @@ + #include "Strings.h" + #include "StringUtil.h" + #include ++#include + #include "no_warning_iomanip" + #include "no_warning_iostream" + #include +--- a/DAEValidator/library/src/XmlDoc.cpp ++++ b/DAEValidator/library/src/XmlDoc.cpp +@@ -1,5 +1,6 @@ + #include "Macros.h" + ++#include + #if IS_GNUC_AND_GNUC_VERSION_LT(5,1,1) + #include + #endif + diff --git a/media-libs/opencollada/files/opencollada-1.6.68-werror.patch b/media-libs/opencollada/files/opencollada-1.6.68-werror.patch new file mode 100644 index 000000000000..3a490d326ddc --- /dev/null +++ b/media-libs/opencollada/files/opencollada-1.6.68-werror.patch @@ -0,0 +1,11 @@ +--- a/DAEValidator/CMakeLists.txt ++++ b/DAEValidator/CMakeLists.txt +@@ -100,7 +100,7 @@ if (WIN32) + # C4820: 'bytes' bytes padding added after construct 'member_name' + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820") + else () +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") + endif () + + add_custom_command( diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild index 49f53f567c18..d11bbc826b9f 100644 --- a/media-libs/opencollada/opencollada-1.6.68.ebuild +++ b/media-libs/opencollada/opencollada-1.6.68.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,6 +33,8 @@ PATCHES=( "${FILESDIR}/${P}-fix-null-conversion.patch" "${FILESDIR}/${P}-cmake-fixes.patch" "${FILESDIR}/${PN}-1.6.63-pcre-fix.patch" + "${FILESDIR}/${PN}-1.6.68-gcc13.patch" + "${FILESDIR}/${PN}-1.6.68-werror.patch" ) src_prepare() { -- cgit v1.2.3