From nobody Tue Aug 06 08:11:52 2024 X-Original-To: dev-commits-ports-all@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 4WdQy01Rmlz5SyQ3; Tue, 06 Aug 2024 08:11:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WdQy010Cnz47Vk; Tue, 6 Aug 2024 08:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722931912; 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=4trXMaiI15BeQe7VdNV8kmZLs8BNrKWE7gCxj0vljRw=; b=JVmypwKPUnuGEM4wynCF9GZgUaWUISZFKnw0zQalKoMiPF6MdLq5dRk4jzsRKG0PCsafAM 8QYDqdpLXaPKMSuZWRpLFzKSbJC6GUd36LNRcSUJ8gYpCQ/jAReflYzd9M+sdIxcs3LQqn zescM90o2Dh9/xt5pPD7oSQWPZ9XgVpA2t8b4X5bFP//tTBQNRTlDt63qt+8Bnl+sJgOiZ Xe4MInkcawgJUT8IrAVBISlhcci4i2OK2qoDKw+3/UeGbuPsTDOcbLOrvowbhnBm2isl84 luC6S+5kRtnZAylRZ5XfMj6ABuCGy8bWZKKJmYYQnslrbmNZrmCf1pFA9J7i1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722931912; a=rsa-sha256; cv=none; b=skmXN8fBTvlym/EOC4COPXBBTJbQ2M480rTOWo26KsP+wLZMtWXxSbPXJVkoPDbOktWRP3 RymFVkICH33H0C8qUMd5yphRwluYpVDwydrZBeCVQ1HxLoicRRqpfaZObG5bDuVSbMZ4mS N/bKEEfFhsVVyALwgqu8qPsaxchWg1mXnTrPdKaMnKFiSXJSMmsDe5HQGGikFZKj2vZbMG DIr8cYclhj5W3UpZDWhtxgOOGsF33ZFQfIc6auUJyXzGa9HNlhJOrJzr1VD0llj3p4v4xa DwGQ+JYLNawEGYXxvKgGC1XCTsF4/OpPRnyqUjGKg5xk5/DbqhyPDp60KUjcew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722931912; 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=4trXMaiI15BeQe7VdNV8kmZLs8BNrKWE7gCxj0vljRw=; b=CEROlPqQV+U7RhDv3uY4A3oiejwHto6pxfgbDNZZ5iBft66GhqnodmvaiWsotVlss/H+8w PJSk6uFBXeWHi7yplwjFCPT+P5oRR1qhBTH2STXkBCUdHOTp1hcwY2QJFFlcNg1OiaGqOp mOi2jMTiRID3hgzAI8uRCyueoFXrn9skaRxFNsU+d2Fo9/VWDYTmegQGjWfJLsMyKx3Phb Fu6VA/9oYOyO+gi2WvLqQx85W9sr8PKuxlYan3BwUdNLl+BkyKCIcR+Nsow0ZL0Rt4hkw+ Dj+1ASGE0qvk4fk/OIKMWlaiu/htIS1/6iZBZTOGHvRco/wfDBvHbQVwV7ECsQ== 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 4WdQy00bhWzyN1; Tue, 6 Aug 2024 08:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4768Bqh2022853; Tue, 6 Aug 2024 08:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4768Bqt4022850; Tue, 6 Aug 2024 08:11:52 GMT (envelope-from git) Date: Tue, 6 Aug 2024 08:11:52 GMT Message-Id: <202408060811.4768Bqt4022850@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernhard Froehlich Subject: git: d6df94a68f41 - 2024Q3 - multimedia/kodi: Fix fallout caused by recent taglib update List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: d6df94a68f4185bb5ffb1116988bc0a6d64b83e5 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6df94a68f4185bb5ffb1116988bc0a6d64b83e5 commit d6df94a68f4185bb5ffb1116988bc0a6d64b83e5 Author: yzrh AuthorDate: 2024-08-06 07:59:40 +0000 Commit: Bernhard Froehlich CommitDate: 2024-08-06 08:11:14 +0000 multimedia/kodi: Fix fallout caused by recent taglib update PR: 280143 Submitted by: yzrh@noema.org (maintainer) (cherry picked from commit 8d205087923f2b58fed8801c2681a41f074c4368) --- multimedia/kodi/Makefile | 2 +- .../patch-xbmc_music_tags_TagLibVFSStream.cpp | 47 ++++++++++++++++++++++ .../files/patch-xbmc_music_tags_TagLibVFSStream.h | 41 +++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile index 2a0193947479..15acf51fec00 100644 --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -1,6 +1,6 @@ PORTNAME= kodi DISTVERSION= 21.0 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= multimedia java MASTER_SITES= http://mirrors.kodi.tv/build-deps/sources/ DISTFILES= apache-groovy-binary-${GROOVY_VERSION}.zip \ diff --git a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp new file mode 100644 index 000000000000..1e36573c825d --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp @@ -0,0 +1,47 @@ +--- xbmc/music/tags/TagLibVFSStream.cpp.orig 2024-07-20 12:15:29 UTC ++++ xbmc/music/tags/TagLibVFSStream.cpp +@@ -59,7 +59,7 @@ FileName TagLibVFSStream::name() const + * Reads a block of size \a length at the current get pointer. + */ + #if (TAGLIB_MAJOR_VERSION >= 2) +-ByteVector TagLibVFSStream::readBlock(unsigned long length) ++ByteVector TagLibVFSStream::readBlock(size_t length) + #else + ByteVector TagLibVFSStream::readBlock(TagLib::ulong length) + #endif +@@ -282,7 +282,7 @@ bool TagLibVFSStream::isOpen() const + * + * \see Position + */ +-void TagLibVFSStream::seek(long offset, Position p) ++void TagLibVFSStream::seek(TagLib::offset_t offset, Position p) + { + const long fileLen = length(); + if (m_bIsReadOnly && fileLen > 0) +@@ -340,7 +340,7 @@ void TagLibVFSStream::clear() + /*! + * Returns the current offset within the file. + */ +-long TagLibVFSStream::tell() const ++TagLib::offset_t TagLibVFSStream::tell() const + { + int64_t pos = m_file.GetPosition(); + if(pos > LONG_MAX) +@@ -352,7 +352,7 @@ long TagLibVFSStream::tell() const + /*! + * Returns the length of the file. + */ +-long TagLibVFSStream::length() ++TagLib::offset_t TagLibVFSStream::length() + { + return (long)m_file.GetLength(); + } +@@ -360,7 +360,7 @@ long TagLibVFSStream::length() + /*! + * Truncates the file to a \a length. + */ +-void TagLibVFSStream::truncate(long length) ++void TagLibVFSStream::truncate(TagLib::offset_t length) + { + m_file.Truncate(length); + } diff --git a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h new file mode 100644 index 000000000000..2a762c2a791b --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h @@ -0,0 +1,41 @@ +--- xbmc/music/tags/TagLibVFSStream.h.orig 2024-06-28 10:37:37 UTC ++++ xbmc/music/tags/TagLibVFSStream.h +@@ -38,7 +38,7 @@ namespace MUSIC_INFO + * Reads a block of size \a length at the current get pointer. + */ + #if (TAGLIB_MAJOR_VERSION >= 2) +- TagLib::ByteVector readBlock(unsigned long length) override; ++ TagLib::ByteVector readBlock(size_t length) override; + #else + TagLib::ByteVector readBlock(TagLib::ulong length) override; + #endif +@@ -99,7 +99,7 @@ namespace MUSIC_INFO + * + * \see Position + */ +- void seek(long offset, TagLib::IOStream::Position p = Beginning) override; ++ void seek(TagLib::offset_t offset, TagLib::IOStream::Position p = Beginning) override; + + /*! + * Reset the end-of-file and error flags on the file. +@@ -109,17 +109,17 @@ namespace MUSIC_INFO + /*! + * Returns the current offset within the file. + */ +- long tell() const override; ++ TagLib::offset_t tell() const override; + + /*! + * Returns the length of the file. + */ +- long length() override; ++ TagLib::offset_t length() override; + + /*! + * Truncates the file to a \a length. + */ +- void truncate(long length) override; ++ void truncate(TagLib::offset_t length) override; + + protected: + /*!