commit: 47ec2a3d8046b63f2ebd40f41c3baf0266e25278 Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> AuthorDate: Mon Aug 3 11:50:19 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Thu Aug 13 20:50:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ec2a3d
media-plugins/kodi-inputstream-rtmp: fixed deps, corrected licence pkg-config is required for FindRPMP.cmake rtmpdump should have USE=ssl Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> Closes: https://github.com/gentoo/gentoo/pull/16972 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../kodi-inputstream-rtmp-2.0.9-r1.ebuild | 44 +++++++++++++++++++++ .../kodi-inputstream-rtmp-3.1.1-r1.ebuild | 45 ++++++++++++++++++++++ .../kodi-inputstream-rtmp-3.1.1.ebuild | 42 -------------------- .../kodi-inputstream-rtmp-9999.ebuild | 29 +++++++------- media-plugins/kodi-inputstream-rtmp/metadata.xml | 1 - 5 files changed, 105 insertions(+), 56 deletions(-) diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9-r1.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9-r1.ebuild new file mode 100644 index 00000000000..420dcee6d34 --- /dev/null +++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kodi-addon + +DESCRIPTION="Kodi's RTMP inputstream addon" +HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"; +KODI_PLUGIN_NAME="inputstream.rtmp" + +case ${PV} in +9999) + SRC_URI="" + 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/${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+" +SLOT="0" +IUSE="" + +DEPEND+=" + media-video/rtmpdump[ssl] + " + +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" + +src_prepare() { + if [ -d depends ]; then rm -rf depends || die; fi + + cmake_src_prepare +} diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild new file mode 100644 index 00000000000..a0b89342cd1 --- /dev/null +++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kodi-addon + +DESCRIPTION="Kodi's RTMP inputstream addon" +HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"; +KODI_PLUGIN_NAME="inputstream.rtmp" + +case ${PV} in +9999) + SRC_URI="" + EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"; + EGIT_BRANCH="Matrix" + inherit git-r3 + DEPEND="~media-tv/kodi-9999" + ;; +*) + CODENAME="Matrix" + KEYWORDS="~amd64 ~x86" + 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+" +SLOT="0" +IUSE="" + +DEPEND+=" + media-video/rtmpdump[ssl] + " + +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" + +src_prepare() { + if [ -d depends ]; then rm -rf depends || die; fi + + cmake_src_prepare +} diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1.ebuild deleted file mode 100644 index 77cc1855694..00000000000 --- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's RTMP inputstream addon" -HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"; -SRC_URI="" - -case ${PV} in -9999) - SRC_URI="" - EGIT_BRANCH="Matrix" - EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"; - inherit git-r3 - ;; -*) - CODENAME="Matrix" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xbmc/inputstream.rtmp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/inputstream.rtmp-${PV}-${CODENAME}" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-19* - media-video/rtmpdump - " -RDEPEND=" - ${DEPEND} - " - -src_prepare() { - [ -d depends ] && rm -rf depends || die - cmake_src_prepare -} diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild index 4bdb525a8ca..a0b89342cd1 100644 --- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild +++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild @@ -3,40 +3,43 @@ EAPI=7 -inherit cmake kodi-addon +inherit kodi-addon DESCRIPTION="Kodi's RTMP inputstream addon" HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"; -SRC_URI="" +KODI_PLUGIN_NAME="inputstream.rtmp" case ${PV} in 9999) SRC_URI="" + EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"; EGIT_BRANCH="Matrix" - EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"; inherit git-r3 + DEPEND="~media-tv/kodi-9999" ;; *) CODENAME="Matrix" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xbmc/inputstream.rtmp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/inputstream.rtmp-${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 - media-video/rtmpdump - " -RDEPEND=" - ${DEPEND} +DEPEND+=" + media-video/rtmpdump[ssl] " +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-inputstream-rtmp/metadata.xml b/media-plugins/kodi-inputstream-rtmp/metadata.xml index 1ebb385c856..d571b6f58c0 100644 --- a/media-plugins/kodi-inputstream-rtmp/metadata.xml +++ b/media-plugins/kodi-inputstream-rtmp/metadata.xml @@ -5,7 +5,6 @@ <email>candr...@gentoo.org</email> <name>Craig Andrews</name> </maintainer> - <longdescription>Kodi's RTMP inputstream addon</longdescription> <upstream> <remote-id type="github">xbmc/inputstream.rtmp</remote-id> </upstream>
