From nobody Fri Dec 23 18:59:43 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NdxLl5sb2z1HQ8w; Fri, 23 Dec 2022 18:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NdxLl55HTz3MQZ; Fri, 23 Dec 2022 18:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671821983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lrmFXLKqbYfIA+TwVCO5chDTtAbQ1Yj1UZLJXodaK5s=; b=DDn6RR9vqUHa7mOIH3bsOxKOs5AYC3yAYlgL+jB0P3mqta/jDl0EmrFF4RRYiqRnnXxhBB ZhsWgAmoHO5EHdJiIogWWuU2IJojVvVeMoylqvT+QfiA0rUk5/OQoWIdlXSIllHraGKTck /Qi87BbUr+4VwYaxSDIvICXmgILbFLPOz7+qLwz+8omJwYhe10JSuUwafjVt9Zw5VbFVs9 kKboTRXOfj9DCn2TRRobby0905Gq/xqzfGUKoMXwZmgjEDkPTzyfGmFxhMvoqxMRAZpZax 3bcl+WkhEAmhrBwysRnoQmlX2e6G0/Hi9O3I8KMfyOtqClB0TpYJJc4HXPRQ9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671821983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lrmFXLKqbYfIA+TwVCO5chDTtAbQ1Yj1UZLJXodaK5s=; b=NRY4OY/gabJPLU62efy2Iv6kLI7fUCaC4DHkboY3KCbOw3eUjuP+9F339uvVakEvER2qne 3ctI5tTxDdaUDip5hiK8rQvk22Irv15yXr5nkE/+Q8pwSPUCGXD+G1uzeB9ltYzrUeE6P/ QAY6tX+XRajlBx0SY/FJpwKd+h9e95lbB1gGeZNIEQsjaBTsoRi9qjXAjNuVB4NKnwZKJz OV4ssuyoN/z8Ht/hZLsESsKkM8sLvQ/AxzZhl6lRhXEb+e/5XJHnT5rORzIEJjxSBE6aS5 874G1/A2UDFcCzF3T9mN+e7YhdD+90lAz2Q9Imhnny98UJzDclU9IonTV1Hpnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671821983; a=rsa-sha256; cv=none; b=ncfJbP72HC/h+WEbKgDnztSZ6t1QCOe8Q7ecztOwDFag9AGSmhYznnhw3o/vVkqEOhkiJs rJc1Nb7dNvFX2CEwLuiCx6n1lOHueyg8rwY3hy/eDjIXX+xkv2fzU7fXzgsMLbhbuRzGBt ADKXtrI85OZ2DggpZvMxdxVg3gzlOXAcgtp4URbvs+n0O2UFVylY4By3kW+ZP758TfYWkA PMXqWDnsInlICFdVIluHmunXJ7M6OG/KTarwQE7RX2lFi20I3QcHgQwtaNXQIqcwBzsZm8 Jk5pMCG9O+EyULMKJuYkA6Lvh40YN8JIhzYf0AEeGB/9wVGr4t/6MwDLal7tyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NdxLl47t6zkPj; Fri, 23 Dec 2022 18:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BNIxhwH013514; Fri, 23 Dec 2022 18:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BNIxhjf013513; Fri, 23 Dec 2022 18:59:43 GMT (envelope-from git) Date: Fri, 23 Dec 2022 18:59:43 GMT Message-Id: <202212231859.2BNIxhjf013513@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 445155586d06 - main - multimedia/kodi: Fix build with new devel/libfmt (9.1.0) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 445155586d0641fda327daffffc0044723eb0d18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=445155586d0641fda327daffffc0044723eb0d18 commit 445155586d0641fda327daffffc0044723eb0d18 Author: yzrh AuthorDate: 2022-12-23 18:57:37 +0000 Commit: Nuno Teixeira CommitDate: 2022-12-23 18:59:12 +0000 multimedia/kodi: Fix build with new devel/libfmt (9.1.0) - pet portlint PR: 268496 --- multimedia/kodi/Makefile | 7 +++-- multimedia/kodi/files/patch-xbmc_utils_GLUtils.cpp | 35 ++++++++++++++++++++++ .../patch-xbmc_windowing_X11_WinSystemX11.cpp | 14 +++++++++ 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile index ee62a8715793..7905f348af35 100644 --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -1,6 +1,6 @@ PORTNAME= kodi DISTVERSION= 19.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia java MAINTAINER= yzrh@noema.org @@ -40,8 +40,9 @@ LIB_DEPENDS= libass.so:multimedia/libass \ libtinyxml.so:textproc/tinyxml \ libuuid.so:misc/e2fsprogs-libuuid -USES= autoreconf:build cpe cmake:noninja compiler:c++17-lang gettext \ - gmake gnome iconv jpeg libtool pkgconfig python:3.7+ sqlite ssl +USES= autoreconf:build cmake:noninja compiler:c++17-lang cpe \ + desktop-file-utils gettext gmake gnome iconv jpeg libtool \ + pkgconfig python:3.7+ sqlite ssl KODI_CODENAME= Matrix LIBDVDCSS_VERSION= 1.4.2-Leia-Beta-5 diff --git a/multimedia/kodi/files/patch-xbmc_utils_GLUtils.cpp b/multimedia/kodi/files/patch-xbmc_utils_GLUtils.cpp new file mode 100644 index 000000000000..20102549bc79 --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_utils_GLUtils.cpp @@ -0,0 +1,35 @@ +--- xbmc/utils/GLUtils.cpp.orig 2022-12-21 00:14:18 UTC ++++ xbmc/utils/GLUtils.cpp +@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* sz + void LogGraphicsInfo() + { + #if defined(HAS_GL) || defined(HAS_GLES) +- const GLubyte *s; ++ const char *s; + +- s = glGetString(GL_VENDOR); ++ s = reinterpret_cast(glGetString(GL_VENDOR)); + if (s) + CLog::Log(LOGINFO, "GL_VENDOR = %s", s); + else + CLog::Log(LOGINFO, "GL_VENDOR = NULL"); + +- s = glGetString(GL_RENDERER); ++ s = reinterpret_cast(glGetString(GL_RENDERER)); + if (s) + CLog::Log(LOGINFO, "GL_RENDERER = %s", s); + else + CLog::Log(LOGINFO, "GL_RENDERER = NULL"); + +- s = glGetString(GL_VERSION); ++ s = reinterpret_cast(glGetString(GL_VERSION)); + if (s) + CLog::Log(LOGINFO, "GL_VERSION = %s", s); + else + CLog::Log(LOGINFO, "GL_VERSION = NULL"); + +- s = glGetString(GL_SHADING_LANGUAGE_VERSION); ++ s = reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); + if (s) + CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); + else diff --git a/multimedia/kodi/files/patch-xbmc_windowing_X11_WinSystemX11.cpp b/multimedia/kodi/files/patch-xbmc_windowing_X11_WinSystemX11.cpp new file mode 100644 index 000000000000..1cd0f0b6faf0 --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_windowing_X11_WinSystemX11.cpp @@ -0,0 +1,14 @@ +--- xbmc/windowing/X11/WinSystemX11.cpp.orig 2022-12-21 00:19:40 UTC ++++ xbmc/windowing/X11/WinSystemX11.cpp +@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() + + if(status == Success && items_read) + { +- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); ++ const char* s; ++ ++ s = reinterpret_cast(data); ++ CLog::Log(LOGDEBUG,"Window Manager Name: {}", s); + } + else + CLog::Log(LOGDEBUG,"Window Manager Name: ");