1 |
commit: 641da83111dd43cc49cc9d909a7738a6e6596fd2 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 23 19:27:34 2016 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 23 19:31:15 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641da831 |
7 |
|
8 |
media-tv/kodi: sync live ebuild with latest upstream changes |
9 |
|
10 |
media-tv/kodi/kodi-9999.ebuild | 43 +++++++++--------------------------------- |
11 |
1 file changed, 9 insertions(+), 34 deletions(-) |
12 |
|
13 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild |
14 |
index ae769d2..dd81a8d 100644 |
15 |
--- a/media-tv/kodi/kodi-9999.ebuild |
16 |
+++ b/media-tv/kodi/kodi-9999.ebuild |
17 |
@@ -1,17 +1,16 @@ |
18 |
-# Copyright 1999-2015 Gentoo Foundation |
19 |
+# Copyright 1999-2016 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
# $Id$ |
22 |
|
23 |
EAPI="5" |
24 |
|
25 |
# Does not work with py3 here |
26 |
-# It might work with py:2.5 but I didn't test that |
27 |
PYTHON_COMPAT=( python2_7 ) |
28 |
PYTHON_REQ_USE="sqlite" |
29 |
|
30 |
inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs |
31 |
|
32 |
-CODENAME="Isengard" |
33 |
+CODENAME="Krypton" |
34 |
case ${PV} in |
35 |
9999) |
36 |
EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" |
37 |
@@ -34,9 +33,8 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/" |
38 |
|
39 |
LICENSE="GPL-2" |
40 |
SLOT="0" |
41 |
-IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X" |
42 |
+IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X" |
43 |
REQUIRED_USE=" |
44 |
- rsxs? ( X ) |
45 |
udisks? ( dbus ) |
46 |
upower? ( dbus ) |
47 |
" |
48 |
@@ -47,7 +45,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
49 |
app-arch/zip |
50 |
app-i18n/enca |
51 |
airplay? ( app-pda/libplist ) |
52 |
- dev-libs/boost |
53 |
dev-libs/expat |
54 |
dev-libs/fribidi |
55 |
dev-libs/libcdio[-minimal] |
56 |
@@ -65,22 +62,19 @@ COMMON_DEPEND="${PYTHON_DEPS} |
57 |
media-libs/flac |
58 |
media-libs/fontconfig |
59 |
media-libs/freetype |
60 |
- media-libs/jasper |
61 |
media-libs/jbigkit |
62 |
>=media-libs/libass-0.9.7 |
63 |
bluray? ( >=media-libs/libbluray-0.7.0 ) |
64 |
css? ( media-libs/libdvdcss ) |
65 |
media-libs/libmad |
66 |
media-libs/libmodplug |
67 |
- media-libs/libmpeg2 |
68 |
media-libs/libogg |
69 |
media-libs/libpng:0= |
70 |
- projectm? ( media-libs/libprojectm ) |
71 |
media-libs/libsamplerate |
72 |
joystick? ( media-libs/libsdl2 ) |
73 |
>=media-libs/taglib-1.8 |
74 |
media-libs/libvorbis |
75 |
- media-libs/tiff:0= |
76 |
+ media-sound/dcadec |
77 |
pulseaudio? ( media-sound/pulseaudio ) |
78 |
media-sound/wavpack |
79 |
>=media-video/ffmpeg-2.6:=[encode] |
80 |
@@ -95,13 +89,11 @@ COMMON_DEPEND="${PYTHON_DEPS} |
81 |
dbus? ( sys-apps/dbus ) |
82 |
caps? ( sys-libs/libcap ) |
83 |
sys-libs/zlib |
84 |
- virtual/jpeg:0= |
85 |
usb? ( virtual/libusb:1 ) |
86 |
mysql? ( virtual/mysql ) |
87 |
opengl? ( |
88 |
virtual/glu |
89 |
virtual/opengl |
90 |
- >=media-libs/glew-1.5.6 |
91 |
) |
92 |
gles? ( |
93 |
media-libs/mesa[gles2] |
94 |
@@ -132,7 +124,8 @@ DEPEND="${COMMON_DEPEND} |
95 |
dev-util/cmake |
96 |
x86? ( dev-lang/nasm ) |
97 |
java? ( virtual/jre ) |
98 |
- test? ( dev-cpp/gtest )" |
99 |
+ test? ( dev-cpp/gtest ) |
100 |
+ virtual/pkgconfig" |
101 |
# Force java for latest git version to avoid having to hand maintain the |
102 |
# generated addons package. #488118 |
103 |
[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" |
104 |
@@ -218,29 +211,23 @@ src_configure() { |
105 |
$(use_enable css dvdcss) \ |
106 |
$(use_enable dbus) \ |
107 |
$(use_enable debug) \ |
108 |
- $(use_enable fishbmc) \ |
109 |
$(use_enable gles) \ |
110 |
- $(use_enable goom) \ |
111 |
$(use_enable joystick) \ |
112 |
$(use_enable midi mid) \ |
113 |
$(use_enable mysql) \ |
114 |
$(use_enable nfs) \ |
115 |
$(use_enable opengl gl) \ |
116 |
$(use_enable profile profiling) \ |
117 |
- $(use_enable projectm) \ |
118 |
$(use_enable pulseaudio pulse) \ |
119 |
- $(use_enable rsxs) \ |
120 |
$(use_enable rtmp) \ |
121 |
$(use_enable samba) \ |
122 |
$(use_enable sftp ssh) \ |
123 |
- $(use_enable spectrum) \ |
124 |
$(use_enable usb libusb) \ |
125 |
$(use_enable test gtest) \ |
126 |
$(use_enable texturepacker) \ |
127 |
$(use_enable upnp) \ |
128 |
$(use_enable vaapi) \ |
129 |
$(use_enable vdpau) \ |
130 |
- $(use_enable waveform) \ |
131 |
$(use_enable webserver) \ |
132 |
$(use_enable X x11) |
133 |
} |
134 |
@@ -251,30 +238,18 @@ src_compile() { |
135 |
|
136 |
src_install() { |
137 |
default |
138 |
- rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* |
139 |
+ rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die |
140 |
|
141 |
domenu tools/Linux/kodi.desktop |
142 |
newicon media/icon48x48.png kodi.png |
143 |
|
144 |
- # Remove optional addons (platform specific). |
145 |
- local disabled_addons=( |
146 |
- repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org |
147 |
- visualization.dxspectrum |
148 |
- visualization.vortex |
149 |
- ) |
150 |
- rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}" |
151 |
- |
152 |
# Remove fonconfig settings that are used only on MacOSX. |
153 |
# Can't be patched upstream because they just find all files and install |
154 |
# them into same structure like they have in git. |
155 |
rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc |
156 |
|
157 |
- # Replace bundled fonts with system ones |
158 |
- # teletext.ttf: unknown |
159 |
- # bold-caps.ttf: unknown |
160 |
- # roboto: roboto-bold, roboto-regular |
161 |
- # arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514 |
162 |
- rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* |
163 |
+ # Replace bundled fonts with system ones. |
164 |
+ rm "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die |
165 |
dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ |
166 |
/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf |
167 |
dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ |