summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@gentoo.org>2021-04-09 16:32:43 -0400
committerCraig Andrews <candrews@gentoo.org>2021-04-09 16:33:07 -0400
commitf20cebb59ff416d22a97c826fdb14df9edfa0769 (patch)
tree0a6c946565452d3b981b52aee8092802deda0549 /media-plugins/kodi-inputstream-adaptive
parentprofiles: add bug reference to games-misc/games-envd mask (diff)
downloadgentoo-f20cebb59ff416d22a97c826fdb14df9edfa0769.tar.gz
gentoo-f20cebb59ff416d22a97c826fdb14df9edfa0769.tar.bz2
gentoo-f20cebb59ff416d22a97c826fdb14df9edfa0769.zip
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@gentoo.org>
Diffstat (limited to 'media-plugins/kodi-inputstream-adaptive')
-rw-r--r--media-plugins/kodi-inputstream-adaptive/files/kodi-inputstream-adaptive-2.6.11.patch27
-rw-r--r--media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.11.ebuild21
-rw-r--r--media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild43
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 000000000000..fe32b54c6eed
--- /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 <candrews@integralblue.com>
+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 48e18f09b005..4e39d55c33a5 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 18e80d341a6d..eb913a08d263 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
+}