1 |
commit: 31e83f1b370f09db278bb124bb22ee30e29f61ab |
2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 29 19:16:45 2017 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 29 20:14:53 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e83f1b |
7 |
|
8 |
media-tv/kodi: Depend on virtual/ttf-fonts instead of media-fonts/corefonts |
9 |
|
10 |
Closes: https://bugs.gentoo.org/609964 |
11 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
12 |
|
13 |
.../kodi/{kodi-9999.ebuild => kodi-17.6-r1.ebuild} | 93 ++++++++-------------- |
14 |
media-tv/kodi/kodi-9999.ebuild | 2 +- |
15 |
2 files changed, 35 insertions(+), 60 deletions(-) |
16 |
|
17 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-17.6-r1.ebuild |
18 |
similarity index 81% |
19 |
copy from media-tv/kodi/kodi-9999.ebuild |
20 |
copy to media-tv/kodi/kodi-17.6-r1.ebuild |
21 |
index 23d7ab8f7f6..4d0f122c12c 100644 |
22 |
--- a/media-tv/kodi/kodi-9999.ebuild |
23 |
+++ b/media-tv/kodi/kodi-17.6-r1.ebuild |
24 |
@@ -7,14 +7,14 @@ EAPI=6 |
25 |
PYTHON_COMPAT=( python2_7 ) |
26 |
PYTHON_REQ_USE="sqlite" |
27 |
|
28 |
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 |
29 |
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator |
30 |
|
31 |
LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" |
32 |
LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" |
33 |
LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" |
34 |
-FFMPEG_VERSION="3.4" |
35 |
-CODENAME="Leia" |
36 |
-FFMPEG_KODI_VERSION="Alpha-1" |
37 |
+FFMPEG_VERSION="3.1.11" |
38 |
+FFMPEG_KODI_VERSION="17.5" |
39 |
+CODENAME="Krypton" |
40 |
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz |
41 |
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz |
42 |
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz |
43 |
@@ -28,12 +28,12 @@ SLOT="0" |
44 |
# use flag is called libusb so that it doesn't fool people in thinking that |
45 |
# it is _required_ for USB support. Otherwise they'll disable udev and |
46 |
# that's going to be worse. |
47 |
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
48 |
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf" |
49 |
REQUIRED_USE=" |
50 |
${PYTHON_REQUIRED_USE} |
51 |
- gbm? ( gles ) |
52 |
|| ( gles opengl ) |
53 |
- ^^ ( gbm wayland X ) |
54 |
+ gles? ( X ) |
55 |
+ opengl? ( X ) |
56 |
udev? ( !libusb ) |
57 |
udisks? ( dbus ) |
58 |
upower? ( dbus ) |
59 |
@@ -41,76 +41,63 @@ REQUIRED_USE=" |
60 |
|
61 |
COMMON_DEPEND="${PYTHON_DEPS} |
62 |
airplay? ( |
63 |
- >=app-pda/libplist-2.0.0[python,${PYTHON_USEDEP}] |
64 |
+ app-pda/libplist |
65 |
net-libs/shairplay |
66 |
) |
67 |
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) |
68 |
+ alsa? ( media-libs/alsa-lib ) |
69 |
bluetooth? ( net-wireless/bluez ) |
70 |
- bluray? ( >=media-libs/libbluray-1.0.1 ) |
71 |
+ bluray? ( >=media-libs/libbluray-0.7.0 ) |
72 |
caps? ( sys-libs/libcap ) |
73 |
dbus? ( sys-apps/dbus ) |
74 |
dev-db/sqlite |
75 |
dev-libs/expat |
76 |
- >=dev-libs/fribidi-0.19.7 |
77 |
+ dev-libs/fribidi |
78 |
cec? ( >=dev-libs/libcec-4.0 ) |
79 |
dev-libs/libpcre[cxx] |
80 |
- >=dev-libs/libxml2-2.9.4 |
81 |
+ dev-libs/libxml2 |
82 |
>=dev-libs/lzo-2.04 |
83 |
dev-libs/tinyxml[stl] |
84 |
+ >=dev-libs/yajl-2 |
85 |
dev-python/pillow[${PYTHON_USEDEP}] |
86 |
- >=dev-libs/libcdio-0.94 |
87 |
- dev-libs/libfmt |
88 |
- gbm? ( media-libs/mesa[gbm] ) |
89 |
+ dev-libs/libcdio |
90 |
gles? ( media-libs/mesa[gles2] ) |
91 |
lcms? ( media-libs/lcms:2 ) |
92 |
libusb? ( virtual/libusb:1 ) |
93 |
- media-fonts/corefonts |
94 |
+ virtual/ttf-fonts |
95 |
>=media-fonts/noto-20160531 |
96 |
media-fonts/roboto |
97 |
- >=media-libs/fontconfig-2.12.4 |
98 |
- >=media-libs/freetype-2.8 |
99 |
+ media-libs/fontconfig |
100 |
+ media-libs/freetype |
101 |
>=media-libs/libass-0.13.4 |
102 |
media-libs/mesa[egl] |
103 |
>=media-libs/taglib-1.11.1 |
104 |
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] ) |
105 |
+ system-ffmpeg? ( |
106 |
+ >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] |
107 |
+ <media-video/ffmpeg-3.4 |
108 |
+ ) |
109 |
mysql? ( virtual/mysql ) |
110 |
- >=net-misc/curl-7.56.1 |
111 |
+ >=net-misc/curl-7.51.0 |
112 |
nfs? ( net-fs/libnfs:= ) |
113 |
opengl? ( media-libs/glu ) |
114 |
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) |
115 |
+ !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) |
116 |
libressl? ( dev-libs/libressl:0= ) |
117 |
pulseaudio? ( media-sound/pulseaudio ) |
118 |
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) |
119 |
sftp? ( net-libs/libssh[sftp] ) |
120 |
- >=sys-libs/zlib-1.2.11 |
121 |
+ sys-libs/zlib |
122 |
udev? ( virtual/udev ) |
123 |
- vaapi? ( |
124 |
- x11-libs/libva[egl] |
125 |
- opengl? ( x11-libs/libva[opengl] ) |
126 |
- system-ffmpeg? ( media-video/ffmpeg[vaapi] ) |
127 |
- vdpau? ( x11-libs/libva[vdpau] ) |
128 |
- wayland? ( x11-libs/libva[wayland] ) |
129 |
- X? ( x11-libs/libva[X] ) |
130 |
- ) |
131 |
- virtual/libiconv |
132 |
+ vaapi? ( x11-libs/libva[opengl] ) |
133 |
vdpau? ( |
134 |
|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) |
135 |
system-ffmpeg? ( media-video/ffmpeg[vdpau] ) |
136 |
) |
137 |
- wayland? ( |
138 |
- >=dev-cpp/waylandpp-0.1.5 |
139 |
- media-libs/mesa[wayland] |
140 |
- >=dev-libs/wayland-protocols-1.7 |
141 |
- x11-libs/libxkbcommon |
142 |
- ) |
143 |
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) |
144 |
+ webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) |
145 |
X? ( |
146 |
+ x11-libs/libdrm |
147 |
x11-libs/libX11 |
148 |
x11-libs/libXrandr |
149 |
x11-libs/libXrender |
150 |
- system-ffmpeg? ( media-video/ffmpeg[X] ) |
151 |
) |
152 |
- x11-libs/libdrm |
153 |
xslt? ( dev-libs/libxslt ) |
154 |
zeroconf? ( net-dns/avahi[dbus] ) |
155 |
" |
156 |
@@ -129,10 +116,11 @@ RDEPEND="${COMMON_DEPEND} |
157 |
" |
158 |
DEPEND="${COMMON_DEPEND} |
159 |
app-arch/bzip2 |
160 |
+ app-arch/unzip |
161 |
app-arch/xz-utils |
162 |
+ app-arch/zip |
163 |
dev-lang/swig |
164 |
dev-libs/crossguid |
165 |
- dev-libs/rapidjson |
166 |
dev-util/cmake |
167 |
dev-util/gperf |
168 |
media-libs/giflib |
169 |
@@ -176,6 +164,8 @@ In some cases Kodi needs to access multicast addresses. |
170 |
Please consider enabling IP_MULTICAST under Networking options. |
171 |
" |
172 |
|
173 |
+CMAKE_USE_DIR=${S}/project/cmake/ |
174 |
+ |
175 |
pkg_setup() { |
176 |
check_extra_config |
177 |
python-single-r1_pkg_setup |
178 |
@@ -209,7 +199,7 @@ src_prepare() { |
179 |
|
180 |
# Prevent autoreconf rerun |
181 |
sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ |
182 |
- "${S}"/cmake/modules/FindCpluff.cmake \ |
183 |
+ "${S}"/project/cmake/modules/FindCpluff.cmake \ |
184 |
"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ |
185 |
"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ |
186 |
|| die |
187 |
@@ -236,6 +226,7 @@ src_configure() { |
188 |
-DENABLE_MICROHTTPD=$(usex webserver) |
189 |
-DENABLE_MYSQLCLIENT=$(usex mysql) |
190 |
-DENABLE_NFS=$(usex nfs) |
191 |
+ -DENABLE_NONFREE=$(usex nonfree) |
192 |
-DENABLE_OPENGLES=$(usex gles) |
193 |
-DENABLE_OPENGL=$(usex opengl) |
194 |
-DENABLE_OPENSSL=ON |
195 |
@@ -248,6 +239,7 @@ src_configure() { |
196 |
-DENABLE_UPNP=$(usex upnp) |
197 |
-DENABLE_VAAPI=$(usex vaapi) |
198 |
-DENABLE_VDPAU=$(usex vdpau) |
199 |
+ -DENABLE_X11=$(usex X) |
200 |
-DENABLE_XSLT=$(usex xslt) |
201 |
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" |
202 |
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" |
203 |
@@ -262,23 +254,6 @@ src_configure() { |
204 |
mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) |
205 |
fi |
206 |
|
207 |
- if use gbm; then |
208 |
- mycmakeargs+=( -DCORE_PLATFORM_NAME="gbm" ) |
209 |
- fi |
210 |
- |
211 |
- if use wayland; then |
212 |
- mycmakeargs+=( -DCORE_PLATFORM_NAME="wayland" ) |
213 |
- if use opengl; then |
214 |
- mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gl" ) |
215 |
- else |
216 |
- mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gles" ) |
217 |
- fi |
218 |
- fi |
219 |
- |
220 |
- if use X; then |
221 |
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" ) |
222 |
- fi |
223 |
- |
224 |
cmake-utils_src_configure |
225 |
} |
226 |
|
227 |
|
228 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild |
229 |
index 23d7ab8f7f6..3d4c6f42f1e 100644 |
230 |
--- a/media-tv/kodi/kodi-9999.ebuild |
231 |
+++ b/media-tv/kodi/kodi-9999.ebuild |
232 |
@@ -64,7 +64,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
233 |
gles? ( media-libs/mesa[gles2] ) |
234 |
lcms? ( media-libs/lcms:2 ) |
235 |
libusb? ( virtual/libusb:1 ) |
236 |
- media-fonts/corefonts |
237 |
+ virtual/ttf-fonts |
238 |
>=media-fonts/noto-20160531 |
239 |
media-fonts/roboto |
240 |
>=media-libs/fontconfig-2.12.4 |