commit: fae098b25feeea66a7c8953fcb669b695815a020
Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Wed Jul 19 19:52:17 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 18:11:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae098b2
media-tv/kodi: depend on media-video/ffmpeg[openssl] #625476
Closes:#5143
Gentoo-bug: 625476
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-tv/kodi/{kodi-9999.ebuild => kodi-17.3-r3.ebuild} | 17 ++++++++++++-----
media-tv/kodi/kodi-9999.ebuild | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-17.3-r3.ebuild
similarity index 94%
copy from media-tv/kodi/kodi-9999.ebuild
copy to media-tv/kodi/kodi-17.3-r3.ebuild
index b9748b0b818..006d5d9ab92 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-17.3-r3.ebuild
@@ -14,6 +14,11 @@ LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
FFMPEG_VERSION="3.1.6"
CODENAME="Krypton"
+PATCHES=(
+ "${FILESDIR}/${P}-ftpparse_string.patch"
+ "${FILESDIR}/${P}-unrar-vulnerability.patch"
+ "${FILESDIR}/${P}-10-bit-h265-hardware-decoding.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
@@ -27,7 +32,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 +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 libressl
libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd
+system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt
zeroconf"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( gles opengl )
@@ -56,9 +61,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/libxml2
>=dev-libs/lzo-2.04
dev-libs/tinyxml[stl]
+ >=dev-libs/yajl-2
dev-python/pillow[${PYTHON_USEDEP}]
dev-libs/libcdio
- dev-libs/libfmt
gles? ( media-libs/mesa[gles2] )
libusb? ( virtual/libusb:1 )
media-fonts/corefonts
@@ -69,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
>=media-libs/taglib-1.11.1
- system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
+ system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
mysql? ( virtual/mysql )
>=net-misc/curl-7.51.0
nfs? ( net-fs/libnfs:= )
@@ -116,7 +121,6 @@ DEPEND="${COMMON_DEPEND}
app-arch/zip
dev-lang/swig
dev-libs/crossguid
- dev-libs/rapidjson
dev-util/cmake
dev-util/gperf
media-libs/giflib
@@ -160,6 +164,8 @@ In some cases Kodi needs to access multicast addresses.
Please consider enabling IP_MULTICAST under Networking options.
"
+CMAKE_USE_DIR=${S}/project/cmake/
+
pkg_setup() {
check_extra_config
python-single-r1_pkg_setup
@@ -193,7 +199,7 @@ src_prepare() {
# Prevent autoreconf rerun
sed -e 's/autoreconf -vif/echo "autoreconf already done in
src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
+ "${S}"/project/cmake/modules/FindCpluff.cmake \
"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
|| die
@@ -219,6 +225,7 @@ src_configure() {
-DENABLE_MICROHTTPD=$(usex webserver)
-DENABLE_MYSQLCLIENT=$(usex mysql)
-DENABLE_NFS=$(usex nfs)
+ -DENABLE_NONFREE=$(usex nonfree)
-DENABLE_OPENGLES=$(usex gles)
-DENABLE_OPENGL=$(usex opengl)
-DENABLE_OPENSSL=ON
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index b9748b0b818..dd703f484c0 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
>=media-libs/taglib-1.11.1
- system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
+ system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
mysql? ( virtual/mysql )
>=net-misc/curl-7.51.0
nfs? ( net-fs/libnfs:= )
