commit: c4a5efdd6c1f4abd92f21ababceaed5dc0c944e0
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 01:11:22 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 01:11:22 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c4a5efdd
media-tv/kodi: sync with ::gentoo
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
media-tv/kodi/Manifest | 4 ++--
..._alpha3_p20201109.ebuild => kodi-19.0_beta1-r1.ebuild} | 15 ++++++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index c2a5f07..25d5653 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,8 +1,8 @@
DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B
6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99
SHA512
c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
-DIST ffmpeg-kodi-4.3.1-Matrix-Alpha1-2.tar.gz 13477450 BLAKE2B
c33a2aad8b895be3ea5be76de238680284487d38a8c22ce57f17c3944a6ba214c0dfa9ef1e4717244ff8f70f6dd640b36715842d61ddaed65867a6c096470283
SHA512
7f614d0dd2b319414cb31853be9cd52e5e81b780a4049e36470f992e78e52bcd65e99bfd268df5f8781ad030bb60f99d15bd5e8c4d7c2fd9a4011b55a3efc40c
+DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B
49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec
SHA512
ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac
DIST kodi-18.2-no-java-required.patch 991361 BLAKE2B
ec58367d2ac378107bf84ab0b675a74f4eac620984811f50051e1fa0ccae5b52520eb106e3508c4bf4d98899a5068279370a2ddcebe33278d20642208d3a17e2
SHA512
8267f3ca7156c9498473ac33c24419f62541f68beffbb090a5e3da18fc6e9c32e509c10c91bc2721d07fc0d3ffc723966306d44cc0a00a51e363b1c24ac5d03f
DIST kodi-18.9.tar.gz 51052509 BLAKE2B
e7cd888a38ed81e90566ae5e8a6f28c93688c8293af4b210674f224b02e7452ac81c25128cfbeaa3c67980fc00e18631060640ddff61263c782c807f8c5ea00e
SHA512
72e4e2afa46d5d2061ed348af5c9a4218474589cb38d630e6d0643b35aff3b0aefb3db81333d52da6c799c530a1b709b1d7ccb6ec77dcb0cba06fce6791cb353
-DIST kodi-19.0_alpha3_p20201109.tar.gz 52322634 BLAKE2B
4a69422811119ecc4b706a1b1f950b19bae16088ea8717b22c3015fe1dd448d37dccc46b2f756049ab71519c72a2e8a639f07128590dd94f227fce73e12efe10
SHA512
2fe0abfa8a8e4c3dd73021cf1aedb6dadda9c14588380276fc5ab05dee13e397d4f893ee5a62301fc79ebe5fe9129b8d37489edc0014c5a15564c63696d89d93
+DIST kodi-19.0b1.tar.gz 52314501 BLAKE2B
35090e969160f7ea6619d6c720f92a3ecf97391d12548927fcfd03ccc15091132f795f4636a4c4b8c15b2a623ee8b892c4b395e2e4e811152c63ffc19474ff90
SHA512
51a5a060c9ee51dd05303259cf59164bf273b05430f0987998a90879dfb52c1e95669e1c432476df65247fb70e920058119713a627ed7e12bf8dcd13645ffc40
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
diff --git a/media-tv/kodi/kodi-19.0_alpha3_p20201109.ebuild
b/media-tv/kodi/kodi-19.0_beta1-r1.ebuild
similarity index 96%
rename from media-tv/kodi/kodi-19.0_alpha3_p20201109.ebuild
rename to media-tv/kodi/kodi-19.0_beta1-r1.ebuild
index a0b3d87..98f4f67 100644
--- a/media-tv/kodi/kodi-19.0_alpha3_p20201109.ebuild
+++ b/media-tv/kodi/kodi-19.0_beta1-r1.ebuild
@@ -9,7 +9,7 @@ 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="Alpha1-2"
+FFMPEG_KODI_VERSION="Beta1"
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
@@ -19,10 +19,14 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/xbmc/xbmc.git";
inherit git-r3
else
- GIT_COMMIT="5b06cdf3e64347085484435f2a4963e919edc8ec"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${GIT_COMMIT}.tar.gz ->
${P}.tar.gz"
+ MY_PV=${PV/_p/_r}
+ MY_PV=${MY_PV/_alpha/a}
+ MY_PV=${MY_PV/_beta/b}
+ 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"
- S=${WORKDIR}/xbmc-${GIT_COMMIT}
+ S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
fi
inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
@@ -224,6 +228,7 @@ src_configure() {
use gbm && platform+=( gbm )
use wayland && platform+=( wayland )
use X && platform+=( x11 )
+ local core_platform_name="${platform[@]}"
local mycmakeargs=(
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-DENABLE_LDGOLD=OFF #
https://bugs.gentoo.org/show_bug.cgi?id=606124
@@ -267,7 +272,7 @@ src_configure() {
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
-DAPP_RENDER_SYSTEM="$(usex opengl gl gles)"
- -DCORE_PLATFORM_NAME="${platform[@]}"
+ -DCORE_PLATFORM_NAME="${core_platform_name}"
)
use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
