| 1 |
commit: 99380603e8cb5ff015392163ea23e78a87b6e04f |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 9 18:21:07 2018 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 9 20:50:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99380603 |
| 7 |
|
| 8 |
media-tv/kodi: Consistency of mysql/mariadb use flags, fix mariadb |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/667918 |
| 11 |
Closes: https://bugs.gentoo.org/667750 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 14 |
|
| 15 |
.../kodi/{kodi-17.6.ebuild => kodi-17.6-r6.ebuild} | 27 +++++++++++----------- |
| 16 |
media-tv/kodi/kodi-17.6.ebuild | 2 +- |
| 17 |
2 files changed, 14 insertions(+), 15 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6-r6.ebuild |
| 20 |
similarity index 94% |
| 21 |
copy from media-tv/kodi/kodi-17.6.ebuild |
| 22 |
copy to media-tv/kodi/kodi-17.6-r6.ebuild |
| 23 |
index 29aa1545725..6b505c1116f 100644 |
| 24 |
--- a/media-tv/kodi/kodi-17.6.ebuild |
| 25 |
+++ b/media-tv/kodi/kodi-17.6-r6.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2018 Gentoo Foundation |
| 28 |
+# Copyright 1999-2018 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
@@ -15,6 +15,9 @@ LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" |
| 33 |
FFMPEG_VERSION="3.1.11" |
| 34 |
FFMPEG_KODI_VERSION="17.5" |
| 35 |
CODENAME="Krypton" |
| 36 |
+PATCHES=( |
| 37 |
+ "${FILESDIR}/${P}-nmblookup.patch" |
| 38 |
+) |
| 39 |
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz |
| 40 |
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz |
| 41 |
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz |
| 42 |
@@ -28,12 +31,11 @@ SLOT="0" |
| 43 |
# use flag is called libusb so that it doesn't fool people in thinking that |
| 44 |
# it is _required_ for USB support. Otherwise they'll disable udev and |
| 45 |
# that's going to be worse. |
| 46 |
-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" |
| 47 |
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf" |
| 48 |
REQUIRED_USE=" |
| 49 |
${PYTHON_REQUIRED_USE} |
| 50 |
|| ( gles opengl ) |
| 51 |
- gles? ( X ) |
| 52 |
- opengl? ( X ) |
| 53 |
+ ?? ( mariadb mysql ) |
| 54 |
udev? ( !libusb ) |
| 55 |
udisks? ( dbus ) |
| 56 |
upower? ( dbus ) |
| 57 |
@@ -63,7 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 58 |
gles? ( media-libs/mesa[gles2] ) |
| 59 |
lcms? ( media-libs/lcms:2 ) |
| 60 |
libusb? ( virtual/libusb:1 ) |
| 61 |
- media-fonts/corefonts |
| 62 |
+ virtual/ttf-fonts |
| 63 |
>=media-fonts/noto-20160531 |
| 64 |
media-fonts/roboto |
| 65 |
media-libs/fontconfig |
| 66 |
@@ -75,7 +77,10 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 67 |
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] |
| 68 |
<media-video/ffmpeg-3.4 |
| 69 |
) |
| 70 |
- mysql? ( virtual/mysql ) |
| 71 |
+ mysql? ( |
| 72 |
+ !mariadb? ( dev-db/mysql-connector-c:= ) |
| 73 |
+ mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) |
| 74 |
+ ) |
| 75 |
>=net-misc/curl-7.51.0 |
| 76 |
nfs? ( net-fs/libnfs:= ) |
| 77 |
opengl? ( media-libs/glu ) |
| 78 |
@@ -86,18 +91,12 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 79 |
sftp? ( net-libs/libssh[sftp] ) |
| 80 |
sys-libs/zlib |
| 81 |
udev? ( virtual/udev ) |
| 82 |
- vaapi? ( x11-libs/libva[opengl] ) |
| 83 |
+ vaapi? ( x11-libs/libva:=[opengl] ) |
| 84 |
vdpau? ( |
| 85 |
|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) |
| 86 |
system-ffmpeg? ( media-video/ffmpeg[vdpau] ) |
| 87 |
) |
| 88 |
webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) |
| 89 |
- X? ( |
| 90 |
- x11-libs/libdrm |
| 91 |
- x11-libs/libX11 |
| 92 |
- x11-libs/libXrandr |
| 93 |
- x11-libs/libXrender |
| 94 |
- ) |
| 95 |
xslt? ( dev-libs/libxslt ) |
| 96 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 97 |
" |
| 98 |
@@ -239,7 +238,7 @@ src_configure() { |
| 99 |
-DENABLE_UPNP=$(usex upnp) |
| 100 |
-DENABLE_VAAPI=$(usex vaapi) |
| 101 |
-DENABLE_VDPAU=$(usex vdpau) |
| 102 |
- -DENABLE_X11=$(usex X) |
| 103 |
+ -DENABLE_X11=ON |
| 104 |
-DENABLE_XSLT=$(usex xslt) |
| 105 |
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" |
| 106 |
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" |
| 107 |
|
| 108 |
diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6.ebuild |
| 109 |
index 29aa1545725..ed06b92fcf6 100644 |
| 110 |
--- a/media-tv/kodi/kodi-17.6.ebuild |
| 111 |
+++ b/media-tv/kodi/kodi-17.6.ebuild |
| 112 |
@@ -224,7 +224,7 @@ src_configure() { |
| 113 |
-DENABLE_LCMS2=$(usex lcms) |
| 114 |
-DENABLE_LIRC=$(usex lirc) |
| 115 |
-DENABLE_MICROHTTPD=$(usex webserver) |
| 116 |
- -DENABLE_MYSQLCLIENT=$(usex mysql) |
| 117 |
+ -DENABLE_MYSQLCLIENT=$(usex mysql "yes" $(usex mariadb)) |
| 118 |
-DENABLE_NFS=$(usex nfs) |
| 119 |
-DENABLE_NONFREE=$(usex nonfree) |
| 120 |
-DENABLE_OPENGLES=$(usex gles) |
Archives