From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0BB9115806E for ; Wed, 31 May 2023 03:07:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47DC7E0887; Wed, 31 May 2023 03:07:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31BD0E0887 for ; Wed, 31 May 2023 03:07:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44468340F7E for ; Wed, 31 May 2023 03:07:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E73CA6F for ; Wed, 31 May 2023 03:07:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685502364.57ce221edfeafd9b91be2ce4aacbedda83f62215.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/files/, media-tv/kodi/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/kodi/files/kodi-19.5-flatbuffers.patch media-tv/kodi/kodi-19.5.ebuild X-VCS-Directories: media-tv/kodi/ media-tv/kodi/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 57ce221edfeafd9b91be2ce4aacbedda83f62215 X-VCS-Branch: master Date: Wed, 31 May 2023 03:07:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6edb8f0-80fe-4821-892b-f56d937f9505 X-Archives-Hash: 535408d8455a7557d621c92740e31b1b commit: 57ce221edfeafd9b91be2ce4aacbedda83f62215 Author: Sam James gentoo org> AuthorDate: Wed May 31 03:06:04 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 31 03:06:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ce221e media-tv/kodi: fix build w/ new flatbuffers Closes: https://bugs.gentoo.org/907420 Signed-off-by: Sam James gentoo.org> media-tv/kodi/files/kodi-19.5-flatbuffers.patch | 35 +++++++++++++++++++++++++ media-tv/kodi/kodi-19.5.ebuild | 13 ++++----- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/media-tv/kodi/files/kodi-19.5-flatbuffers.patch b/media-tv/kodi/files/kodi-19.5-flatbuffers.patch new file mode 100644 index 000000000000..3e8f00c1449f --- /dev/null +++ b/media-tv/kodi/files/kodi-19.5-flatbuffers.patch @@ -0,0 +1,35 @@ +https://github.com/xbmc/xbmc/pull/23334 + +From 07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20H=C3=A4rer?= +Date: Sun, 28 May 2023 00:49:40 +0200 +Subject: [PATCH] SavestateFlatBuffer: Remove forward declararion of + FlatBufferBuilder + +This caused a compiler error with recent faltbuffers because the type changed: + +In file included from xbmc/cores/RetroPlayer/savestates/SavestateDatabase.cpp:12: +xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h:19:7: error: definition of type 'FlatBufferBuilder' conflicts with type alias of the same name +class FlatBufferBuilder; + ^ +/usr/include/flatbuffers/flatbuffer_builder.h:1414:7: note: 'FlatBufferBuilder' declared here +using FlatBufferBuilder = FlatBufferBuilderImpl; + ^ +1 error generated. + +(cherry picked from commit 351184d7e4e3edc447d04a297769eb41a477ba68) +--- a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h ++++ b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h +@@ -14,11 +14,6 @@ + + #include + +-namespace flatbuffers +-{ +-class FlatBufferBuilder; +-} +- + namespace KODI + { + namespace RETRO + diff --git a/media-tv/kodi/kodi-19.5.ebuild b/media-tv/kodi/kodi-19.5.ebuild index 2a49d55230af..6dffb81372ec 100644 --- a/media-tv/kodi/kodi-19.5.ebuild +++ b/media-tv/kodi/kodi-19.5.ebuild @@ -33,12 +33,6 @@ fi inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg -PATCHES=( - "${FILESDIR}/${PN}-19.4-atomic.patch" - "${FILESDIR}/${PN}-19.4-dav1d-1.0.0.patch" - "${FILESDIR}/${PN}-19.5-gcc-13.patch" -) - DESCRIPTION="A free and open source media-player and entertainment hub" HOMEPAGE="https://kodi.tv/ https://kodi.wiki/" @@ -195,6 +189,13 @@ In some cases Kodi needs to access multicast addresses. Please consider enabling IP_MULTICAST under Networking options. " +PATCHES=( + "${FILESDIR}/${PN}-19.4-atomic.patch" + "${FILESDIR}/${PN}-19.4-dav1d-1.0.0.patch" + "${FILESDIR}/${PN}-19.5-gcc-13.patch" + "${FILESDIR}/${PN}-19.5-flatbuffers.patch" +) + pkg_setup() { check_extra_config python-single-r1_pkg_setup