From eccb70a7f91b2d22582587f26d1a28bb31408b45 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 May 2019 00:10:51 +0100 Subject: gentoo resync : 18.05.2019 --- media-sound/yarock/Manifest | 8 ++-- .../yarock/files/yarock-1.3.1-desktop.patch | 8 ---- media-sound/yarock/files/yarock-1.3.1-phonon.patch | 36 -------------- media-sound/yarock/metadata.xml | 4 +- media-sound/yarock/yarock-1.3.1.ebuild | 56 ---------------------- media-sound/yarock/yarock-1.4.0.ebuild | 53 ++++++++++++++++++++ 6 files changed, 59 insertions(+), 106 deletions(-) delete mode 100644 media-sound/yarock/files/yarock-1.3.1-desktop.patch delete mode 100644 media-sound/yarock/files/yarock-1.3.1-phonon.patch delete mode 100644 media-sound/yarock/yarock-1.3.1.ebuild create mode 100644 media-sound/yarock/yarock-1.4.0.ebuild (limited to 'media-sound/yarock') diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest index c6e7024fdec8..f4caf6d3131f 100644 --- a/media-sound/yarock/Manifest +++ b/media-sound/yarock/Manifest @@ -1,5 +1,3 @@ -AUX yarock-1.3.1-desktop.patch 237 BLAKE2B 3271ee7d08d4a897dcdb51d504653e2472af1db3ba34279d7b101b84c30821a451ccd268ac3d1d7474f1238f3d1bf75ddcd8c9b251558f87ca3333b1591aad8d SHA512 023edebc269b860731a17ff1ae2006b4570848449d9994f61f8d81a1e82779d59fbfb55623fd1855223de74201d3ad4960fbe3a8bc7109c15053f92a29cd0e0d -AUX yarock-1.3.1-phonon.patch 1259 BLAKE2B 48ee6d115342463015707ad4b79ff2ebb416e36879c365add52c1a6bb0245c8f444c0bb88bd21fa9713d788ef6aeeb2a9a442247fdcc37b92362dfcd142affb7 SHA512 387f88c0f86102fb67fc0914297b5d15f438997f0212d3d9afa19fb00abf2b2aca575493be3f2d7aad42420a1fe6eb092bebcad68e5c195c5875f0f71f9fec1c -DIST Yarock_1.3.1_Sources.tar.gz 734280 BLAKE2B 3bb8a452a3a7bd27792f67b6fcb2765494738c7a0149248b658333a64f38494880891e8a9d43ef7367d7748e5c0b6a2d9349dc1dd73dd0fecd94d88f21eec020 SHA512 a59837609c5004005360a272b45794143c64373d13c2783f84299ab0b849223aac2be3d87703e1925d66ed4301bcc2e7254228d34f556bce0447d949539acf2e -EBUILD yarock-1.3.1.ebuild 1056 BLAKE2B 75c7a958102332e39634551cc6bd404c55b4bab67ff4403758381d5868c4f9c638a1a7baae9991647b10ab90420acdbd3dc2c50be4cc0b20749567648806b1a6 SHA512 02bf3138130be288cf16c3a1ef1e73070502b84ef79f73e96d81adaeb752fb642839a4012fc6b55168485167dac987fe37d096e29f47ae1894d393a66e18ad40 -MISC metadata.xml 376 BLAKE2B b3e63f3aed251bf2410912dd48c7933cb85aa4679c3e8dab637d58bff69c018503e68b1e0aabb08734b6101bfa433d4b6a536770537ef077eec4add8f9e1acd8 SHA512 3d21dc4fe86b41b86d253184ae1be5de6c63169b4e0751f22f9733014b5f04895dd09c2ac23bc308ded24fcf61e54e5ab1022307b3a4658187398424a6c3a32a +DIST Yarock_1.4.0_Sources.tar.gz 735399 BLAKE2B e54e995a419e1837b746374d3d7c6655e750d5142cce4d573dc268010b7bcf9da1a15531991769c16693f8b587228da445d4a14a89499600708309876f83bb5f SHA512 39ad470cd53fef738166ca635ca96da0868db406b62be92d276062acc568724a62886b7779eb47fc6a3e6d2825fe417753e9e6b87a978b9009e09d7ea5866f00 +EBUILD yarock-1.4.0.ebuild 983 BLAKE2B b8ddce0cafd4d71bcaef43ed39adf933127d367f32d020d28a6c8bcb8b6fc038dbb251cc32288d2bcd956ff2df85e120f7e194aca77342c66973ae455dd50c87 SHA512 7a940a8126ec028b83cf8666bc5c3eacec7a723390c338a2084c22256971b8e7156bef77616b39aa65afb5cc77057c3b1246c2976a15f597211cc92a2adb66d7 +MISC metadata.xml 477 BLAKE2B 8f41c22740fb729d50042c0e06585fef7bfc1d17333d2a76357d11fe898d6b8deaebeba2b9c8f4242b6db8997d9f4c5b6661eff9a29b84d196f5295d32620e8e SHA512 17dbd3112993095260668fd1aa35dac9928ee1e44d2dac722ff78a6d901c21e15f586ffe0986f02c8c071ec3770bbd084cdb4448cb3cf6c01bb9d723f8f66a2e diff --git a/media-sound/yarock/files/yarock-1.3.1-desktop.patch b/media-sound/yarock/files/yarock-1.3.1-desktop.patch deleted file mode 100644 index 3131c072dfbb..000000000000 --- a/media-sound/yarock/files/yarock-1.3.1-desktop.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/data/yarock.desktop 2017-12-24 08:48:55.000000000 +0100 -+++ b/data/yarock.desktop 2018-10-04 18:18:37.700722758 +0200 -@@ -1,5 +1,4 @@ - [Desktop Entry] --Version=1.3.0 - Name=Yarock - Comment=Play your music collection - TryExec=yarock diff --git a/media-sound/yarock/files/yarock-1.3.1-phonon.patch b/media-sound/yarock/files/yarock-1.3.1-phonon.patch deleted file mode 100644 index 53bbf834cbca..000000000000 --- a/media-sound/yarock/files/yarock-1.3.1-phonon.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/src/core/player/phonon/engine_phonon.h 2017-11-04 17:06:43.000000000 +0100 -+++ b/src/core/player/phonon/engine_phonon.h 2018-10-04 18:23:29.079923850 +0200 -@@ -27,12 +27,12 @@ - #include - - // Phonon --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include - - #include "core/player/engine_base.h" - #include "core/mediaitem/mediaitem.h" ---- a/src/core/player/phonon/engine_phonon.cpp 2017-11-11 07:29:42.000000000 +0100 -+++ b/src/core/player/phonon/engine_phonon.cpp 2018-10-04 18:23:29.084923716 +0200 -@@ -29,9 +29,9 @@ - #include - - // phonon --#include --#include --#include -+#include -+#include -+#include - - #include - diff --git a/media-sound/yarock/metadata.xml b/media-sound/yarock/metadata.xml index 2263346cdc5d..789a20e09848 100644 --- a/media-sound/yarock/metadata.xml +++ b/media-sound/yarock/metadata.xml @@ -6,6 +6,8 @@ Andreas Sturmlechner - Use media-libs/phonon backend instead of media-video/vlc + Enable media-video/mpv backend + Enable media-libs/phonon backend + Enable media-video/vlc backend diff --git a/media-sound/yarock/yarock-1.3.1.ebuild b/media-sound/yarock/yarock-1.3.1.ebuild deleted file mode 100644 index 97723a60ef20..000000000000 --- a/media-sound/yarock/yarock-1.3.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -MY_P="Yarock_${PV}_Sources" -DESCRIPTION="Qt-based music player" -HOMEPAGE="https://seb-apps.github.io/yarock/" -SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="phonon" - -RDEPEND=" - dev-cpp/htmlcxx - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/taglib - x11-libs/libX11 - !phonon? ( media-video/vlc:= ) - phonon? ( >=media-libs/phonon-4.10.1 ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qtconcurrent:5 - dev-qt/qtx11extras:5 -" - -DOCS=( CHANGES.md README.md ) - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-desktop.patch" - "${FILESDIR}/${P}-phonon.patch" -) - -src_configure() { - local mycmakeargs=( - -DENABLE_QT5=ON - -DENABLE_MPV=OFF - -DENABLE_PHONON=$(usex phonon ON OFF) - -DENABLE_VLC=$(usex phonon OFF ON) - ) - - cmake-utils_src_configure -} diff --git a/media-sound/yarock/yarock-1.4.0.ebuild b/media-sound/yarock/yarock-1.4.0.ebuild new file mode 100644 index 000000000000..7d9acc2b0a02 --- /dev/null +++ b/media-sound/yarock/yarock-1.4.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +MY_P="Yarock_${PV}_Sources" +DESCRIPTION="Qt-based music player" +HOMEPAGE="https://seb-apps.github.io/yarock/" +SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="mpv phonon vlc" + +BDEPEND=" + dev-qt/linguist-tools:5 +" +RDEPEND=" + dev-cpp/htmlcxx + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/taglib + x11-libs/libX11 + phonon? ( >=media-libs/phonon-4.10.1 ) + vlc? ( media-video/vlc:= ) +" +DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5 + dev-qt/qtx11extras:5 +" + +DOCS=( CHANGES.md README.md ) + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local mycmakeargs=( + -DENABLE_QT5=ON + -DENABLE_MPV=$(usex mpv) + -DENABLE_PHONON=$(usex phonon) + -DENABLE_VLC=$(usex vlc) + ) + + cmake-utils_src_configure +} -- cgit v1.2.3