commit: 08bfad9d6e8bb68f39bafe3d6474ff113a0373a7
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 15:54:34 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 15:54:34 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=08bfad9d
media-tv/kodi: sync with ::gentoo, drop libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
media-tv/kodi/kodi-19.0.ebuild | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/media-tv/kodi/kodi-19.0.ebuild b/media-tv/kodi/kodi-19.0.ebuild
index 63049a3..6634809 100644
--- a/media-tv/kodi/kodi-19.0.ebuild
+++ b/media-tv/kodi/kodi-19.0.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+ # Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
+PYTHON_REQ_USE="sqlite,ssl"
LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
FFMPEG_VERSION="4.3.1"
CODENAME="Matrix"
FFMPEG_KODI_VERSION="Beta1"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
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 )"
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/xbmc/xbmc.git";
+ EGIT_BRANCH="Matrix"
inherit git-r3
else
MY_PV=${PV/_p/_r}
@@ -25,7 +26,7 @@ else
MY_PV=${MY_PV/_rc/RC}
MY_P="${PN}-${MY_PV}"
SRC_URI+="
https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz ->
${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~x86"
S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
fi
@@ -39,7 +40,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 dav1d dbus eventclients gbm
gles lcms libressl libusb lirc mariadb mysql nfs +optical power-control
pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower
vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm
gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio
raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau
wayland webserver +X +xslt zeroconf"
IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2
cpu_flags_arm_neon"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -107,8 +108,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
>=media-libs/taglib-1.11.1
system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
- libressl? ( media-video/ffmpeg[libressl,-openssl] )
- !libressl? ( media-video/ffmpeg[-libressl,openssl] )
+ media-video/ffmpeg[-libressl,openssl]
)
!system-ffmpeg? (
app-arch/bzip2
@@ -119,8 +119,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
>=net-misc/curl-7.68.0[http2]
nfs? ( >=net-fs/libnfs-2.0.0:= )
!gles? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.0.2l:0=
raspberry-pi? (
|| ( media-libs/raspberrypi-userland
media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
)
