1 |
commit: cd9b7029677f349145e3834c154245a45ac6a598 |
2 |
Author: Craig Andrews <candrews <AT> integralblue <DOT> com> |
3 |
AuthorDate: Thu May 25 12:31:45 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 31 06:39:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9b7029 |
7 |
|
8 |
media-tv/kodi: 17.3 version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/4758 |
12 |
|
13 |
media-tv/kodi/Manifest | 2 ++ |
14 |
media-tv/kodi/{kodi-9999.ebuild => kodi-17.3.ebuild} | 20 ++++++++++---------- |
15 |
media-tv/kodi/kodi-9999.ebuild | 13 ++++++------- |
16 |
3 files changed, 18 insertions(+), 17 deletions(-) |
17 |
|
18 |
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest |
19 |
index db4abe5c73a..350d870f4b7 100644 |
20 |
--- a/media-tv/kodi/Manifest |
21 |
+++ b/media-tv/kodi/Manifest |
22 |
@@ -8,6 +8,8 @@ DIST kodi-17.1-generated-addons.tar.xz 57560 SHA256 a92a8222444a123e4876e835238c |
23 |
DIST kodi-17.1.tar.gz 58457875 SHA256 303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee SHA512 5093fe7dcdf22e2604ea93696c909028c00a8b0c858e7b25f55dade6c3423b4a68f5a49a8a0dd5238b10f4a7dd5e815a82251949ce7adb8a8f8cf5d58fc7bd41 WHIRLPOOL a2f3ce757383b1e3ac40c91574a873cf23c3f10e944e5d74228a0bec287f919bcd0b1251d89c6dd33eea847a34a4149e26e8d464169538601ff9be0f817539c6 |
24 |
DIST kodi-17.2-generated-addons.tar.xz 57556 SHA256 c04c610fec8345ed383afccdb0e9eb04d6327682169dd236ca36291e866f2cab SHA512 46a41f1eb45a7d2680e0c07e71073c929881a324c91d2fea0871aa31cba00296fe0b835481411a213921c7813ac75b629ff3e9d941f5ca0ad72c0d1dcf861a21 WHIRLPOOL 45372116099402dae63a51117d93f08852416ff7cad4ecf7a969a1a70d42460e9681338bf69803291774a0e6d130166e5136f0692d086eded1d7b69e527db872 |
25 |
DIST kodi-17.2.tar.gz 58465212 SHA256 aed9236c5a0074a4dfc775c111d362e4358daa0030d7e8ba38fbb6d58ae1affe SHA512 79aaaaaab21dac1831f5da4f0f773a0ab7e997347a423ee42d19ba511523d21c5a16f2c924502bd8dd9000827f50e87361a0440503a6278463cddf30170ba980 WHIRLPOOL 345e2bdf58c99f4134a4010a5f9afb9d206aeaebe60cc54b30632957f416a7408f140319ff6b2558951d3a22e049d7900ec9f63064d0e90a045f5bb9d50e91d9 |
26 |
+DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8e2bb3e516daa4707d7ccf768d76a89b27bd1 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a WHIRLPOOL 1023c69687ac9958e72ab70c15a280800ea4866f8e0dc2740d9bfd50f75bef71c28f23f01a841f254022610e1388d14217ea384213161264dae721515c9dabe3 |
27 |
+DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634 |
28 |
DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a |
29 |
DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca |
30 |
DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a |
31 |
|
32 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-17.3.ebuild |
33 |
similarity index 95% |
34 |
copy from media-tv/kodi/kodi-9999.ebuild |
35 |
copy to media-tv/kodi/kodi-17.3.ebuild |
36 |
index 0e7f4c90da4..79f5cd9cc32 100644 |
37 |
--- a/media-tv/kodi/kodi-9999.ebuild |
38 |
+++ b/media-tv/kodi/kodi-17.3.ebuild |
39 |
@@ -7,7 +7,7 @@ EAPI=6 |
40 |
PYTHON_COMPAT=( python2_7 ) |
41 |
PYTHON_REQ_USE="sqlite" |
42 |
|
43 |
-inherit eutils linux-info python-single-r1 cmake-utils autotools |
44 |
+inherit autotools cmake-utils eutils linux-info python-single-r1 |
45 |
|
46 |
LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" |
47 |
LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" |
48 |
@@ -56,9 +56,9 @@ COMMON_DEPEND="${PYTHON_DEPS} |
49 |
dev-libs/libxml2 |
50 |
>=dev-libs/lzo-2.04 |
51 |
dev-libs/tinyxml[stl] |
52 |
+ >=dev-libs/yajl-2 |
53 |
dev-python/pillow[${PYTHON_USEDEP}] |
54 |
dev-libs/libcdio |
55 |
- dev-libs/libfmt |
56 |
gles? ( media-libs/mesa[gles2] ) |
57 |
libusb? ( virtual/libusb:1 ) |
58 |
media-fonts/corefonts |
59 |
@@ -116,7 +116,6 @@ DEPEND="${COMMON_DEPEND} |
60 |
app-arch/zip |
61 |
dev-lang/swig |
62 |
dev-libs/crossguid |
63 |
- dev-libs/rapidjson |
64 |
dev-util/cmake |
65 |
dev-util/gperf |
66 |
media-libs/giflib |
67 |
@@ -160,6 +159,8 @@ In some cases Kodi needs to access multicast addresses. |
68 |
Please consider enabling IP_MULTICAST under Networking options. |
69 |
" |
70 |
|
71 |
+CMAKE_USE_DIR=${S}/project/cmake/ |
72 |
+ |
73 |
pkg_setup() { |
74 |
check_extra_config |
75 |
python-single-r1_pkg_setup |
76 |
@@ -193,14 +194,13 @@ src_prepare() { |
77 |
|
78 |
# Prevent autoreconf rerun |
79 |
sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ |
80 |
- "${S}"/cmake/modules/FindCpluff.cmake \ |
81 |
+ "${S}"/project/cmake/modules/FindCpluff.cmake \ |
82 |
"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ |
83 |
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh |
84 |
+ "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ |
85 |
+ || die |
86 |
} |
87 |
|
88 |
src_configure() { |
89 |
- local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) |
90 |
- |
91 |
local mycmakeargs=( |
92 |
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}" |
93 |
-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 |
94 |
@@ -259,18 +259,18 @@ src_install() { |
95 |
|
96 |
# Replace bundled fonts with system ones. |
97 |
rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die |
98 |
- dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ |
99 |
+ dosym ../../../../fonts/noto/NotoSans-Regular.ttf \ |
100 |
usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf |
101 |
|
102 |
local f |
103 |
for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do |
104 |
rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die |
105 |
- dosym /usr/share/fonts/noto/"${f}" \ |
106 |
+ dosym ../../../../fonts/noto/"${f}" \ |
107 |
usr/share/kodi/addons/skin.estuary/fonts/"${f}" |
108 |
done |
109 |
|
110 |
rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die |
111 |
- dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \ |
112 |
+ dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ |
113 |
usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf |
114 |
|
115 |
python_domodule tools/EventClients/lib/python/xbmcclient.py |
116 |
|
117 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild |
118 |
index 0e7f4c90da4..c949c30b7f7 100644 |
119 |
--- a/media-tv/kodi/kodi-9999.ebuild |
120 |
+++ b/media-tv/kodi/kodi-9999.ebuild |
121 |
@@ -7,7 +7,7 @@ EAPI=6 |
122 |
PYTHON_COMPAT=( python2_7 ) |
123 |
PYTHON_REQ_USE="sqlite" |
124 |
|
125 |
-inherit eutils linux-info python-single-r1 cmake-utils autotools |
126 |
+inherit autotools cmake-utils eutils linux-info python-single-r1 |
127 |
|
128 |
LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" |
129 |
LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" |
130 |
@@ -195,12 +195,11 @@ src_prepare() { |
131 |
sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ |
132 |
"${S}"/cmake/modules/FindCpluff.cmake \ |
133 |
"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ |
134 |
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh |
135 |
+ "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ |
136 |
+ || die |
137 |
} |
138 |
|
139 |
src_configure() { |
140 |
- local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) |
141 |
- |
142 |
local mycmakeargs=( |
143 |
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}" |
144 |
-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 |
145 |
@@ -259,18 +258,18 @@ src_install() { |
146 |
|
147 |
# Replace bundled fonts with system ones. |
148 |
rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die |
149 |
- dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ |
150 |
+ dosym ../../../../fonts/noto/NotoSans-Regular.ttf \ |
151 |
usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf |
152 |
|
153 |
local f |
154 |
for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do |
155 |
rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die |
156 |
- dosym /usr/share/fonts/noto/"${f}" \ |
157 |
+ dosym ../../../../fonts/noto/"${f}" \ |
158 |
usr/share/kodi/addons/skin.estuary/fonts/"${f}" |
159 |
done |
160 |
|
161 |
rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die |
162 |
- dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \ |
163 |
+ dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ |
164 |
usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf |
165 |
|
166 |
python_domodule tools/EventClients/lib/python/xbmcclient.py |