From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F400A1382C5 for ; Thu, 18 Feb 2021 14:43:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B549E08C8; Thu, 18 Feb 2021 14:43:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72EEEE08C8 for ; Thu, 18 Feb 2021 14:43:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63B09340C7C for ; Thu, 18 Feb 2021 14:43:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15032585 for ; Thu, 18 Feb 2021 14:43:34 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1613659408.c545efb144b17ba01caebe1b76515d75d5a5c2e5.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/kodi/kodi-19.0_rc1-r3.ebuild media-tv/kodi/kodi-19.9999.ebuild media-tv/kodi/kodi-9999.ebuild X-VCS-Directories: media-tv/kodi/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: c545efb144b17ba01caebe1b76515d75d5a5c2e5 X-VCS-Branch: master Date: Thu, 18 Feb 2021 14:43:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4461b3af-e278-4418-9cf2-85b51db5336b X-Archives-Hash: 72563459744706bc600c4cb07e05bc5d commit: c545efb144b17ba01caebe1b76515d75d5a5c2e5 Author: Evgeny Grin narod ru> AuthorDate: Fri Feb 12 17:32:47 2021 +0000 Commit: Craig Andrews gentoo org> CommitDate: Thu Feb 18 14:43:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c545efb1 media-tv/kodi: new revision 19.0_rc1-r3 Signed-off-by: Evgeny Grin narod.ru> Signed-off-by: Craig Andrews gentoo.org> .../{kodi-9999.ebuild => kodi-19.0_rc1-r3.ebuild} | 2 +- media-tv/kodi/kodi-19.9999.ebuild | 90 ++++++++++++++-------- media-tv/kodi/kodi-9999.ebuild | 2 +- 3 files changed, 61 insertions(+), 33 deletions(-) diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-19.0_rc1-r3.ebuild similarity index 99% copy from media-tv/kodi/kodi-9999.ebuild copy to media-tv/kodi/kodi-19.0_rc1-r3.ebuild index 520779de8d8..c0d898ec410 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-19.0_rc1-r3.ebuild @@ -112,7 +112,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} ) !system-ffmpeg? ( app-arch/bzip2 - dav1d? ( media-libs/dav1d ) + dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild index cb070312ede..c0d898ec410 100644 --- a/media-tv/kodi/kodi-19.9999.ebuild +++ b/media-tv/kodi/kodi-19.9999.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,14 +76,10 @@ 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 ' @@ -82,7 +89,11 @@ COMMON_DEPEND="${PYTHON_DEPS} >=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" @@ -242,10 +257,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 @@ -265,8 +284,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) @@ -283,11 +302,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" ) @@ -323,6 +344,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 "${ED}$(python_get_sitedir)" } diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 520779de8d8..c0d898ec410 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -112,7 +112,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} ) !system-ffmpeg? ( app-arch/bzip2 - dav1d? ( media-libs/dav1d ) + dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )