Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-inputstream-adaptive/files/, ...
Date: Thu, 22 Apr 2021 13:23:16
Message-Id: 1619097770.4aabb298cdcd1d91dd58a923c1a1cabd7302dbf7.candrews@gentoo
1 commit: 4aabb298cdcd1d91dd58a923c1a1cabd7302dbf7
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 22 13:22:50 2021 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 22 13:22:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aabb298
7
8 media-plugins/kodi-inputstream-adaptive: Cleanup old version
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
12
13 media-plugins/kodi-inputstream-adaptive/Manifest | 1 -
14 .../files/kodi-inputstream-adaptive-2.6.11.patch | 27 ----------
15 .../kodi-inputstream-adaptive-2.6.13.ebuild | 57 ----------------------
16 3 files changed, 85 deletions(-)
17
18 diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
19 index 8198ed8a839..9355c6d7733 100644
20 --- a/media-plugins/kodi-inputstream-adaptive/Manifest
21 +++ b/media-plugins/kodi-inputstream-adaptive/Manifest
22 @@ -1,2 +1 @@
23 -DIST kodi-inputstream-adaptive-2.6.13.tar.gz 747887 BLAKE2B 8e881e971beece1326b9c8ef7d1864e015ea0df997c4753801b422d93536025ce7b47e542ea5991506ea4ac931cf1cbd2ac2a2316c4c86a77b0ecb2a22592110 SHA512 9e13657a5cc267ee86b761fa4280cf77f584a0cf0c8ea69cb75a238f80963ffcd6cf8403064bd375e851f16c53c1948be04175f52e974574d311113db4d4237b
24 DIST kodi-inputstream-adaptive-2.6.14.tar.gz 750124 BLAKE2B 0a00ed8ef5351877077a85b1952464223bfeed688ac28015222a3f415128c2a46e0927be2970ef01c8215ca471c7a91a24cfbbe3d202cefd106768be8d6af33a SHA512 469e685f0b00739de4e609c6f5bc099f4079fccb629221fa12d17da641a4daddc9ad1ea1a268d1bb3a1efb4704366b2a938e51749cc57d6188d5e7628a79d010
25
26 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
27 deleted file mode 100644
28 index fe32b54c6ee..00000000000
29 --- a/media-plugins/kodi-inputstream-adaptive/files/kodi-inputstream-adaptive-2.6.11.patch
30 +++ /dev/null
31 @@ -1,27 +0,0 @@
32 -https://github.com/xbmc/inputstream.adaptive/pull/637
33 -
34 -From 3c321bf5e0882b9592b485a551cfc83647727350 Mon Sep 17 00:00:00 2001
35 -From: Craig Andrews <candrews@××××××××××××.com>
36 -Date: Fri, 9 Apr 2021 16:25:31 -0400
37 -Subject: [PATCH] Only enable testing if BUILD_TESTING is set
38 -
39 -BUILD_TESTING is the convention for enabling test building.
40 -
41 -This condition allows building without gtest.
42 ----
43 - CMakeLists.txt | 2 +-
44 - 1 file changed, 1 insertion(+), 1 deletion(-)
45 -
46 -diff --git a/CMakeLists.txt b/CMakeLists.txt
47 -index 2000e27a..42f15563 100644
48 ---- a/CMakeLists.txt
49 -+++ b/CMakeLists.txt
50 -@@ -100,7 +100,7 @@ build_addon(inputstream.adaptive ADP DEPLIBS)
51 -
52 - include(CPack)
53 -
54 --if(NOT CMAKE_CROSSCOMPILING)
55 -+if(NOT CMAKE_CROSSCOMPILING AND BUILD_TESTING)
56 - list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure")
57 - enable_testing()
58 - include(FindGtest)
59
60 diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.13.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.13.ebuild
61 deleted file mode 100644
62 index ab6bd91fcab..00000000000
63 --- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.13.ebuild
64 +++ /dev/null
65 @@ -1,57 +0,0 @@
66 -# Copyright 1999-2021 Gentoo Authors
67 -# Distributed under the terms of the GNU General Public License v2
68 -
69 -EAPI=7
70 -
71 -inherit cmake kodi-addon
72 -
73 -DESCRIPTION="Kodi's Adaptive inputstream addon"
74 -HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
75 -SRC_URI=""
76 -PATCHES=(
77 - "${FILESDIR}/${PN}-2.6.11.patch"
78 -)
79 -
80 -case ${PV} in
81 -9999)
82 - SRC_URI=""
83 - EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
84 - EGIT_BRANCH="Matrix"
85 - inherit git-r3
86 - ;;
87 -*)
88 - KEYWORDS="~amd64 ~x86"
89 - CODENAME="Matrix"
90 - SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
91 - S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
92 - ;;
93 -esac
94 -
95 -LICENSE="GPL-2"
96 -SLOT="0"
97 -RESTRICT="!test? ( test )"
98 -IUSE="test"
99 -
100 -COMMON_DEPEND="
101 - dev-libs/expat
102 - =media-tv/kodi-19*
103 - "
104 -DEPEND="
105 - ${COMMON_DEPEND}
106 - test? ( dev-cpp/gtest )
107 - "
108 -RDEPEND="
109 - ${COMMON_DEPEND}
110 - "
111 -
112 -src_prepare() {
113 - [ -d depends ] && rm -rf depends || die
114 - cmake_src_prepare
115 -}
116 -
117 -src_configure() {
118 - local mycmakeargs=(
119 - -DBUILD_TESTING=$(usex test)
120 - )
121 - cmake_src_configure
122 -}