commit: d7a9bcbbf6220c94b21b7933b97acc53771a7346 Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> AuthorDate: Sun Aug 2 10:13:03 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Thu Aug 13 20:50:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a9bcbb
media-plugins/kodi-visualization-waveform: fixed build, licence Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> Closes: https://github.com/gentoo/gentoo/pull/16952 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../kodi-visualization-waveform-3.1.1.ebuild | 28 ++++++++++++---------- .../kodi-visualization-waveform-4.2.0.ebuild | 28 ++++++++++++---------- .../kodi-visualization-waveform-9999.ebuild | 28 ++++++++++++---------- .../kodi-visualization-waveform/metadata.xml | 1 - 4 files changed, 45 insertions(+), 40 deletions(-) diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild index 97b415b36b2..3086c42e507 100644 --- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild +++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild @@ -3,41 +3,43 @@ EAPI=7 -inherit cmake kodi-addon +inherit kodi-addon DESCRIPTION="Waveform visualizer for Kodi" HOMEPAGE="https://github.com/xbmc/visualization.waveform"; -SRC_URI="" +KODI_PLUGIN_NAME="visualization.waveform" case ${PV} in 9999) SRC_URI="" - EGIT_REPO_URI="https://github.com/xbmc/visualization.waveform.git"; + EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"; inherit git-r3 + DEPEND="~media-tv/kodi-9999" ;; *) CODENAME="Leia" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xbmc/visualization.waveform/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/visualization.waveform-${PV}-${CODENAME}" + SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}" + DEPEND="=media-tv/kodi-18*:=" ;; esac -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="" -DEPEND=" - =media-tv/kodi-18* +DEPEND+=" + >=media-libs/glm-0.9.9.8-r1 virtual/opengl - media-libs/glm " -RDEPEND=" - ${DEPEND} - " +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" src_prepare() { - [ -d depends ] && rm -rf depends || die + if [ -d depends ]; then rm -rf depends || die; fi + cmake_src_prepare } diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.2.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.2.0.ebuild index 718526a3af0..55c275ff5f4 100644 --- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.2.0.ebuild +++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.2.0.ebuild @@ -3,41 +3,43 @@ EAPI=7 -inherit cmake kodi-addon +inherit kodi-addon DESCRIPTION="Waveform visualizer for Kodi" HOMEPAGE="https://github.com/xbmc/visualization.waveform"; -SRC_URI="" +KODI_PLUGIN_NAME="visualization.waveform" case ${PV} in 9999) SRC_URI="" - EGIT_REPO_URI="https://github.com/xbmc/visualization.waveform.git"; + EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"; inherit git-r3 + DEPEND="~media-tv/kodi-9999" ;; *) CODENAME="Matrix" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xbmc/visualization.waveform/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/visualization.waveform-${PV}-${CODENAME}" + SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}" + DEPEND="=media-tv/kodi-19*:=" ;; esac -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="" -DEPEND=" - =media-tv/kodi-19* +DEPEND+=" + >=media-libs/glm-0.9.9.8-r1 virtual/opengl - media-libs/glm " -RDEPEND=" - ${DEPEND} - " +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" src_prepare() { - [ -d depends ] && rm -rf depends || die + if [ -d depends ]; then rm -rf depends || die; fi + cmake_src_prepare } diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild index afd68022c36..55c275ff5f4 100644 --- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild +++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild @@ -3,41 +3,43 @@ EAPI=7 -inherit cmake kodi-addon +inherit kodi-addon DESCRIPTION="Waveform visualizer for Kodi" HOMEPAGE="https://github.com/xbmc/visualization.waveform"; -SRC_URI="" +KODI_PLUGIN_NAME="visualization.waveform" case ${PV} in 9999) SRC_URI="" - EGIT_REPO_URI="https://github.com/xbmc/visualization.waveform.git"; + EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"; inherit git-r3 + DEPEND="~media-tv/kodi-9999" ;; *) CODENAME="Matrix" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xbmc/visualization.waveform/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/visualization.waveform-${PV}-${CODENAME}" + SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}" + DEPEND="=media-tv/kodi-19*:=" ;; esac -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="" -DEPEND=" - ~media-tv/kodi-9999 +DEPEND+=" + >=media-libs/glm-0.9.9.8-r1 virtual/opengl - media-libs/glm " -RDEPEND=" - ${DEPEND} - " +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" src_prepare() { - [ -d depends ] && rm -rf depends || die + if [ -d depends ]; then rm -rf depends || die; fi + cmake_src_prepare } diff --git a/media-plugins/kodi-visualization-waveform/metadata.xml b/media-plugins/kodi-visualization-waveform/metadata.xml index 039bae43825..657e7feffd0 100644 --- a/media-plugins/kodi-visualization-waveform/metadata.xml +++ b/media-plugins/kodi-visualization-waveform/metadata.xml @@ -5,7 +5,6 @@ <email>[email protected]</email> <name>Craig Andrews</name> </maintainer> - <longdescription>Waveform visualizer for Kodi</longdescription> <upstream> <remote-id type="github">xbmc/visualization.waveform</remote-id> </upstream>
