commit: 5428fd593eab8bd90938e1321f8a8ed4504012fb
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 02:20:20 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 02:20:20 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5428fd59
media-tv/kodi: sync with ::gentoo revision
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
...-19.0_rc1-r2.ebuild => kodi-19.0_rc1-r3.ebuild} | 92 ++++++++++++++--------
media-tv/kodi/metadata.xml | 12 ++-
2 files changed, 68 insertions(+), 36 deletions(-)
diff --git a/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
b/media-tv/kodi/kodi-19.0_rc1-r3.ebuild
similarity index 84%
rename from media-tv/kodi/kodi-19.0_rc1-r2.ebuild
rename to media-tv/kodi/kodi-19.0_rc1-r3.ebuild
index abda01f..74b0d1f 100644
--- a/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
+++ b/media-tv/kodi/kodi-19.0_rc1-r3.ebuild
@@ -39,11 +39,10 @@ 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 dvd gbm gles lcms
libressl libusb lirc mariadb mysql nfs +opengl 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 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="${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}
- || ( gles opengl )
|| ( gbm wayland X )
?? ( mariadb mysql )
bluray? ( udf )
@@ -51,10 +50,22 @@ REQUIRED_USE="
udisks? ( dbus )
upower? ( dbus )
power-control? ( dbus )
+ vdpau? (
+ X
+ !gles
+ !gbm
+ )
+ zeroconf? ( dbus )
"
RESTRICT="!test? ( test )"
-COMMON_DEPEND="${PYTHON_DEPS}
+COMMON_DEPEND="
+ >=dev-libs/lzo-2.04
+ >=dev-libs/flatbuffers-1.11.0
+ >=media-libs/libjpeg-turbo-2.0.4:=
+ >=media-libs/libpng-1.6.26:0=
+"
+COMMON_TARGET_DEPEND="${PYTHON_DEPS}
airplay? (
>=app-pda/libplist-2.0.0
net-libs/shairplay
@@ -65,24 +76,24 @@ COMMON_DEPEND="${PYTHON_DEPS}
caps? ( sys-libs/libcap )
dbus? ( sys-apps/dbus )
dev-db/sqlite
- dev-libs/expat
- >=dev-libs/flatbuffers-1.11.0
+ dev-libs/crossguid
>=dev-libs/fribidi-1.0.5
cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
dev-libs/libpcre[cxx]
- >=dev-libs/libinput-1.10.5
- >=dev-libs/libxml2-2.9.4
- >=dev-libs/lzo-2.04
>=dev-libs/spdlog-1.5.0:=
dev-libs/tinyxml[stl]
$(python_gen_cond_dep '
dev-python/pillow[${PYTHON_MULTI_USEDEP}]
dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
')
- >=dev-libs/libcdio-2.1.0
+ >=dev-libs/libcdio-2.1.0[cxx]
>=dev-libs/libfmt-6.1.2
dev-libs/libfstrcmp
- gbm? ( media-libs/mesa[gbm] )
+ gbm? (
+ >=dev-libs/libinput-1.10.5
+ media-libs/mesa[gbm]
+ x11-libs/libxkbcommon
+ )
gles? (
!raspberry-pi? ( media-libs/mesa[gles2] )
)
@@ -90,7 +101,6 @@ 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/libass-0.13.4
!raspberry-pi? ( media-libs/mesa[egl] )
@@ -100,12 +110,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
libressl? ( media-video/ffmpeg[libressl,-openssl] )
!libressl? ( media-video/ffmpeg[-libressl,openssl] )
)
- !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) )
+ !system-ffmpeg? (
+ app-arch/bzip2
+ dav1d? ( media-libs/dav1d )
+ )
mysql? ( dev-db/mysql-connector-c:= )
mariadb? ( dev-db/mariadb-connector-c:= )
>=net-misc/curl-7.68.0[http2]
nfs? ( >=net-fs/libnfs-2.0.0:= )
- opengl? ( media-libs/glu )
+ !gles? ( media-libs/glu )
!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
libressl? ( dev-libs/libressl:0= )
raspberry-pi? (
@@ -118,7 +131,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
udev? ( virtual/udev )
vaapi? (
x11-libs/libva:=
- opengl? ( x11-libs/libva[opengl] )
+ !gles? ( x11-libs/libva[opengl] )
system-ffmpeg? ( media-video/ffmpeg[vaapi] )
vdpau? ( x11-libs/libva[vdpau] )
wayland? ( x11-libs/libva[wayland] )
@@ -133,41 +146,43 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-cpp/waylandpp-0.2.3:=
media-libs/mesa[wayland]
>=dev-libs/wayland-protocols-1.7
+ >=x11-libs/libxkbcommon-0.4.1
)
webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
X? (
media-libs/mesa[X]
+ !gles? ( media-libs/libglvnd[X] )
x11-libs/libX11
x11-libs/libXrandr
x11-libs/libXrender
system-ffmpeg? ( media-video/ffmpeg[X] )
)
x11-libs/libdrm
- >=x11-libs/libxkbcommon-0.4.1
- xslt? ( dev-libs/libxslt )
+ xslt? (
+ dev-libs/libxslt
+ >=dev-libs/libxml2-2.9.4
+ )
zeroconf? ( net-dns/avahi[dbus] )
"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
lirc? ( app-misc/lirc )
power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
udisks? ( sys-fs/udisks:2 )
upower? ( sys-power/upower )
"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/xz-utils
- dev-lang/swig
- dev-libs/crossguid
+DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
dev-libs/rapidjson
+ test? ( >=dev-cpp/gtest-1.10.0 )
+"
+BDEPEND="${COMMON_DEPEND}
+ dev-lang/swig
dev-util/cmake
- dev-util/gperf
media-libs/giflib
+ >=dev-libs/flatbuffers-1.11.0
>=media-libs/libjpeg-turbo-2.0.4:=
>=media-libs/libpng-1.6.26:0=
- test? ( >=dev-cpp/gtest-1.10.0 )
virtual/pkgconfig
virtual/jre
- x86? ( dev-lang/nasm )
"
CONFIG_CHECK="~IP_MULTICAST"
@@ -250,10 +265,14 @@ src_configure() {
-DENABLE_BLUETOOTH=$(usex bluetooth)
-DENABLE_BLURAY=$(usex bluray)
-DENABLE_CCACHE=OFF
- -DENABLE_ISO9660PP=ON
+ -DENABLE_CLANGFORMAT=OFF
+ -DENABLE_CLANGTIDY=OFF
+ -DENABLE_CPPCHECK=OFF
+ -DENABLE_ISO9660PP=$(usex optical)
-DENABLE_CEC=$(usex cec)
-DENABLE_DBUS=$(usex dbus)
-DENABLE_DVDCSS=$(usex css)
+ -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and
filter extra staff in 'src_install()'
-DENABLE_INTERNAL_CROSSGUID=OFF
-DENABLE_INTERNAL_RapidJSON=OFF
-DENABLE_INTERNAL_FMT=OFF
@@ -273,8 +292,8 @@ src_configure() {
-DENABLE_MYSQLCLIENT=$(usex mysql)
-DENABLE_NFS=$(usex nfs)
-DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPTICAL=$(usex dvd)
+ -DENABLE_OPENGL=$(usex !gles)
+ -DENABLE_OPTICAL=$(usex optical)
-DENABLE_PLIST=$(usex airplay)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_SMBCLIENT=$(usex samba)
@@ -291,11 +310,13 @@ src_configure() {
-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
- -DAPP_RENDER_SYSTEM="$(usex opengl gl gles)"
+ -DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
-DCORE_PLATFORM_NAME="${core_platform_name}"
)
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+ use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+ use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
if use system-ffmpeg; then
mycmakeargs+=( -DWITH_FFMPEG="yes" )
@@ -331,6 +352,13 @@ src_install() {
dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py"
kodi-send
+ if use !eventclients ; then
+ rm -f "${ED}"/usr/bin/kodi-ps3remote || die
+ rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
+ rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
+ rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
+ rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
+ fi
+
+ python_optimize "${D}$(python_get_sitedir)"
}
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index a30254b..b335263 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -8,23 +8,27 @@
<use>
<flag name="airplay">enable AirPlay support</flag>
<flag name="bluray">Enable playback of Blu-ray
filesystems</flag>
+ <flag name="bluetooth">Enable JSON-RPC over BT for remote
control connected via bluetooth</flag>
<flag name="caps">Use <pkg>sys-libs/libcap</pkg> to bind to
privileged ports as non-root</flag>
<flag name="cec">Enable support for HDMI-CEC devices via
libcec</flag>
+ <flag name="eventclients">Install full set of Kodi python
evenclients and evenclients examples</flag>
<flag name="gbm">Use the Graphics Buffer Manager for EGL on
KMS.</flag>
- <flag name="gles">Enable support for GLES</flag>
+ <flag name="gles">Use simplified OpenGLES instead of full-scale
OpenGL</flag>
<flag name="lirc">Enable support for IR remote controls using
<pkg>app-misc/lirc</pkg></flag>
- <flag name="mariadb">Add MariaDB support</flag>
+ <flag name="mariadb">Enable support store of media library
metadata on local or remote MariaDB</flag>
+ <flag name="mysql">Enable support store of media library
metadata on local or remote MySQL</flag>
<flag name="dav1d">Enables AV1 decoding via
<pkg>media-libs/dav1d</pkg></flag>
<flag name="nfs">Enable NFS client support</flag>
- <flag name="dvd">Enable optical (CD/DVD drive) support</flag>
+ <flag name="optical">Enable Audio CD playback, optical disks
detection and reading (CD-ROM, Video CD, and others), and ISO optical disk
images direct reading. DVD disks may require additional 'udf' flag.</flag>
<flag name="power-control">Enable control of shutdown, reboot,
suspend, and hibernate</flag>
<flag name="raspberry-pi">Enable support for the Raspberry
Pi</flag>
<flag name="system-ffmpeg">Use system ffmpeg instead of the
bundled one</flag>
<flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb
device hotplug support. This flag should only be enabled if you're running a
non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag>
<flag name="udf">Enable UDF support. Required for playing
blurays.</flag>
<flag name="udev">Use <pkg>sys-fs/udev</pkg> rules to handle
devices' permissions and hotplug support. Unless you know what you're doing do
not disable this flag on Linux kernels. This is provided as an option for
completeness.</flag>
+ <flag name="upower">Use <pkg>sys-power/upower</pkg> to get
battery level and active power source</flag>
<flag name="webserver">Enable internal webserver</flag>
- <flag name="xslt">Enable XSLT support using
<pkg>dev-libs/libxslt</pkg></flag>
+ <flag name="xslt">Enable metadata XSLT scrapers support with
<pkg>dev-libs/libxslt</pkg></flag>
</use>
<upstream>
<bugs-to>https://trac.kodi.tv/</bugs-to>
