commit: f20cebb59ff416d22a97c826fdb14df9edfa0769 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Fri Apr 9 20:32:43 2021 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Fri Apr 9 20:33:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20cebb5
media-plugins/kodi-inputstream-adaptive: make gtest optional Closes: https://bugs.gentoo.org/781143 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../files/kodi-inputstream-adaptive-2.6.11.patch | 27 ++++++++++++++ .../kodi-inputstream-adaptive-2.6.11.ebuild | 21 +++++++++-- .../kodi-inputstream-adaptive-9999.ebuild | 43 ++++++++++++++-------- 3 files changed, 72 insertions(+), 19 deletions(-) diff --git a/media-plugins/kodi-inputstream-adaptive/files/kodi-inputstream-adaptive-2.6.11.patch b/media-plugins/kodi-inputstream-adaptive/files/kodi-inputstream-adaptive-2.6.11.patch new file mode 100644 index 00000000000..fe32b54c6ee --- /dev/null +++ b/media-plugins/kodi-inputstream-adaptive/files/kodi-inputstream-adaptive-2.6.11.patch @@ -0,0 +1,27 @@ +https://github.com/xbmc/inputstream.adaptive/pull/637 + +From 3c321bf5e0882b9592b485a551cfc83647727350 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <[email protected]> +Date: Fri, 9 Apr 2021 16:25:31 -0400 +Subject: [PATCH] Only enable testing if BUILD_TESTING is set + +BUILD_TESTING is the convention for enabling test building. + +This condition allows building without gtest. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2000e27a..42f15563 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -100,7 +100,7 @@ build_addon(inputstream.adaptive ADP DEPLIBS) + + include(CPack) + +-if(NOT CMAKE_CROSSCOMPILING) ++if(NOT CMAKE_CROSSCOMPILING AND BUILD_TESTING) + list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure") + enable_testing() + include(FindGtest) diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.11.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.11.ebuild index 48e18f09b00..4e39d55c33a 100644 --- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.11.ebuild +++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.11.ebuild @@ -8,6 +8,9 @@ inherit cmake kodi-addon DESCRIPTION="Kodi's Adaptive inputstream addon" HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"; SRC_URI="" +PATCHES=( + "${FILESDIR}/${P}.patch" +) case ${PV} in 9999) @@ -26,17 +29,29 @@ esac LICENSE="GPL-2" SLOT="0" -IUSE="" +RESTRICT="!test? ( test )" +IUSE="test" -DEPEND=" +COMMON_DEPEND=" dev-libs/expat =media-tv/kodi-19* " +DEPEND=" + ${COMMON_DEPEND} + test? ( dev-cpp/gtest ) + " RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} " src_prepare() { [ -d depends ] && rm -rf depends || die cmake_src_prepare } + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild index 18e80d341a6..eb913a08d26 100644 --- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild +++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild @@ -1,43 +1,54 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit kodi-addon +inherit cmake kodi-addon DESCRIPTION="Kodi's Adaptive inputstream addon" HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"; -KODI_PLUGIN_NAME="inputstream.adaptive" +SRC_URI="" case ${PV} in 9999) SRC_URI="" - EGIT_REPO_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}.git"; + EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"; EGIT_BRANCH="Matrix" inherit git-r3 - DEPEND="~media-tv/kodi-9999" ;; *) - CODENAME="Matrix" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}" - DEPEND="=media-tv/kodi-19*:=" + CODENAME="Matrix" + SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}" ;; esac -LICENSE="GPL-2+" +LICENSE="GPL-2" SLOT="0" -IUSE="" +RESTRICT="!test? ( test )" +IUSE="test" -DEPEND+=" +COMMON_DEPEND=" dev-libs/expat + =media-tv/kodi-19* + " +DEPEND=" + ${COMMON_DEPEND} + test? ( dev-cpp/gtest ) + " +RDEPEND=" + ${COMMON_DEPEND} " - -RDEPEND="${DEPEND}" src_prepare() { - if [ -d depends ]; then rm -rf depends || die; fi - + [ -d depends ] && rm -rf depends || die cmake_src_prepare } + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +}
