commit: bb15a3498d636c680adec522a99a9478c71cb717 Author: Craig Andrews <candrews <AT> integralblue <DOT> com> AuthorDate: Mon Apr 24 01:54:26 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Apr 24 09:11:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb15a349
media-tv/kodi: Fix system-ffmpeg use flag issues -17.0 and -9999: USE="-system-ffmpeg vdpau" don't depend on media-video/ffmpeg -17.1: add system-ffmpeg use flag Gentoo-bug: 615562 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4487 media-tv/kodi/{kodi-17.0-r1.ebuild => kodi-17.0-r2.ebuild} | 2 +- media-tv/kodi/{kodi-17.1.ebuild => kodi-17.1-r1.ebuild} | 14 +++++++++----- media-tv/kodi/kodi-9999.ebuild | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/media-tv/kodi/kodi-17.0-r1.ebuild b/media-tv/kodi/kodi-17.0-r2.ebuild similarity index 99% rename from media-tv/kodi/kodi-17.0-r1.ebuild rename to media-tv/kodi/kodi-17.0-r2.ebuild index fc30ffd9985..70e8400d916 100644 --- a/media-tv/kodi/kodi-17.0-r1.ebuild +++ b/media-tv/kodi/kodi-17.0-r2.ebuild @@ -84,7 +84,7 @@ COMMON_DEPEND="${PYTHON_DEPS} vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] + system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( diff --git a/media-tv/kodi/kodi-17.1.ebuild b/media-tv/kodi/kodi-17.1-r1.ebuild similarity index 92% rename from media-tv/kodi/kodi-17.1.ebuild rename to media-tv/kodi/kodi-17.1-r1.ebuild index ba60df09df9..70e8400d916 100644 --- a/media-tv/kodi/kodi-17.1.ebuild +++ b/media-tv/kodi/kodi-17.1-r1.ebuild @@ -12,10 +12,12 @@ inherit eutils linux-info python-single-r1 cmake-utils autotools LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" +FFMPEG_VERSION="3.1.6" CODENAME="Krypton" 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" + https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz + !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )" DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"; @@ -25,7 +27,7 @@ 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 libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf" +IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( gles opengl ) @@ -65,7 +67,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 - >=media-video/ffmpeg-3.1.6:=[encode,postproc] + system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) @@ -82,7 +84,7 @@ COMMON_DEPEND="${PYTHON_DEPS} vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] + system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( @@ -213,7 +215,7 @@ src_configure() { -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) -DENABLE_INTERNAL_CROSSGUID=OFF - -DENABLE_INTERNAL_FFMPEG=OFF + -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" -DENABLE_CAP=$(usex caps) -DENABLE_LIRC=$(usex lirc) -DENABLE_MICROHTTPD=$(usex webserver) @@ -241,6 +243,8 @@ src_configure() { use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" ) + cmake-utils_src_configure } diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 230dd7cc2e5..835b69ec7fd 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -84,7 +84,7 @@ COMMON_DEPEND="${PYTHON_DEPS} vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] + system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? (
