commit: d809e892a10f4ad04312db32d98e32421c367d9a Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Fri Dec 6 17:04:57 2019 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> 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 <candrews <AT> 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 <[email protected]> +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 <cassert> + #include <utility> + + #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 <cassert> ++ + 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
