diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2020-02-09 20:25:01 -0600 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2020-02-09 20:25:01 -0600 |
| commit | 07c33b4aa892b079c1d468a5bbe6fce841ee3495 (patch) | |
| tree | 47142ac822ea5a214507af0f3cdd5a41cb0ed615 | |
| parent | net-libs/nodejs: 13.8.0 version bump (diff) | |
| download | anarchy-07c33b4aa892b079c1d468a5bbe6fce841ee3495.tar.gz anarchy-07c33b4aa892b079c1d468a5bbe6fce841ee3495.tar.bz2 anarchy-07c33b4aa892b079c1d468a5bbe6fce841ee3495.zip | |
media-tv/kodi: sync with tree
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
| -rw-r--r-- | media-tv/kodi/Manifest | 2 | ||||
| -rw-r--r-- | media-tv/kodi/kodi-18.5-r2.ebuild (renamed from media-tv/kodi/kodi-18.5-r1.ebuild) | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 8d025f7..b0a1e8d 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -12,5 +12,5 @@ DIST kodi-18.5.tar.gz 51025415 BLAKE2B c439790a85466d50875cd63ccdc6fee1b16c5ee67 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7 -EBUILD kodi-18.5-r1.ebuild 10049 BLAKE2B 7cbbcd8e2374b792bc21945c933245d003919fc7823fc44b3fa08e9c555309d532ab34e378c29c8797028cdc7d670a58962be3f2ffb7a2ab77f871db16208968 SHA512 b88cb2eb5c35899dff916abb38b393e59b683128082ad3f239e0d349aaff612beb97300782e2c4d452fc37fe367c0bba51fb5f292a218af2f09742d8b71336fa +EBUILD kodi-18.5-r2.ebuild 10044 BLAKE2B 7896fedba628078b0d8e60234e149d65b99b84fced0c3dec7d1058ec631ca4ba03fc785ec8790c7d095a6f133606d7748a8dea0d57b532cdc5f9d7fa8284b684 SHA512 152db4c159077c7d6aeea75ec8899ae089633197e638ec0a707e59cf9c4693b0450a8cd774ff92dd1c45c8e75ecb104862e40d93906a55f1ae970da81aef2a5e MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da diff --git a/media-tv/kodi/kodi-18.5-r1.ebuild b/media-tv/kodi/kodi-18.5-r2.ebuild index d03f106..ab7265e 100644 --- a/media-tv/kodi/kodi-18.5-r1.ebuild +++ b/media-tv/kodi/kodi-18.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,6 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz - https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz !java? ( https://dev.gentoo.org/~anarchy/patches/${PN}-18.2-no-java-required.patch ) !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" "${FILESDIR}/musl/0001-add-missing-stdint.h.patch" @@ -28,7 +27,7 @@ PATCHES=( ) if [[ ${PV} == *9999 ]] ; then - PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + PYTHON_COMPAT=( python2_7 python3_{6,7} ) EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" inherit git-r3 else @@ -43,7 +42,7 @@ else S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} fi -inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg +inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg DESCRIPTION="A free and open source media-player and entertainment hub" HOMEPAGE="https://kodi.tv/ https://kodi.wiki/" @@ -85,8 +84,8 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] - dev-python/pillow[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*') + $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]') + $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*') >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp @@ -207,7 +206,7 @@ src_prepare() { eapply "${DISTDIR}"/${PN}-18.2-no-java-required.patch fi - cmake-utils_src_prepare + cmake_src_prepare # avoid long delays when powerkit isn't running #348580 sed -i \ @@ -306,19 +305,19 @@ src_configure() { mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" ) fi - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile all + cmake_src_compile all } src_test() { - cmake-utils_src_make check + cmake_build check } src_install() { - cmake-utils_src_install + cmake_src_install pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin |