commit: 99380603e8cb5ff015392163ea23e78a87b6e04f Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Tue Oct 9 18:21:07 2018 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Oct 9 20:50:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99380603
media-tv/kodi: Consistency of mysql/mariadb use flags, fix mariadb Bug: https://bugs.gentoo.org/667918 Closes: https://bugs.gentoo.org/667750 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11 .../kodi/{kodi-17.6.ebuild => kodi-17.6-r6.ebuild} | 27 +++++++++++----------- media-tv/kodi/kodi-17.6.ebuild | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6-r6.ebuild similarity index 94% copy from media-tv/kodi/kodi-17.6.ebuild copy to media-tv/kodi/kodi-17.6-r6.ebuild index 29aa1545725..6b505c1116f 100644 --- a/media-tv/kodi/kodi-17.6.ebuild +++ b/media-tv/kodi/kodi-17.6-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,6 +15,9 @@ LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" FFMPEG_VERSION="3.1.11" FFMPEG_KODI_VERSION="17.5" CODENAME="Krypton" +PATCHES=( + "${FILESDIR}/${P}-nmblookup.patch" +) SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz @@ -28,12 +31,11 @@ SLOT="0" # use flag is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. -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" +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" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( gles opengl ) - gles? ( X ) - opengl? ( X ) + ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) @@ -63,7 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS} gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) - media-fonts/corefonts + virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig @@ -75,7 +77,10 @@ COMMON_DEPEND="${PYTHON_DEPS} >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) - mysql? ( virtual/mysql ) + mysql? ( + !mariadb? ( dev-db/mysql-connector-c:= ) + mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) + ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) @@ -86,18 +91,12 @@ COMMON_DEPEND="${PYTHON_DEPS} sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) - vaapi? ( x11-libs/libva[opengl] ) + vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) - X? ( - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXrender - ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) " @@ -239,7 +238,7 @@ src_configure() { -DENABLE_UPNP=$(usex upnp) -DENABLE_VAAPI=$(usex vaapi) -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_X11=$(usex X) + -DENABLE_X11=ON -DENABLE_XSLT=$(usex xslt) -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6.ebuild index 29aa1545725..ed06b92fcf6 100644 --- a/media-tv/kodi/kodi-17.6.ebuild +++ b/media-tv/kodi/kodi-17.6.ebuild @@ -224,7 +224,7 @@ src_configure() { -DENABLE_LCMS2=$(usex lcms) -DENABLE_LIRC=$(usex lirc) -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) + -DENABLE_MYSQLCLIENT=$(usex mysql "yes" $(usex mariadb)) -DENABLE_NFS=$(usex nfs) -DENABLE_NONFREE=$(usex nonfree) -DENABLE_OPENGLES=$(usex gles)
