commit: 2da5c6eb5d49dde6cde4eb4a9f6637317074a545
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 21:40:43 2019 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 21:42:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da5c6eb
media-tv/kodi: Fix media-libs[video_cards_vc4] dependency
Thanks anarchy <AT> gentoo.org
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
.../kodi/{kodi-9999.ebuild => kodi-18.5-r1.ebuild} | 36 ++++++++++++++--------
media-tv/kodi/kodi-9999.ebuild | 2 +-
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-18.5-r1.ebuild
similarity index 89%
copy from media-tv/kodi/kodi-9999.ebuild
copy to media-tv/kodi/kodi-18.5-r1.ebuild
index c3c40213e11..8432426e3c3 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-18.5-r1.ebuild
@@ -10,15 +10,20 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
FFMPEG_VERSION="4.0.4"
CODENAME="Leia"
FFMPEG_KODI_VERSION="18.4"
-PYTHON_COMPAT=( python3_{5,6,7,8} )
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz
-> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz
-> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz
-> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
!system-ffmpeg? (
https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz
-> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+PATCHES=(
+ "${FILESDIR}/${P}-cassert.patch"
+)
+
if [[ ${PV} == *9999 ]] ; then
+ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
EGIT_REPO_URI="https://github.com/xbmc/xbmc.git";
inherit git-r3
else
+ PYTHON_COMPAT=( python2_7 )
MY_PV=${PV/_p/_r}
MY_PV=${MY_PV/_alpha/a}
MY_PV=${MY_PV/_beta/b}
@@ -58,13 +63,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.1.2 )
+ bluray? ( >=media-libs/libbluray-1.0.2 )
caps? ( sys-libs/libcap )
dbus? ( sys-apps/dbus )
dev-db/sqlite
dev-libs/expat
- >=dev-libs/flatbuffers-1.11.0
- >=dev-libs/fribidi-1.0.5
+ dev-libs/flatbuffers
+ >=dev-libs/fribidi-0.19.7
cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
dev-libs/libpcre[cxx]
>=dev-libs/libinput-1.10.5
@@ -72,7 +77,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/lzo-2.04
dev-libs/tinyxml[stl]
dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycryptodome[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]'
'python3*')
>=dev-libs/libcdio-0.94
>=dev-libs/libfmt-3.0.1
dev-libs/libfstrcmp
@@ -84,8 +89,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
libusb? ( virtual/libusb:1 )
virtual/ttf-fonts
media-fonts/roboto
- >=media-libs/fontconfig-2.13.1
- >=media-libs/freetype-2.10.1
+ >=media-libs/fontconfig-2.12.4
+ >=media-libs/freetype-2.8
>=media-libs/libass-0.13.4
!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
>=media-libs/taglib-1.11.1
@@ -102,7 +107,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
libressl? ( dev-libs/libressl:0= )
raspberry-pi? (
- || ( media-libs/raspberrypi-userland
media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
+ || ( media-libs/raspberrypi-userland
media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
)
pulseaudio? ( media-sound/pulseaudio )
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
@@ -174,6 +179,14 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == *9999 ]] ; then
+ if python_is_python3; then
+ EGIT_BRANCH="feature_python3"
+ ewarn "Using the experimental Python 3 branch!"
+ ewarn "See https://kodi.wiki/view/Migration_to_Python_3
for more information."
+ ewarn "To use the non-experimental Python 2 version:"
+ ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -*
python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+ ewarn "then re-merge using: emerge -a
=${CATEGORY}/${PF}"
+ fi
git-r3_src_unpack
else
default
@@ -190,6 +203,7 @@ src_prepare() {
# Prepare tools and libs witch are configured with autotools during
compile time
AUTOTOOLS_DIRS=(
+ "${S}"/lib/cpluff
"${S}"/tools/depends/native/TexturePacker/src
"${S}"/tools/depends/native/JsonSchemaBuilder/src
)
@@ -204,6 +218,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}"/tools/depends/native/TexturePacker/src/autogen.sh \
"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
|| die
@@ -275,10 +290,7 @@ src_configure() {
fi
if use X; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="x11"
- -DX11_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
+ mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
fi
cmake-utils_src_configure
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index c3c40213e11..5c2e185500a 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
libressl? ( dev-libs/libressl:0= )
raspberry-pi? (
- || ( media-libs/raspberrypi-userland
media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
+ || ( media-libs/raspberrypi-userland
media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
)
pulseaudio? ( media-sound/pulseaudio )
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
