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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10B2A138334 for ; Fri, 6 Dec 2019 17:08:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C6E8E0883; Fri, 6 Dec 2019 17:08:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0610AE0883 for ; Fri, 6 Dec 2019 17:08:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B88BA34D83E for ; Fri, 6 Dec 2019 17:08:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CAED4778 for ; Fri, 6 Dec 2019 17:07:58 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1575652071.d809e892a10f4ad04312db32d98e32421c367d9a.candrews@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-18.5-cassert.patch media-tv/kodi/kodi-18.5.ebuild media-tv/kodi/kodi-9999.ebuild X-VCS-Directories: media-tv/kodi/ media-tv/kodi/files/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: d809e892a10f4ad04312db32d98e32421c367d9a X-VCS-Branch: master Date: Fri, 6 Dec 2019 17:07:58 +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: 007019ca-3a27-4898-9087-1be63e8cec9e X-Archives-Hash: 109733c40adf4cd4d2560998005c86da commit: d809e892a10f4ad04312db32d98e32421c367d9a Author: Craig Andrews gentoo org> AuthorDate: Fri Dec 6 17:04:57 2019 +0000 Commit: Craig Andrews gentoo org> CommitDate: Fri Dec 6 17:07:51 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d809e892 media-tv/kodi: Fix compiling with >=dev-libs/libfmt-6.1.0 Closes: https://bugs.gentoo.org/702104 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Craig Andrews gentoo.org> media-tv/kodi/files/kodi-18.5-cassert.patch | 42 +++++++++++++++++++++++++++++ media-tv/kodi/kodi-18.5.ebuild | 3 +++ media-tv/kodi/kodi-9999.ebuild | 4 ++- 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/media-tv/kodi/files/kodi-18.5-cassert.patch b/media-tv/kodi/files/kodi-18.5-cassert.patch new file mode 100644 index 00000000000..9558baa9e18 --- /dev/null +++ b/media-tv/kodi/files/kodi-18.5-cassert.patch @@ -0,0 +1,42 @@ +https://github.com/xbmc/xbmc/pull/17000 + +From bbfc36f06c191d3bdea19cacc498afb86bd25404 Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Thu, 5 Dec 2019 14:49:50 -0500 +Subject: [PATCH] Add missing cassert includes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without these includes, ‘assert’ was not declared in this scope errors +occur. +--- + xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 1 + + xbmc/windowing/GraphicContext.cpp | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp +index 1303d894478c..aa85d95b3234 100644 +--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp ++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp +@@ -31,6 +31,7 @@ + #include "utils/Variant.h" + #include "utils/log.h" + ++#include + #include + + #define SETTING_PROFILE_NAME "profile.name" +diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp +index b47bafba57dc..75b333ea6daa 100644 +--- a/xbmc/windowing/GraphicContext.cpp ++++ b/xbmc/windowing/GraphicContext.cpp +@@ -25,6 +25,8 @@ + #include "settings/lib/Setting.h" + #include "utils/log.h" + ++#include ++ + using namespace KODI::MESSAGING; + + CGraphicContext::CGraphicContext(void) = default; diff --git a/media-tv/kodi/kodi-18.5.ebuild b/media-tv/kodi/kodi-18.5.ebuild index e4a919d0deb..f8dc1e17074 100644 --- a/media-tv/kodi/kodi-18.5.ebuild +++ b/media-tv/kodi/kodi-18.5.ebuild @@ -14,6 +14,9 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )" +PATCHES=( + "${FILESDIR}/${P}-cassert.patch" +) if [[ ${PV} == *9999 ]] ; then PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index d44644c1f23..30fee14a935 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -15,7 +15,9 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )" - +PATCHES=( + "${FILESDIR}/${PN}-18.5-cassert.patch" +) if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" inherit git-r3