commit: 3e488a2172f786f590364bdde51b2c121e5af5d9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Feb 22 14:31:56 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 23 21:41:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e488a21
media-sound/yarock: add 1.5.0 Splitting 1.4.0 patch to keep taglib2 compatibility. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/yarock/Manifest | 1 + .../files/yarock-1.4.0-fix-build-taglib2.patch | 9 ---- .../files/yarock-1.4.0-taglib2-include.patch | 11 +++++ media-sound/yarock/metadata.xml | 4 ++ media-sound/yarock/yarock-1.4.0-r4.ebuild | 5 +- media-sound/yarock/yarock-1.5.0.ebuild | 55 ++++++++++++++++++++++ 6 files changed, 75 insertions(+), 10 deletions(-) diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest index e7099485cbdb..2ab0372b11b8 100644 --- a/media-sound/yarock/Manifest +++ b/media-sound/yarock/Manifest @@ -1 +1,2 @@ DIST Yarock_1.4.0_Sources.tar.gz 735399 BLAKE2B e54e995a419e1837b746374d3d7c6655e750d5142cce4d573dc268010b7bcf9da1a15531991769c16693f8b587228da445d4a14a89499600708309876f83bb5f SHA512 39ad470cd53fef738166ca635ca96da0868db406b62be92d276062acc568724a62886b7779eb47fc6a3e6d2825fe417753e9e6b87a978b9009e09d7ea5866f00 +DIST yarock-1.5.0.tar.gz 1134974 BLAKE2B 802e99f664a29a4879ecc820a6421284e9b28ead82e9a517a974db5818523e53b22d7fbf73b6bcdd88b7f0b5b55aad1f001fd4102e69532ce2c4ef23b8c7ad2a SHA512 f56dacbfe15117c3ca4c3ad52394e6d4832410a8e6c71b9247d6b9449fec00b3aae6daede2562f4b8cd96f26c574c1a98b62b68457fc4c3a5f95f7f602b53e1f diff --git a/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch b/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch index d234866ea26d..ad6fff416532 100644 --- a/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch +++ b/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch @@ -1,14 +1,5 @@ -https://github.com/sebaro/Yarock/commit/3cdc8910a6dec9054913dcdd8e804bb79b53b861.patch --- a/src/core/mediaitem/tag.cpp +++ b/src/core/mediaitem/tag.cpp -@@ -28,6 +28,7 @@ - - #include <taglib/mpegfile.h> - #include <taglib/asffile.h> -+#include <taglib/attachedpictureframe.h> - #include <taglib/vorbisfile.h> - #include <taglib/oggfile.h> - #include <taglib/oggflacfile.h> @@ -289,10 +290,10 @@ /*----------------------------------------------------------------------------*/ static void readMP4Tags(TagLib::MP4::Tag *tag, MEDIA::TrackPtr track, QString& s_disc ) diff --git a/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch b/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch new file mode 100644 index 000000000000..3ddf7256a42a --- /dev/null +++ b/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch @@ -0,0 +1,11 @@ +https://github.com/sebaro/Yarock/issues/1#issuecomment-2402327268 +--- a/src/core/mediaitem/tag.cpp ++++ b/src/core/mediaitem/tag.cpp +@@ -28,6 +28,7 @@ + + #include <taglib/mpegfile.h> + #include <taglib/asffile.h> ++#include <taglib/attachedpictureframe.h> + #include <taglib/vorbisfile.h> + #include <taglib/oggfile.h> + #include <taglib/oggflacfile.h> diff --git a/media-sound/yarock/metadata.xml b/media-sound/yarock/metadata.xml index d49e848cea41..29917d9dae17 100644 --- a/media-sound/yarock/metadata.xml +++ b/media-sound/yarock/metadata.xml @@ -5,6 +5,10 @@ <email>[email protected]</email> <name>Andreas Sturmlechner</name> </maintainer> + <upstream> + <bugs-to>https://github.com/sebaro/Yarock/issues</bugs-to> + <remote-id type="github">sebaro/Yarock</remote-id> + </upstream> <use> <flag name="mpv">Enable <pkg>media-video/mpv</pkg> backend</flag> <flag name="phonon">Enable <pkg>media-libs/phonon</pkg> backend</flag> diff --git a/media-sound/yarock/yarock-1.4.0-r4.ebuild b/media-sound/yarock/yarock-1.4.0-r4.ebuild index e12b562a93b8..9866d17b8c7e 100644 --- a/media-sound/yarock/yarock-1.4.0-r4.ebuild +++ b/media-sound/yarock/yarock-1.4.0-r4.ebuild @@ -39,7 +39,10 @@ BDEPEND=" dev-qt/linguist-tools:5 " -PATCHES=( "${FILESDIR}"/${PN}-1.4.0-fix-build-taglib2.patch ) +PATCHES=( + "${FILESDIR}"/${P}-taglib2-include.patch + "${FILESDIR}"/${P}-fix-build-taglib2.patch +) DOCS=( CHANGES.md README.md ) diff --git a/media-sound/yarock/yarock-1.5.0.ebuild b/media-sound/yarock/yarock-1.5.0.ebuild new file mode 100644 index 000000000000..dfe38ca2841b --- /dev/null +++ b/media-sound/yarock/yarock-1.5.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Qt-based music player" +HOMEPAGE="https://github.com/sebaro/Yarock"; +SRC_URI="https://github.com/sebaro/Yarock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN^}-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="mpv vlc" + +RDEPEND=" + dev-cpp/htmlcxx + dev-qt/qtbase:6[dbus,gui,network,sql,sqlite,widgets,xml] + media-libs/taglib:= + x11-libs/libX11 + mpv? ( media-video/mpv:=[libmpv] ) + vlc? ( media-video/vlc:= ) +" +DEPEND="${RDEPEND} + dev-qt/qtbase:6[concurrent] +" +BDEPEND="dev-qt/qttools:6[linguist]" + +DOCS=( CHANGES.md README.md ) + +PATCHES=( + # TODO(?): https://github.com/sebaro/Yarock/issues/1#issuecomment-2398941145 + "${FILESDIR}"/${PN}-1.4.0-taglib2-include.patch + # Pending: https://github.com/sebaro/Yarock/pull/3 + "${FILESDIR}"/${P}-assorted-fixes.patch +) + +src_prepare() { + cmake_src_prepare + sed -e "/^Version/d" \ + -i data/org.yarock.desktop || die + mv data/{org.,}yarock.desktop || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PHONON=OFF # questionable benefit over vlc directly + -DENABLE_MPV=$(usex mpv) + -DENABLE_VLC=$(usex vlc) + ) + + cmake_src_configure +}
